Replacing event manager and other changes