refactor importants and events