fixup! wip! Streams