Added rotation and control