refactor / upgrading packages
fixing events showing for multiple players