new macros added
merged