Juggled some code