Revert "Revert "Revert "Event was not working please fix"""

This reverts commit bd787419e9055eca04d55020e0f61c28e727373e.