add closed to handling events, refactor use
Merge branch 'change_handling_events' into development