Tweaks to simple sample