Updated rotation to include stopping