Broke rotation even more
made improvements to rotation