Upgraded Cancel to latest version