add start/stop feature