added new macros