Adding the cancel possibility
Renaming & updating forgotten things