Might have fixed rotation bug (should test more)