Move to single stream. Pending refactorings
backing up