updated to new event_emitter