Collaboration: Toggle modify flag
Collaboration: Simplify event handling