Added rudimentary cancellation in save mode