change to component/emitter