Taking in @keri_goff's feedback