More work on streaming