Improvements for streaming.