changes to behavior with Cancel + currently commented escape functionality
changes to behavior with Cancel + currently commented escape functionality