modified macros