Streaming rework