modifications in the EventManager