changed parameters to macros