Changes in StepManager to speed simulation

No match.