Add cancel method
merge with master and adding fakeweb to cancel