move some stuff aroundg