Move this to the new emitter system while we're at it