can you remove the onStep/onEnd here?