removing cancel button logic
class applied
update
update
error fix
re-factor