Updated streamMaker