Bending uber streams

Repeat of pull request #211