Manual merge of cancel and extra features