Added start/stop feature