Updated the macros