Adding a cancellation mechanism