Updated Macros