More work on cancel mechanism.