Iterate on feedback from @thisandagain