Move more things around