Implementing latest feedback from @tfountain and @froschdesign