More emitters
Revert "More emitters"

This reverts commit c8bee03f443d009a56c1c6c6b3aa7eddc3a6464c.
Revert "Revert "More emitters""

This reverts commit c8023aa73e85e123db3af8f453cb730c9d7999ca.