Rework stepToNextEvent