modified macros and output