Enhanced to be cancellable.