Chnaged some macros