upgrades from PR comments