Incoporating review feedback from @jblock