Updating macros for running code