Add Cancel Detection