Sample Updates

Changes made to 0.6.2 stream that never came over to 0.6.3 during AU
rush