moving around some code