Improve streams

OK