Broadcaster stream logic improved