Streams2

switch over to streams2