reworked streamer code
reworked streamer code