Added rotation and defaults