- More tinkering with streaming