new macros added
reordering marcos