Incorporating review feedback from @jblock