branchbefore/main/interaction_refactorcancel