some moving around of stuffs