Upgrades 3 [WIP][ToBeSquashed]