updates to macros