more start/stop changes
more start/stop changes