update the macros