!! UPDATE EVENTMANAGER !!
Updated to new eventManager