Shuffle things a little bit closer to streaming