revision of macros