upgrades: some changes