Updated MACROS