Refactored stepForward method