Added rotation
Merge