Made modifications to streaming