* new organization of macros