added some #untested world stream code