Incorporating feedback from @garrensmith, @robertkowalski