New verison. Added rotation