move around some code