refactoring EEHandler