replaced numbers with macros;