partially fixed rotation
Final changes