change macros

change macros