Improve streams

Same for that guy.