Incorporating feedback from @kerrizor