Updated to use new (not yet implemented) macros