Updated Switch Controller so it is no longer cancellable