updated stop/start logic