macros updated