Emitter changes
Merge conflict