modify start/stop logic