added some new macros