refactoring EvtNavigator