1.0.0 - convert to streams2