changed macros