Made some changes to macros