more macros added