Changes to upgradeables
Conflict fixed