Better handling of step/start