Changed emitter updating to new method and improved /chimney