Improved some of the stream versions