updated streams handler