Upgrades 9 [WIP][ToBeSquashed]