some changes
should be cancel
cancel too