[Suggestion] "Shift" stop at scaffold.