- refactoring
- changes to manage a stream
-