removed dem crazy macros