Changes based on comments to PR