!! UPDATE EVENTMANAGER !!
updated to new eventmanager