upgrades: some changes that jessica specified