move some stuff, add some stuff