more start/stop changes