Better Rotation, still a little buggy