Improve streams

Again, it can but doesn't have to.