Added start/stop logic