Added cancel and restore old values

also fixed timer