change to macros