Logic improvements for streaming