Amends based on feedback from @mookin