added cancel
major changes with device