Added in better canceling detection