Revisions based on feedback from @snugug