refactored all event indexes