added changes to the stream creation
merged stiff