Implementation Streaming fixed #8