replaced event manager

fixed