Improve Emitter