Updated to work with ShipUpgrade