did further refactoring of event flag handling in stage