incorporating some of the PR review comments