add more computed macros