Changes in stepMode feature to account for changes to step mode

Ran locally and all tests pass.