Fixed stream update
Merging