moved should_restart into the start/stop functions