simple macros replaced!