Updated based on comments to pull request