move more macros