updated to new eventmanager