updated for new eventmanager
todo: continue project