minor changes with macros