added some macros