Minor tweaks to samples