Save rotation
Refactor