WIP - Fixing streaming