Finished Rotation
Merge branch 'rotation'