Tweaks based on Steph's feedback