some change in macros