improved emitter editting