Added polling to start/stop