Moved stepwise movement methods to *Step()