Updated to ShipService_v13