Made improvements to events