Improving Stream sample with new Grid primitive