@Dr15Jones 
I'm, guessing that switching back from stream/ is justified here (significant changes in the code)