moving around stuff
removed stuff