Updated Macros, added Check Macro