EventEmitter->emit follow up changes