Refactored + rotation