Added emitter buffer