Adjusted to new event manager.