Dev add cancel feature

Rob and Hoang