Incorporating feedback from @robertkowalski