Added rotation option