Add cancel feature
Add cancel feature2