updating to work with moved Macros.h