Smoother rotation and reduced code