move some things around