Upgrades 10 [WIP][ToBeSquashed]