modify the macros