use streams2

this makes it nicer to work with