Same issue really not looking forward to rewriting all macros