tweaks based on steven's feedback