updated macros