merge previous good changes - macros