#61 Simplify upgrades