Updated to address Marcus Smith's comments on the PR.