Updated for macros