Tweaks based on Keith/Ben's input