move some macros