Tweaks based on feedback from Wyatt