2 new macros added