functions renamed to macros