fixed add feature and added cancel functionality