Incorporating review comment by @dkoper