some changes to upgrades branch