Upgrades 2 [WIP][ToBeSquashed]