Yuri/Upgrades