Straighten streaming out some more