Updated to new EventManager
!! UPDATE EVENTMANAGER !!