more work on streaming