Added cancelation check in controler