Updated partitioning
Fixed PartStreams partitioning