Improve streaming.