Update todos
Hack transition to cancel