Rotation control (18/23)

Rotation control