Updated codebase. Streaming is not functional