working on streaming
Merged conflict