diff --git a/dist/index.js b/dist/index.js
index cb434c7..ba27608 100644
--- a/dist/index.js
+++ b/dist/index.js
@@ -12,8 +12,8 @@ module.exports = {
         boost: 320,
         boostEnergy: 9,
         agility: 8,
-        baseShieldStrength: 78,
-        baseArmour: 162,
+        baseShieldStrength: 60,
+        baseArmour: 90,
         hullMass: 35,
         masslock: 7,
         pipSpeed: .13625
@@ -69,12 +69,12 @@ module.exports = {
         manufacturer: "Faulcon DeLacy",
         class: 3,
         hullCost: 141889930,
-        speed: 183,
-        boost: 244,
-        boostEnergy: 29,
+        speed: 180,
+        boost: 240,
+        boostEnergy: 27,
         agility: 2,
-        baseShieldStrength: 362,
-        baseArmour: 945,
+        baseShieldStrength: 350,
+        baseArmour: 525,
         hullMass: 400,
         masslock: 23,
         pipSpeed: .13875,
@@ -131,12 +131,12 @@ module.exports = {
         manufacturer: "Lakon",
         class: 2,
         hullCost: 6135660,
-        speed: 254,
-        boost: 345,
-        boostEnergy: 14,
+        speed: 250,
+        boost: 340,
+        boostEnergy: 13,
         agility: 6,
-        baseShieldStrength: 152,
-        baseArmour: 378,
+        baseShieldStrength: 140,
+        baseArmour: 210,
         hullMass: 280,
         masslock: 11,
         pipSpeed: .13
@@ -192,12 +192,12 @@ module.exports = {
         manufacturer: "Lakon",
         class: 2,
         hullCost: 3818240,
-        speed: 223,
-        boost: 304,
+        speed: 220,
+        boost: 300,
         boostEnergy: 13,
         agility: 8,
-        baseShieldStrength: 105,
-        baseArmour: 324,
+        baseShieldStrength: 120,
+        baseArmour: 180,
         hullMass: 150,
         masslock: 8,
         pipSpeed: .125
@@ -253,12 +253,12 @@ module.exports = {
         manufacturer: "Saud Kruger",
         class: 3,
         hullCost: 79654610,
-        speed: 195,
-        boost: 273,
-        boostEnergy: 20,
+        speed: 200,
+        boost: 280,
+        boostEnergy: 19,
         agility: 2,
-        baseShieldStrength: 92,
-        baseArmour: 504,
+        baseShieldStrength: 280,
+        baseArmour: 280,
         hullMass: 1100,
         masslock: 18,
         pipSpeed: -1,
@@ -356,12 +356,12 @@ module.exports = {
         manufacturer: "Faulcon DeLacy",
         class: 1,
         hullCost: 205800,
-        speed: 282,
-        boost: 402,
-        boostEnergy: 11,
+        speed: 280,
+        boost: 400,
+        boostEnergy: 10,
         agility: 6,
-        baseShieldStrength: 92,
-        baseArmour: 216,
+        baseShieldStrength: 80,
+        baseArmour: 120,
         hullMass: 180,
         masslock: 8,
         pipSpeed: .125
@@ -418,11 +418,11 @@ module.exports = {
         class: 1,
         hullCost: 603740,
         speed: 200,
-        boost: 299,
-        boostEnergy: 11,
+        boost: 300,
+        boostEnergy: 10,
         agility: 4,
-        baseShieldStrength: 125,
-        baseArmour: 216,
+        baseShieldStrength: 120,
+        baseArmour: 120,
         hullMass: 210,
         masslock: 8,
         pipSpeed: .125
@@ -478,12 +478,12 @@ module.exports = {
         manufacturer: "Lakon",
         class: 1,
         hullCost: 1635700,
-        speed: 242,
-        boost: 316,
-        boostEnergy: 14,
+        speed: 260,
+        boost: 340,
+        boostEnergy: 13,
         agility: 5,
-        baseShieldStrength: 115,
-        baseArmour: 270,
+        baseShieldStrength: 150,
+        baseArmour: 150,
         hullMass: 298,
         masslock: 10,
         pipSpeed: .09625
@@ -539,12 +539,12 @@ module.exports = {
         manufacturer: "Lakon",
         class: 1,
         hullCost: 461340,
-        speed: 283,
-        boost: 384,
-        boostEnergy: 11,
+        speed: 280,
+        boost: 380,
+        boostEnergy: 10,
         agility: 8,
-        baseShieldStrength: 93,
-        baseArmour: 216,
+        baseShieldStrength: 120,
+        baseArmour: 120,
         hullMass: 170,
         masslock: 8,
         pipSpeed: .09875
@@ -600,12 +600,12 @@ module.exports = {
         manufacturer: "Core Dynamics",
         class: 1,
         hullCost: 10440,
-        speed: 239,
-        boost: 349,
-        boostEnergy: 9,
+        speed: 240,
+        boost: 350,
+        boostEnergy: 8,
         agility: 10,
-        baseShieldStrength: 89,
-        baseArmour: 72,
+        baseShieldStrength: 60,
+        baseArmour: 40,
         hullMass: 50,
         masslock: 6,
         pipSpeed: .0625
@@ -661,12 +661,12 @@ module.exports = {
         manufacturer: "Core Dynamics",
         class: 2,
         hullCost: 19072e3,
-        speed: 214,
-        boost: 357,
-        boostEnergy: 21,
+        speed: 210,
+        boost: 350,
+        boostEnergy: 19,
         agility: 6,
-        baseShieldStrength: 133,
-        baseArmour: 540,
+        baseShieldStrength: 200,
+        baseArmour: 300,
         hullMass: 480,
         masslock: 14,
         pipSpeed: .11125
@@ -722,11 +722,11 @@ module.exports = {
         manufacturer: "Core Dynamics",
         class: 3,
         hullCost: 182589570,
-        speed: 198,
-        boost: 257,
+        speed: 200,
+        boost: 260,
         boostEnergy: 27,
         agility: 2,
-        baseShieldStrength: 516,
+        baseShieldStrength: 555,
         baseArmour: 666,
         hullMass: 900,
         masslock: 24,
@@ -784,12 +784,12 @@ module.exports = {
         manufacturer: "Core Dynamics",
         class: 2,
         hullCost: 13469990,
-        speed: 182,
-        boost: 304,
-        boostEnergy: 21,
+        speed: 180,
+        boost: 300,
+        boostEnergy: 19,
         agility: 2,
-        baseShieldStrength: 104,
-        baseArmour: 540,
+        baseShieldStrength: 200,
+        baseArmour: 300,
         hullMass: 580,
         masslock: 14,
         pipSpeed: .0725
@@ -845,12 +845,12 @@ module.exports = {
         manufacturer: "Core Dynamics",
         class: 2,
         hullCost: 34774790,
-        speed: 171,
-        boost: 282,
-        boostEnergy: 21,
+        speed: 170,
+        boost: 280,
+        boostEnergy: 23,
         agility: 2,
-        baseShieldStrength: 186,
-        baseArmour: 630,
+        baseShieldStrength: 250,
+        baseArmour: 350,
         hullMass: 580,
         masslock: 14,
         pipSpeed: .1025,
@@ -907,12 +907,12 @@ module.exports = {
         manufacturer: "Zorgon Peterson",
         class: 2,
         hullCost: 51232230,
-        speed: 265,
-        boost: 357,
-        boostEnergy: 21,
+        speed: 260,
+        boost: 350,
+        boostEnergy: 19,
         agility: 6,
-        baseShieldStrength: 271,
-        baseArmour: 405,
+        baseShieldStrength: 300,
+        baseArmour: 225,
         hullMass: 250,
         masslock: 12,
         pipSpeed: .03875
@@ -968,12 +968,12 @@ module.exports = {
         manufacturer: "Zorgon Peterson",
         class: 1,
         hullCost: 29790,
-        speed: 203,
-        boost: 305,
+        speed: 200,
+        boost: 300,
         agility: 6,
         boostEnergy: 7,
-        baseShieldStrength: 65,
-        baseArmour: 90,
+        baseShieldStrength: 50,
+        baseArmour: 50,
         hullMass: 14,
         masslock: 6,
         pipSpeed: .1625
@@ -1029,12 +1029,12 @@ module.exports = {
         manufacturer: "Gutamaya",
         class: 3,
         hullCost: 21077780,
-        speed: 306,
-        boost: 388,
-        boostEnergy: 21,
+        speed: 300,
+        boost: 380,
+        boostEnergy: 19,
         agility: 2,
-        baseShieldStrength: 186,
-        baseArmour: 486,
+        baseShieldStrength: 180,
+        baseArmour: 270,
         hullMass: 400,
         masslock: 12,
         pipSpeed: .1
@@ -1092,10 +1092,10 @@ module.exports = {
         hullCost: 2481550,
         speed: 280,
         boost: 380,
-        boostEnergy: 11,
+        boostEnergy: 10,
         agility: 6,
-        baseShieldStrength: 230,
-        baseArmour: 144,
+        baseShieldStrength: 200,
+        baseArmour: 80,
         hullMass: 35,
         masslock: 7,
         pipSpeed: .05375
@@ -1151,12 +1151,12 @@ module.exports = {
         manufacturer: "Gutamaya",
         class: 3,
         hullCost: 199926890,
-        speed: 202,
-        boost: 323,
-        boostEnergy: 24,
+        speed: 200,
+        boost: 320,
+        boostEnergy: 23,
         agility: 2,
-        baseShieldStrength: 703,
-        baseArmour: 720,
+        baseShieldStrength: 600,
+        baseArmour: 400,
         hullMass: 1100,
         masslock: 27,
         pipSpeed: .05,
@@ -1213,12 +1213,12 @@ module.exports = {
         manufacturer: "Core Dynamics",
         class: 1,
         hullCost: 72180,
-        speed: 298,
-        boost: 397,
-        boostEnergy: 9,
+        speed: 300,
+        boost: 400,
+        boostEnergy: 8,
         agility: 6,
-        baseShieldStrength: 104,
-        baseArmour: 108,
+        baseShieldStrength: 80,
+        baseArmour: 60,
         hullMass: 50,
         masslock: 6,
         pipSpeed: .075
@@ -1274,12 +1274,12 @@ module.exports = {
         manufacturer: "Lakon",
         class: 2,
         hullCost: 2951180,
-        speed: 202,
-        boost: 303,
+        speed: 200,
+        boost: 300,
         boostEnergy: 10,
         agility: 2,
-        baseShieldStrength: 99,
-        baseArmour: 243,
+        baseShieldStrength: 135,
+        baseArmour: 135,
         hullMass: 180,
         masslock: 8,
         pipSpeed: .1375,
@@ -1336,12 +1336,12 @@ module.exports = {
         manufacturer: "Saud Kruger",
         class: 3,
         hullCost: 47798080,
-        speed: 303,
-        boost: 384,
-        boostEnergy: 17,
+        speed: 300,
+        boost: 380,
+        boostEnergy: 16,
         agility: 2,
-        baseShieldStrength: 114,
-        baseArmour: 396,
+        baseShieldStrength: 220,
+        baseArmour: 220,
         hullMass: 580,
         masslock: 13,
         pipSpeed: .08375,
@@ -1418,12 +1418,12 @@ module.exports = {
         manufacturer: "Faulcon DeLacy",
         class: 2,
         hullCost: 55171380,
-        speed: 234,
-        boost: 305,
-        boostEnergy: 24,
+        speed: 230,
+        boost: 300,
+        boostEnergy: 23,
         agility: 6,
-        baseShieldStrength: 294,
-        baseArmour: 468,
+        baseShieldStrength: 260,
+        baseArmour: 260,
         hullMass: 350,
         masslock: 17,
         pipSpeed: .0975
@@ -1480,11 +1480,11 @@ module.exports = {
         class: 1,
         hullCost: 12870,
         speed: 220,
-        boost: 321,
+        boost: 320,
         boostEnergy: 7,
         agility: 8,
-        baseShieldStrength: 52,
-        baseArmour: 108,
+        baseShieldStrength: 40,
+        baseArmour: 60,
         hullMass: 25,
         masslock: 6,
         pipSpeed: .1375
@@ -1540,12 +1540,12 @@ module.exports = {
         manufacturer: "Lakon",
         class: 2,
         hullCost: 865790,
-        speed: 223,
-        boost: 355,
-        boostEnergy: 11,
+        speed: 220,
+        boost: 350,
+        boostEnergy: 10,
         agility: 3,
-        baseShieldStrength: 77,
-        baseArmour: 162,
+        baseShieldStrength: 90,
+        baseArmour: 90,
         hullMass: 155,
         masslock: 8,
         pipSpeed: .1475
@@ -1601,12 +1601,12 @@ module.exports = {
         manufacturer: "Lakon",
         class: 3,
         hullCost: 16881510,
-        speed: 181,
-        boost: 301,
-        boostEnergy: 11,
+        speed: 180,
+        boost: 300,
+        boostEnergy: 10,
         agility: 2,
-        baseShieldStrength: 78,
-        baseArmour: 306,
+        baseShieldStrength: 155,
+        baseArmour: 170,
         hullMass: 420,
         masslock: 10,
         pipSpeed: .16625
@@ -1662,12 +1662,12 @@ module.exports = {
         manufacturer: "Lakon",
         class: 3,
         hullCost: 73255150,
-        speed: 131,
-        boost: 201,
-        boostEnergy: 21,
+        speed: 130,
+        boost: 200,
+        boostEnergy: 19,
         agility: 0,
-        baseShieldStrength: 88,
-        baseArmour: 432,
+        baseShieldStrength: 240,
+        baseArmour: 240,
         hullMass: 1e3,
         masslock: 16,
         pipSpeed: .17375,
@@ -1724,12 +1724,12 @@ module.exports = {
         manufacturer: "Faulcon DeLacy",
         class: 1,
         hullCost: 95900,
-        speed: 310,
-        boost: 388,
-        boostEnergy: 11,
+        speed: 320,
+        boost: 400,
+        boostEnergy: 10,
         agility: 6,
-        baseShieldStrength: 137,
-        baseArmour: 126,
+        baseShieldStrength: 105,
+        baseArmour: 70,
         hullMass: 60,
         masslock: 7,
         pipSpeed: .09375
@@ -1785,12 +1785,12 @@ module.exports = {
         manufacturer: "Faulcon DeLacy",
         class: 1,
         hullCost: 310220,
-        speed: 271,
-        boost: 342,
+        speed: 270,
+        boost: 340,
         boostEnergy: 10,
         agility: 4,
-        baseShieldStrength: 103,
-        baseArmour: 270,
+        baseShieldStrength: 150,
+        baseArmour: 150,
         hullMass: 190,
         masslock: 7,
         pipSpeed: .0875
@@ -1846,12 +1846,12 @@ module.exports = {
         manufacturer: "Core Dynamics",
         class: 1,
         hullCost: 4689640,
-        speed: 215,
-        boost: 348,
-        boostEnergy: 17,
+        speed: 210,
+        boost: 340,
+        boostEnergy: 16,
         agility: 9,
-        baseShieldStrength: 293,
-        baseArmour: 288,
+        baseShieldStrength: 240,
+        baseArmour: 160,
         hullMass: 230,
         masslock: 10,
         pipSpeed: .02375
@@ -2324,8 +2324,6 @@ module.exports = {
         rating: "A"
       } ],
       t: [ {
-        M: .17,
-        P: .235,
         class: 8,
         cost: 2007240,
         edID: 128064098,
@@ -2335,12 +2333,14 @@ module.exports = {
         integrity: 135,
         mass: 160,
         maxmass: 3360,
+        maxmul: 1.03,
+        minmass: 1120,
+        minmul: .83,
         optmass: 2240,
+        optmul: 1,
         power: 7.2,
         rating: "E"
       }, {
-        M: .14,
-        P: .5145,
         class: 8,
         cost: 6021720,
         edID: 128064099,
@@ -2350,12 +2350,14 @@ module.exports = {
         integrity: 120,
         mass: 64,
         maxmass: 3780,
+        maxmul: 1.06,
+        minmass: 1260,
+        minmul: .86,
         optmass: 2520,
+        optmul: 1,
         power: 8.1,
         rating: "D"
       }, {
-        M: .1,
-        P: 1,
         class: 8,
         cost: 18065170,
         edID: 128064100,
@@ -2365,12 +2367,14 @@ module.exports = {
         integrity: 150,
         mass: 160,
         maxmass: 4200,
+        maxmul: 1.1,
+        minmass: 1400,
+        minmul: .9,
         optmass: 2800,
+        optmul: 1,
         power: 9,
         rating: "C"
       }, {
-        M: .07,
-        P: 1.51,
         class: 8,
         cost: 54195500,
         edID: 128064101,
@@ -2380,12 +2384,14 @@ module.exports = {
         integrity: 180,
         mass: 256,
         maxmass: 4620,
+        maxmul: 1.13,
+        minmass: 1540,
+        minmul: .93,
         optmass: 3080,
+        optmul: 1,
         power: 9.9,
         rating: "B"
       }, {
-        M: .04,
-        P: 2.33,
         class: 8,
         cost: 162586490,
         edID: 128064102,
@@ -2395,12 +2401,14 @@ module.exports = {
         integrity: 165,
         mass: 160,
         maxmass: 5040,
-        optmass: 3360,
+        maxmul: 1.16,
+        minmass: 1680,
+        minmul: .96,
+        optmass: 5040,
+        optmul: 1,
         power: 10.8,
         rating: "A"
       }, {
-        M: .17,
-        P: .235,
         class: 7,
         cost: 633200,
         edID: 128064093,
@@ -2410,12 +2418,14 @@ module.exports = {
         integrity: 118,
         mass: 80,
         maxmass: 2160,
+        maxmul: 1.03,
+        minmass: 720,
+        minmul: .83,
         optmass: 1440,
+        optmul: 1,
         power: 6.08,
         rating: "E"
       }, {
-        M: .14,
-        P: .5145,
         class: 7,
         cost: 1899600,
         edID: 128064094,
@@ -2425,12 +2435,14 @@ module.exports = {
         integrity: 105,
         mass: 32,
         maxmass: 2430,
+        maxmul: .86,
+        minmass: 810,
+        minmul: .86,
         optmass: 1620,
+        optmul: 1,
         power: 6.84,
         rating: "D"
       }, {
-        M: .1,
-        P: 1,
         class: 7,
         cost: 5698790,
         edID: 128064095,
@@ -2440,12 +2452,14 @@ module.exports = {
         integrity: 131,
         mass: 80,
         maxmass: 2700,
+        maxmul: 1.1,
+        minmass: 900,
+        minmul: .9,
         optmass: 1800,
+        optmul: 1,
         power: 7.6,
         rating: "C"
       }, {
-        M: .07,
-        P: 1.51,
         class: 7,
         cost: 17096370,
         edID: 128064096,
@@ -2455,12 +2469,14 @@ module.exports = {
         integrity: 157,
         mass: 128,
         maxmass: 2970,
+        maxmul: 1.13,
+        minmass: 990,
+        minmul: .93,
         optmass: 1980,
+        optmul: 1,
         power: 8.36,
         rating: "B"
       }, {
-        M: .04,
-        P: 2.33,
         class: 7,
         cost: 51289110,
         edID: 128064097,
@@ -2470,12 +2486,14 @@ module.exports = {
         integrity: 144,
         mass: 80,
         maxmass: 3240,
+        maxmul: 1.16,
+        minmass: 1080,
+        minmul: .96,
         optmass: 2160,
+        optmul: 1,
         power: 9.12,
         rating: "A"
       }, {
-        M: .17,
-        P: .235,
         class: 6,
         cost: 199750,
         edID: 128064088,
@@ -2485,12 +2503,14 @@ module.exports = {
         integrity: 102,
         mass: 40,
         maxmass: 1440,
+        maxmul: 1.03,
+        minmass: 480,
+        minmul: .83,
         optmass: 960,
+        optmul: 1,
         power: 5.04,
         rating: "E"
       }, {
-        M: .14,
-        P: .5145,
         class: 6,
         cost: 599240,
         edID: 128064089,
@@ -2500,12 +2520,14 @@ module.exports = {
         integrity: 90,
         mass: 16,
         maxmass: 1620,
+        maxmul: 1.06,
+        minmass: 540,
+        minmul: .86,
         optmass: 1080,
+        optmul: 1,
         power: 5.67,
         rating: "D"
       }, {
-        M: .1,
-        P: 1,
         class: 6,
         cost: 1797730,
         edID: 128064090,
@@ -2515,12 +2537,14 @@ module.exports = {
         integrity: 113,
         mass: 40,
         maxmass: 1800,
+        maxmul: 1.1,
+        minmass: 600,
+        minmul: .9,
         optmass: 1200,
+        optmul: 1,
         power: 6.3,
         rating: "C"
       }, {
-        M: .07,
-        P: 1.51,
         class: 6,
         cost: 5393180,
         edID: 128064091,
@@ -2530,12 +2554,14 @@ module.exports = {
         integrity: 136,
         mass: 64,
         maxmass: 1980,
+        maxmul: 1.13,
+        minmass: 660,
+        minmul: .93,
         optmass: 1320,
+        optmul: 1,
         power: 6.93,
         rating: "B"
       }, {
-        M: .04,
-        P: 2.33,
         class: 6,
         cost: 16179530,
         edID: 128064092,
@@ -2545,12 +2571,14 @@ module.exports = {
         integrity: 124,
         mass: 40,
         maxmass: 2160,
+        maxmul: 1.16,
+        minmass: 720,
+        minmul: .96,
         optmass: 1440,
+        optmul: 1,
         power: 7.56,
         rating: "A"
       }, {
-        M: .17,
-        P: .235,
         class: 5,
         cost: 63010,
         edID: 128064083,
@@ -2560,12 +2588,14 @@ module.exports = {
         integrity: 86,
         mass: 20,
         maxmass: 840,
+        maxmul: 1.03,
+        minmass: 280,
+        minmul: .83,
         optmass: 560,
+        optmul: 1,
         power: 4.08,
         rating: "E"
       }, {
-        M: .14,
-        P: .5145,
         class: 5,
         cost: 189040,
         edID: 128064084,
@@ -2575,12 +2605,14 @@ module.exports = {
         integrity: 77,
         mass: 8,
         maxmass: 945,
+        maxmul: 1.06,
+        minmass: 315,
+        minmul: .86,
         optmass: 630,
+        optmul: 1,
         power: 4.59,
         rating: "D"
       }, {
-        M: .1,
-        P: 1,
         class: 5,
         cost: 567110,
         edID: 128064085,
@@ -2590,12 +2622,14 @@ module.exports = {
         integrity: 96,
         mass: 20,
         maxmass: 1050,
+        maxmul: 1.1,
+        minmass: 350,
+        minmul: .9,
         optmass: 700,
+        optmul: 1,
         power: 5.1,
         rating: "C"
       }, {
-        M: .07,
-        P: 1.51,
         class: 5,
         cost: 1701320,
         edID: 128064086,
@@ -2605,12 +2639,14 @@ module.exports = {
         integrity: 115,
         mass: 32,
         maxmass: 1155,
+        maxmul: 1.13,
+        minmass: 385,
+        minmul: .93,
         optmass: 770,
+        optmul: 1,
         power: 5.61,
         rating: "B"
       }, {
-        M: .04,
-        P: 2.33,
         class: 5,
         cost: 5103950,
         edID: 128064087,
@@ -2620,12 +2656,14 @@ module.exports = {
         integrity: 106,
         mass: 20,
         maxmass: 1260,
+        maxmul: 1.16,
+        minmass: 420,
+        minmul: .96,
         optmass: 840,
+        optmul: 1,
         power: 6.12,
         rating: "A"
       }, {
-        M: .17,
-        P: .235,
         class: 4,
         cost: 19880,
         edID: 128064078,
@@ -2635,12 +2673,14 @@ module.exports = {
         integrity: 72,
         mass: 10,
         maxmass: 420,
+        maxmul: 1.03,
+        minmass: 140,
+        minmul: .83,
         optmass: 280,
+        optmul: 1,
         power: 3.28,
         rating: "E"
       }, {
-        M: .14,
-        P: .5145,
         class: 4,
         cost: 59630,
         edID: 128064079,
@@ -2649,13 +2689,15 @@ module.exports = {
         id: "td",
         integrity: 64,
         mass: 4,
-        maxmass: 473,
+        maxmass: 472.5,
+        maxmul: 1.06,
+        minmass: 157.5,
+        minmul: .86,
         optmass: 315,
+        optmul: 1,
         power: 3.69,
         rating: "D"
       }, {
-        M: .1,
-        P: 1,
         class: 4,
         cost: 178900,
         edID: 128064080,
@@ -2665,12 +2707,14 @@ module.exports = {
         integrity: 80,
         mass: 10,
         maxmass: 525,
+        maxmul: 1.1,
+        minmass: 175,
+        minmul: .9,
         optmass: 350,
+        optmul: 1,
         power: 4.1,
         rating: "C"
       }, {
-        M: .07,
-        P: 1.51,
         class: 4,
         cost: 536690,
         edID: 128064081,
@@ -2679,13 +2723,15 @@ module.exports = {
         id: "tb",
         integrity: 96,
         mass: 16,
-        maxmass: 578,
+        maxmass: 577.5,
+        maxmul: 1.13,
+        minmass: 192.5,
+        minmul: .93,
         optmass: 385,
+        optmul: 1,
         power: 4.51,
         rating: "B"
       }, {
-        M: .04,
-        P: 2.33,
         class: 4,
         cost: 1610080,
         edID: 128064082,
@@ -2695,12 +2741,14 @@ module.exports = {
         integrity: 88,
         mass: 10,
         maxmass: 630,
+        maxmul: 1.16,
+        minmass: 210,
+        minmul: .96,
         optmass: 420,
+        optmul: 1,
         power: 4.92,
         rating: "A"
       }, {
-        M: .17,
-        P: .235,
         class: 3,
         cost: 6270,
         edID: 128064073,
@@ -2710,12 +2758,14 @@ module.exports = {
         integrity: 58,
         mass: 5,
         maxmass: 120,
+        maxmul: 1.03,
+        minmass: 40,
+        minmul: .83,
         optmass: 80,
+        optmul: 1,
         power: 2.48,
         rating: "E"
       }, {
-        M: .14,
-        P: .5145,
         class: 3,
         cost: 18810,
         edID: 128064074,
@@ -2725,12 +2775,14 @@ module.exports = {
         integrity: 51,
         mass: 2,
         maxmass: 135,
+        maxmul: 1.06,
+        minmass: 45,
+        minmul: .86,
         optmass: 90,
+        optmul: 1,
         power: 2.79,
         rating: "D"
       }, {
-        M: .1,
-        P: 1,
         class: 3,
         cost: 56440,
         edID: 128064075,
@@ -2740,12 +2792,14 @@ module.exports = {
         integrity: 64,
         mass: 5,
         maxmass: 150,
+        maxmul: 1.1,
+        minmass: 50,
+        minmul: .9,
         optmass: 100,
+        optmul: 1,
         power: 3.1,
         rating: "C"
       }, {
-        M: .07,
-        P: 1.51,
         class: 3,
         cost: 169300,
         edID: 128064076,
@@ -2755,12 +2809,14 @@ module.exports = {
         integrity: 77,
         mass: 8,
         maxmass: 165,
+        maxmul: 1.13,
+        minmass: 55,
+        minmul: .93,
         optmass: 110,
+        optmul: 1,
         power: 3.41,
         rating: "B"
       }, {
-        M: .04,
-        P: 2.33,
         class: 3,
         cost: 507910,
         edID: 128064077,
@@ -2770,12 +2826,14 @@ module.exports = {
         integrity: 72,
         mass: 5,
         maxmass: 180,
+        maxmul: 1.16,
+        minmass: 60,
+        minmul: .96,
         optmass: 120,
+        optmul: 1,
         power: 3.72,
         rating: "A"
       }, {
-        M: .17,
-        P: .235,
         class: 2,
         cost: 1980,
         edID: 128064068,
@@ -2785,12 +2843,14 @@ module.exports = {
         integrity: 46,
         mass: 2.5,
         maxmass: 72,
+        maxmul: 1.03,
+        minmass: 24,
+        minmul: .83,
         optmass: 48,
+        optmul: 1,
         power: 2,
         rating: "E"
       }, {
-        M: .14,
-        P: .5145,
         class: 2,
         cost: 5930,
         edID: 128064069,
@@ -2800,12 +2860,14 @@ module.exports = {
         integrity: 41,
         mass: 1,
         maxmass: 81,
+        maxmul: 1.06,
+        minmass: 27,
+        minmul: .86,
         optmass: 54,
+        optmul: 1,
         power: 2.25,
         rating: "D"
       }, {
-        M: .1,
-        P: 1,
         class: 2,
         cost: 17800,
         edID: 128064070,
@@ -2815,12 +2877,14 @@ module.exports = {
         integrity: 51,
         mass: 2.5,
         maxmass: 90,
+        maxmul: 1.1,
+        minmass: 30,
+        minmul: .9,
         optmass: 60,
+        optmul: 1,
         power: 2.5,
         rating: "C"
       }, {
-        M: .07,
-        P: 1.51,
         class: 2,
         cost: 53410,
         edID: 128064071,
@@ -2830,12 +2894,14 @@ module.exports = {
         integrity: 61,
         mass: 4,
         maxmass: 99,
+        maxmul: 1.13,
+        minmass: 33,
+        minmul: .93,
         optmass: 66,
+        optmul: 1,
         power: 2.75,
         rating: "B"
       }, {
-        M: .04,
-        P: 2.33,
         class: 2,
         cost: 160220,
         edID: 128064072,
@@ -2845,39 +2911,47 @@ module.exports = {
         integrity: 56,
         mass: 2.5,
         maxmass: 108,
+        maxmul: .96,
+        minmass: 36,
+        minmul: 1.16,
         optmass: 72,
+        optmul: 1,
         power: 3,
         rating: "A"
       }, {
-        M: .04,
-        P: 2.33,
         class: 3,
-        cost: 5103952,
+        cost: 5103950,
         edID: 128682013,
         eddbID: 1548,
         grp: "t",
         id: "tz",
-        integrity: 70,
+        integrity: 55,
         mass: 5,
         maxmass: 200,
+        maxmul: 1.6,
+        minmass: 70,
+        minmul: .9,
         name: "Enhanced Performance",
         optmass: 90,
+        optmul: 1.25,
         power: 5,
         rating: "A"
       }, {
-        M: .04,
-        P: 2.33,
         class: 2,
         cost: 1610080,
         edID: 128682014,
         eddbID: 1547,
         grp: "t",
         id: "u0",
-        integrity: 56,
+        integrity: 40,
         mass: 2.5,
         maxmass: 120,
+        maxmul: 1.6,
+        minmass: 50,
+        minmul: .9,
         name: "Enhanced Performance",
         optmass: 60,
+        optmul: 1.25,
         power: 4,
         rating: "A"
       } ],
@@ -8122,9 +8196,9 @@ module.exports = {
         id: "B6",
         mass: 1.3,
         maxmass: 63,
-        maxmul: .4,
+        maxmul: 1.4,
         minmass: 13,
-        minmul: 1.4,
+        minmul: .4,
         optmass: 25,
         optmul: .9,
         power: 1.2,
@@ -8139,9 +8213,9 @@ module.exports = {
         id: "B5",
         mass: 2.5,
         maxmass: 138,
-        maxmul: .4,
+        maxmul: 1.4,
         minmass: 23,
-        minmul: 1.4,
+        minmul: .4,
         optmass: 55,
         optmul: .9,
         power: 1.5,
@@ -8156,9 +8230,9 @@ module.exports = {
         id: "B4",
         mass: 5,
         maxmass: 413,
-        maxmul: .4,
+        maxmul: 1.4,
         minmass: 83,
-        minmul: 1.4,
+        minmul: .4,
         optmass: 165,
         optmul: .9,
         power: 1.8,
@@ -8173,9 +8247,9 @@ module.exports = {
         id: "B3",
         mass: 10,
         maxmass: 713,
-        maxmul: .4,
+        maxmul: 1.4,
         minmass: 143,
-        minmul: 1.4,
+        minmul: .4,
         optmass: 285,
         optmul: .9,
         power: 2.2,
@@ -8190,9 +8264,9 @@ module.exports = {
         id: "B2",
         mass: 20,
         maxmass: 1013,
-        maxmul: .4,
+        maxmul: 1.4,
         minmass: 203,
-        minmul: 1.4,
+        minmul: .4,
         optmass: 405,
         optmul: .9,
         power: 2.6,
@@ -8207,9 +8281,9 @@ module.exports = {
         id: "B1",
         mass: 40,
         maxmass: 1350,
-        maxmul: .4,
+        maxmul: 1.4,
         minmass: 270,
-        minmul: 1.4,
+        minmul: .4,
         optmass: 540,
         optmul: .9,
         power: 3.1,
@@ -8224,9 +8298,9 @@ module.exports = {
         id: "B0",
         mass: 80,
         maxmass: 2650,
-        maxmul: .4,
+        maxmul: 1.4,
         minmass: 530,
-        minmul: 1.4,
+        minmul: .4,
         optmass: 1060,
         optmul: .9,
         power: 3.5,
@@ -8241,9 +8315,9 @@ module.exports = {
         id: "B7",
         mass: 160,
         maxmass: 4500,
-        maxmul: .4,
+        maxmul: 1.4,
         minmass: 900,
-        minmul: 1.4,
+        minmul: .4,
         optmass: 1800,
         optmul: .9,
         power: 4,
@@ -10026,9 +10100,9 @@ module.exports = {
         id: "p6",
         mass: 2.5,
         maxmass: 63,
-        maxmul: 1,
+        maxmul: 2,
         minmass: 13,
-        minmul: 2,
+        minmul: 1,
         optmass: 25,
         optmul: 1.5,
         power: 2.52,
@@ -10044,9 +10118,9 @@ module.exports = {
         id: "p5",
         mass: 5,
         maxmass: 138,
-        maxmul: 1,
+        maxmul: 2,
         minmass: 23,
-        minmul: 2,
+        minmul: 1,
         optmass: 55,
         optmul: 1.5,
         power: 3.15,
@@ -10062,9 +10136,9 @@ module.exports = {
         id: "p4",
         mass: 10,
         maxmass: 413,
-        maxmul: 1,
+        maxmul: 2,
         minmass: 83,
-        minmul: 2,
+        minmul: 1,
         optmass: 165,
         optmul: 1.5,
         power: 3.78,
@@ -10080,9 +10154,9 @@ module.exports = {
         id: "p3",
         mass: 20,
         maxmass: 713,
-        maxmul: 1,
+        maxmul: 2,
         minmass: 143,
-        minmul: 2,
+        minmul: 1,
         optmass: 285,
         optmul: 1.5,
         power: 4.62,
@@ -10098,9 +10172,9 @@ module.exports = {
         id: "p2",
         mass: 40,
         maxmass: 1013,
-        maxmul: 1,
+        maxmul: 2,
         minmass: 203,
-        minmul: 2,
+        minmul: 1,
         optmass: 405,
         optmul: 1.5,
         power: 5.46,
@@ -10116,9 +10190,9 @@ module.exports = {
         id: "p1",
         mass: 80,
         maxmass: 1350,
-        maxmul: 1,
+        maxmul: 2,
         minmass: 270,
-        minmul: 2,
+        minmul: 1,
         optmass: 540,
         optmul: 1.5,
         power: 6.51,
@@ -10134,9 +10208,9 @@ module.exports = {
         id: "p0",
         mass: 160,
         maxmass: 2650,
-        maxmul: 1,
+        maxmul: 2,
         minmass: 530,
-        minmul: 2,
+        minmul: 1,
         optmass: 1060,
         optmul: 1.5,
         power: 7.35,
@@ -10152,9 +10226,9 @@ module.exports = {
         id: "p7",
         mass: 320,
         maxmass: 4500,
-        maxmul: 1,
+        maxmul: 2,
         minmass: 900,
-        minmul: 2,
+        minmul: 1,
         optmass: 1800,
         optmul: 1.5,
         power: 8.4,
@@ -11366,9 +11440,9 @@ module.exports = {
         id: "4t",
         mass: 160,
         maxmass: 4500,
-        maxmul: .3,
+        maxmul: 1.3,
         minmass: 900,
-        minmul: 1.3,
+        minmul: .3,
         optmass: 1800,
         optmul: .8,
         power: 2.4,
@@ -11383,9 +11457,9 @@ module.exports = {
         id: "4s",
         mass: 64,
         maxmass: 4500,
-        maxmul: .4,
+        maxmul: 1.4,
         minmass: 900,
-        minmul: 1.4,
+        minmul: .4,
         optmass: 1800,
         optmul: .9,
         power: 3.2,
@@ -11400,9 +11474,9 @@ module.exports = {
         id: "4r",
         mass: 160,
         maxmass: 4500,
-        maxmul: .5,
+        maxmul: 1.5,
         minmass: 900,
-        minmul: 1.5,
+        minmul: .5,
         optmass: 1800,
         optmul: 1,
         power: 4,
@@ -11417,9 +11491,9 @@ module.exports = {
         id: "4q",
         mass: 256,
         maxmass: 4500,
-        maxmul: .6,
+        maxmul: 1.6,
         minmass: 900,
-        minmul: 1.6,
+        minmul: .6,
         optmass: 1800,
         optmul: 1.1,
         power: 4.8,
@@ -11434,9 +11508,9 @@ module.exports = {
         id: "4p",
         mass: 160,
         maxmass: 4500,
-        maxmul: .7,
+        maxmul: 1.7,
         minmass: 900,
-        minmul: 1.7,
+        minmul: .7,
         optmass: 1800,
         optmul: 1.2,
         power: 5.6,
@@ -11451,9 +11525,9 @@ module.exports = {
         id: "4o",
         mass: 80,
         maxmass: 2650,
-        maxmul: .3,
+        maxmul: 1.3,
         minmass: 530,
-        minmul: 1.3,
+        minmul: .3,
         optmass: 1060,
         optmul: .8,
         power: 2.1,
@@ -11468,9 +11542,9 @@ module.exports = {
         id: "4n",
         mass: 32,
         maxmass: 2650,
-        maxmul: .4,
+        maxmul: 1.4,
         minmass: 530,
-        minmul: 1.4,
+        minmul: .4,
         optmass: 1060,
         optmul: .9,
         power: 2.8,
@@ -11485,9 +11559,9 @@ module.exports = {
         id: "4m",
         mass: 80,
         maxmass: 2650,
-        maxmul: .5,
+        maxmul: 1.5,
         minmass: 530,
-        minmul: 1.5,
+        minmul: .5,
         optmass: 1060,
         optmul: 1,
         power: 3.5,
@@ -11502,9 +11576,9 @@ module.exports = {
         id: "4l",
         mass: 128,
         maxmass: 2650,
-        maxmul: .6,
+        maxmul: 1.6,
         minmass: 530,
-        minmul: 1.6,
+        minmul: .6,
         optmass: 1060,
         optmul: 1.1,
         power: 4.2,
@@ -11519,9 +11593,9 @@ module.exports = {
         id: "4k",
         mass: 80,
         maxmass: 2650,
-        maxmul: .7,
+        maxmul: 1.7,
         minmass: 530,
-        minmul: 1.7,
+        minmul: .7,
         optmass: 1060,
         optmul: 1.2,
         power: 4.9,
@@ -11536,9 +11610,9 @@ module.exports = {
         id: "4j",
         mass: 40,
         maxmass: 1350,
-        maxmul: .3,
+        maxmul: 1.3,
         minmass: 270,
-        minmul: 1.3,
+        minmul: .3,
         optmass: 540,
         optmul: .8,
         power: 1.86,
@@ -11553,9 +11627,9 @@ module.exports = {
         id: "4i",
         mass: 16,
         maxmass: 1350,
-        maxmul: .4,
+        maxmul: 1.4,
         minmass: 270,
-        minmul: 1.4,
+        minmul: .4,
         optmass: 540,
         optmul: .9,
         power: 2.48,
@@ -11570,9 +11644,9 @@ module.exports = {
         id: "4h",
         mass: 40,
         maxmass: 1350,
-        maxmul: .5,
+        maxmul: 1.5,
         minmass: 270,
-        minmul: 1.5,
+        minmul: .5,
         optmass: 540,
         optmul: 1,
         power: 3.1,
@@ -11587,9 +11661,9 @@ module.exports = {
         id: "4g",
         mass: 64,
         maxmass: 1350,
-        maxmul: .6,
+        maxmul: 1.6,
         minmass: 270,
-        minmul: 1.6,
+        minmul: .6,
         optmass: 540,
         optmul: 1.1,
         power: 3.72,
@@ -11604,9 +11678,9 @@ module.exports = {
         id: "4f",
         mass: 40,
         maxmass: 1350,
-        maxmul: .7,
+        maxmul: 1.7,
         minmass: 270,
-        minmul: 1.7,
+        minmul: .7,
         optmass: 540,
         optmul: 1.2,
         power: 4.34,
@@ -11621,9 +11695,9 @@ module.exports = {
         id: "4e",
         mass: 20,
         maxmass: 1013,
-        maxmul: .3,
+        maxmul: 1.3,
         minmass: 203,
-        minmul: 1.3,
+        minmul: .3,
         optmass: 405,
         optmul: .8,
         power: 1.56,
@@ -11638,9 +11712,9 @@ module.exports = {
         id: "4d",
         mass: 8,
         maxmass: 1013,
-        maxmul: .4,
+        maxmul: 1.4,
         minmass: 203,
-        minmul: 1.4,
+        minmul: .4,
         optmass: 405,
         optmul: .9,
         power: 2.08,
@@ -11655,9 +11729,9 @@ module.exports = {
         id: "4c",
         mass: 20,
         maxmass: 1013,
-        maxmul: .5,
+        maxmul: 1.5,
         minmass: 203,
-        minmul: 1.5,
+        minmul: .5,
         optmass: 405,
         optmul: 1,
         power: 2.6,
@@ -11672,9 +11746,9 @@ module.exports = {
         id: "4b",
         mass: 32,
         maxmass: 1013,
-        maxmul: .6,
+        maxmul: 1.6,
         minmass: 203,
-        minmul: 1.6,
+        minmul: .6,
         optmass: 405,
         optmul: 1.1,
         power: 3.12,
@@ -11689,9 +11763,9 @@ module.exports = {
         id: "4a",
         mass: 20,
         maxmass: 1013,
-        maxmul: .7,
+        maxmul: 1.7,
         minmass: 203,
-        minmul: 1.7,
+        minmul: .7,
         optmass: 405,
         optmul: 1.2,
         power: 3.64,
@@ -11706,9 +11780,9 @@ module.exports = {
         id: "49",
         mass: 10,
         maxmass: 713,
-        maxmul: .3,
+        maxmul: 1.3,
         minmass: 143,
-        minmul: 1.3,
+        minmul: .3,
         optmass: 285,
         optmul: .8,
         power: 1.32,
@@ -11723,9 +11797,9 @@ module.exports = {
         id: "48",
         mass: 4,
         maxmass: 713,
-        maxmul: .4,
+        maxmul: 1.4,
         minmass: 143,
-        minmul: 1.4,
+        minmul: .4,
         optmass: 285,
         optmul: .9,
         power: 1.76,
@@ -11740,9 +11814,9 @@ module.exports = {
         id: "47",
         mass: 10,
         maxmass: 713,
-        maxmul: .5,
+        maxmul: 1.5,
         minmass: 143,
-        minmul: 1.5,
+        minmul: .5,
         optmass: 285,
         optmul: 1,
         power: 2.2,
@@ -11757,9 +11831,9 @@ module.exports = {
         id: "46",
         mass: 16,
         maxmass: 713,
-        maxmul: .6,
+        maxmul: 1.6,
         minmass: 143,
-        minmul: 1.6,
+        minmul: .6,
         optmass: 285,
         optmul: 1.1,
         power: 2.64,
@@ -11774,9 +11848,9 @@ module.exports = {
         id: "45",
         mass: 10,
         maxmass: 713,
-        maxmul: .7,
+        maxmul: 1.7,
         minmass: 143,
-        minmul: 1.7,
+        minmul: .7,
         optmass: 285,
         optmul: 1.2,
         power: 3.08,
@@ -11791,9 +11865,9 @@ module.exports = {
         id: "44",
         mass: 5,
         maxmass: 413,
-        maxmul: .3,
+        maxmul: 1.3,
         minmass: 83,
-        minmul: 1.3,
+        minmul: .3,
         optmass: 165,
         optmul: .8,
         power: 1.08,
@@ -11808,9 +11882,9 @@ module.exports = {
         id: "43",
         mass: 2,
         maxmass: 413,
-        maxmul: .4,
+        maxmul: 1.4,
         minmass: 83,
-        minmul: 1.4,
+        minmul: .4,
         optmass: 165,
         optmul: .9,
         power: 1.44,
@@ -11825,9 +11899,9 @@ module.exports = {
         id: "42",
         mass: 5,
         maxmass: 413,
-        maxmul: .5,
+        maxmul: 1.5,
         minmass: 83,
-        minmul: 1.5,
+        minmul: .5,
         optmass: 165,
         optmul: 1,
         power: 1.8,
@@ -11842,9 +11916,9 @@ module.exports = {
         id: "41",
         mass: 8,
         maxmass: 413,
-        maxmul: .6,
+        maxmul: 1.6,
         minmass: 83,
-        minmul: 1.6,
+        minmul: .6,
         optmass: 165,
         optmul: 1.1,
         power: 2.16,
@@ -11859,9 +11933,9 @@ module.exports = {
         id: "40",
         mass: 5,
         maxmass: 413,
-        maxmul: .7,
+        maxmul: 1.7,
         minmass: 83,
-        minmul: 1.7,
+        minmul: .7,
         optmass: 165,
         optmul: 1.2,
         power: 2.52,
@@ -11876,9 +11950,9 @@ module.exports = {
         id: "3v",
         mass: 2.5,
         maxmass: 138,
-        maxmul: .3,
+        maxmul: 1.3,
         minmass: 28,
-        minmul: 1.3,
+        minmul: .3,
         optmass: 55,
         optmul: .8,
         power: .9,
@@ -11893,9 +11967,9 @@ module.exports = {
         id: "3u",
         mass: 1,
         maxmass: 138,
-        maxmul: .4,
+        maxmul: 1.4,
         minmass: 28,
-        minmul: 1.4,
+        minmul: .4,
         optmass: 55,
         optmul: .9,
         power: 1.2,
@@ -11910,9 +11984,9 @@ module.exports = {
         id: "3t",
         mass: 2.5,
         maxmass: 138,
-        maxmul: .5,
+        maxmul: 1.5,
         minmass: 28,
-        minmul: 1.5,
+        minmul: .5,
         optmass: 55,
         optmul: 1,
         power: 1.5,
@@ -11927,9 +12001,9 @@ module.exports = {
         id: "3s",
         mass: 4,
         maxmass: 138,
-        maxmul: .6,
+        maxmul: 1.6,
         minmass: 28,
-        minmul: 1.6,
+        minmul: .6,
         optmass: 55,
         optmul: 1.1,
         power: 1.8,
@@ -11944,9 +12018,9 @@ module.exports = {
         id: "3r",
         mass: 2.5,
         maxmass: 138,
-        maxmul: .7,
+        maxmul: 1.7,
         minmass: 28,
-        minmul: 1.7,
+        minmul: .7,
         optmass: 55,
         optmul: 1.2,
         power: 2.1,
@@ -11961,9 +12035,9 @@ module.exports = {
         id: "1x",
         mass: 1.3,
         maxmass: 63,
-        maxmul: .7,
+        maxmul: 1.7,
         minmass: 13,
-        minmul: 1.7,
+        minmul: .7,
         optmass: 25,
         optmul: 1.2,
         power: 1.68,
diff --git a/dist/index.json b/dist/index.json
index 5248f98..dc9a641 100644
--- a/dist/index.json
+++ b/dist/index.json
@@ -12,8 +12,8 @@
 				"boost": 320,
 				"boostEnergy": 9,
 				"agility": 8,
-				"baseShieldStrength": 78,
-				"baseArmour": 162,
+				"baseShieldStrength": 60,
+				"baseArmour": 90,
 				"hullMass": 35,
 				"masslock": 7,
 				"pipSpeed": 0.13625
@@ -115,12 +115,12 @@
 				"manufacturer": "Faulcon DeLacy",
 				"class": 3,
 				"hullCost": 141889930,
-				"speed": 183,
-				"boost": 244,
-				"boostEnergy": 29,
+				"speed": 180,
+				"boost": 240,
+				"boostEnergy": 27,
 				"agility": 2,
-				"baseShieldStrength": 362,
-				"baseArmour": 945,
+				"baseShieldStrength": 350,
+				"baseArmour": 525,
 				"hullMass": 400,
 				"masslock": 23,
 				"pipSpeed": 0.13875,
@@ -257,12 +257,12 @@
 				"manufacturer": "Lakon",
 				"class": 2,
 				"hullCost": 6135660,
-				"speed": 254,
-				"boost": 345,
-				"boostEnergy": 14,
+				"speed": 250,
+				"boost": 340,
+				"boostEnergy": 13,
 				"agility": 6,
-				"baseShieldStrength": 152,
-				"baseArmour": 378,
+				"baseShieldStrength": 140,
+				"baseArmour": 210,
 				"hullMass": 280,
 				"masslock": 11,
 				"pipSpeed": 0.13
@@ -378,12 +378,12 @@
 				"manufacturer": "Lakon",
 				"class": 2,
 				"hullCost": 3818240,
-				"speed": 223,
-				"boost": 304,
+				"speed": 220,
+				"boost": 300,
 				"boostEnergy": 13,
 				"agility": 8,
-				"baseShieldStrength": 105,
-				"baseArmour": 324,
+				"baseShieldStrength": 120,
+				"baseArmour": 180,
 				"hullMass": 150,
 				"masslock": 8,
 				"pipSpeed": 0.125
@@ -487,12 +487,12 @@
 				"manufacturer": "Saud Kruger",
 				"class": 3,
 				"hullCost": 79654610,
-				"speed": 195,
-				"boost": 273,
-				"boostEnergy": 20,
+				"speed": 200,
+				"boost": 280,
+				"boostEnergy": 19,
 				"agility": 2,
-				"baseShieldStrength": 92,
-				"baseArmour": 504,
+				"baseShieldStrength": 280,
+				"baseArmour": 280,
 				"hullMass": 1100,
 				"masslock": 18,
 				"pipSpeed": -1,
@@ -660,12 +660,12 @@
 				"manufacturer": "Faulcon DeLacy",
 				"class": 1,
 				"hullCost": 205800,
-				"speed": 282,
-				"boost": 402,
-				"boostEnergy": 11,
+				"speed": 280,
+				"boost": 400,
+				"boostEnergy": 10,
 				"agility": 6,
-				"baseShieldStrength": 92,
-				"baseArmour": 216,
+				"baseShieldStrength": 80,
+				"baseArmour": 120,
 				"hullMass": 180,
 				"masslock": 8,
 				"pipSpeed": 0.125
@@ -772,11 +772,11 @@
 				"class": 1,
 				"hullCost": 603740,
 				"speed": 200,
-				"boost": 299,
-				"boostEnergy": 11,
+				"boost": 300,
+				"boostEnergy": 10,
 				"agility": 4,
-				"baseShieldStrength": 125,
-				"baseArmour": 216,
+				"baseShieldStrength": 120,
+				"baseArmour": 120,
 				"hullMass": 210,
 				"masslock": 8,
 				"pipSpeed": 0.125
@@ -888,12 +888,12 @@
 				"manufacturer": "Lakon",
 				"class": 1,
 				"hullCost": 1635700,
-				"speed": 242,
-				"boost": 316,
-				"boostEnergy": 14,
+				"speed": 260,
+				"boost": 340,
+				"boostEnergy": 13,
 				"agility": 5,
-				"baseShieldStrength": 115,
-				"baseArmour": 270,
+				"baseShieldStrength": 150,
+				"baseArmour": 150,
 				"hullMass": 298,
 				"masslock": 10,
 				"pipSpeed": 0.09625
@@ -999,12 +999,12 @@
 				"manufacturer": "Lakon",
 				"class": 1,
 				"hullCost": 461340,
-				"speed": 283,
-				"boost": 384,
-				"boostEnergy": 11,
+				"speed": 280,
+				"boost": 380,
+				"boostEnergy": 10,
 				"agility": 8,
-				"baseShieldStrength": 93,
-				"baseArmour": 216,
+				"baseShieldStrength": 120,
+				"baseArmour": 120,
 				"hullMass": 170,
 				"masslock": 8,
 				"pipSpeed": 0.09875
@@ -1110,12 +1110,12 @@
 				"manufacturer": "Core Dynamics",
 				"class": 1,
 				"hullCost": 10440,
-				"speed": 239,
-				"boost": 349,
-				"boostEnergy": 9,
+				"speed": 240,
+				"boost": 350,
+				"boostEnergy": 8,
 				"agility": 10,
-				"baseShieldStrength": 89,
-				"baseArmour": 72,
+				"baseShieldStrength": 60,
+				"baseArmour": 40,
 				"hullMass": 50,
 				"masslock": 6,
 				"pipSpeed": 0.0625
@@ -1213,12 +1213,12 @@
 				"manufacturer": "Core Dynamics",
 				"class": 2,
 				"hullCost": 19072000,
-				"speed": 214,
-				"boost": 357,
-				"boostEnergy": 21,
+				"speed": 210,
+				"boost": 350,
+				"boostEnergy": 19,
 				"agility": 6,
-				"baseShieldStrength": 133,
-				"baseArmour": 540,
+				"baseShieldStrength": 200,
+				"baseArmour": 300,
 				"hullMass": 480,
 				"masslock": 14,
 				"pipSpeed": 0.11125
@@ -1328,11 +1328,11 @@
 				"manufacturer": "Core Dynamics",
 				"class": 3,
 				"hullCost": 182589570,
-				"speed": 198,
-				"boost": 257,
+				"speed": 200,
+				"boost": 260,
 				"boostEnergy": 27,
 				"agility": 2,
-				"baseShieldStrength": 516,
+				"baseShieldStrength": 555,
 				"baseArmour": 666,
 				"hullMass": 900,
 				"masslock": 24,
@@ -1466,12 +1466,12 @@
 				"manufacturer": "Core Dynamics",
 				"class": 2,
 				"hullCost": 13469990,
-				"speed": 182,
-				"boost": 304,
-				"boostEnergy": 21,
+				"speed": 180,
+				"boost": 300,
+				"boostEnergy": 19,
 				"agility": 2,
-				"baseShieldStrength": 104,
-				"baseArmour": 540,
+				"baseShieldStrength": 200,
+				"baseArmour": 300,
 				"hullMass": 580,
 				"masslock": 14,
 				"pipSpeed": 0.0725
@@ -1585,12 +1585,12 @@
 				"manufacturer": "Core Dynamics",
 				"class": 2,
 				"hullCost": 34774790,
-				"speed": 171,
-				"boost": 282,
-				"boostEnergy": 21,
+				"speed": 170,
+				"boost": 280,
+				"boostEnergy": 23,
 				"agility": 2,
-				"baseShieldStrength": 186,
-				"baseArmour": 630,
+				"baseShieldStrength": 250,
+				"baseArmour": 350,
 				"hullMass": 580,
 				"masslock": 14,
 				"pipSpeed": 0.1025,
@@ -1705,12 +1705,12 @@
 				"manufacturer": "Zorgon Peterson",
 				"class": 2,
 				"hullCost": 51232230,
-				"speed": 265,
-				"boost": 357,
-				"boostEnergy": 21,
+				"speed": 260,
+				"boost": 350,
+				"boostEnergy": 19,
 				"agility": 6,
-				"baseShieldStrength": 271,
-				"baseArmour": 405,
+				"baseShieldStrength": 300,
+				"baseArmour": 225,
 				"hullMass": 250,
 				"masslock": 12,
 				"pipSpeed": 0.03875
@@ -1824,12 +1824,12 @@
 				"manufacturer": "Zorgon Peterson",
 				"class": 1,
 				"hullCost": 29790,
-				"speed": 203,
-				"boost": 305,
+				"speed": 200,
+				"boost": 300,
 				"agility": 6,
 				"boostEnergy": 7,
-				"baseShieldStrength": 65,
-				"baseArmour": 90,
+				"baseShieldStrength": 50,
+				"baseArmour": 50,
 				"hullMass": 14,
 				"masslock": 6,
 				"pipSpeed": 0.1625
@@ -1925,12 +1925,12 @@
 				"manufacturer": "Gutamaya",
 				"class": 3,
 				"hullCost": 21077780,
-				"speed": 306,
-				"boost": 388,
-				"boostEnergy": 21,
+				"speed": 300,
+				"boost": 380,
+				"boostEnergy": 19,
 				"agility": 2,
-				"baseShieldStrength": 186,
-				"baseArmour": 486,
+				"baseShieldStrength": 180,
+				"baseArmour": 270,
 				"hullMass": 400,
 				"masslock": 12,
 				"pipSpeed": 0.1
@@ -2046,10 +2046,10 @@
 				"hullCost": 2481550,
 				"speed": 280,
 				"boost": 380,
-				"boostEnergy": 11,
+				"boostEnergy": 10,
 				"agility": 6,
-				"baseShieldStrength": 230,
-				"baseArmour": 144,
+				"baseShieldStrength": 200,
+				"baseArmour": 80,
 				"hullMass": 35,
 				"masslock": 7,
 				"pipSpeed": 0.05375
@@ -2157,12 +2157,12 @@
 				"manufacturer": "Gutamaya",
 				"class": 3,
 				"hullCost": 199926890,
-				"speed": 202,
-				"boost": 323,
-				"boostEnergy": 24,
+				"speed": 200,
+				"boost": 320,
+				"boostEnergy": 23,
 				"agility": 2,
-				"baseShieldStrength": 703,
-				"baseArmour": 720,
+				"baseShieldStrength": 600,
+				"baseArmour": 400,
 				"hullMass": 1100,
 				"masslock": 27,
 				"pipSpeed": 0.05,
@@ -2293,12 +2293,12 @@
 				"manufacturer": "Core Dynamics",
 				"class": 1,
 				"hullCost": 72180,
-				"speed": 298,
-				"boost": 397,
-				"boostEnergy": 9,
+				"speed": 300,
+				"boost": 400,
+				"boostEnergy": 8,
 				"agility": 6,
-				"baseShieldStrength": 104,
-				"baseArmour": 108,
+				"baseShieldStrength": 80,
+				"baseArmour": 60,
 				"hullMass": 50,
 				"masslock": 6,
 				"pipSpeed": 0.075
@@ -2396,12 +2396,12 @@
 				"manufacturer": "Lakon",
 				"class": 2,
 				"hullCost": 2951180,
-				"speed": 202,
-				"boost": 303,
+				"speed": 200,
+				"boost": 300,
 				"boostEnergy": 10,
 				"agility": 2,
-				"baseShieldStrength": 99,
-				"baseArmour": 243,
+				"baseShieldStrength": 135,
+				"baseArmour": 135,
 				"hullMass": 180,
 				"masslock": 8,
 				"pipSpeed": 0.1375,
@@ -2510,12 +2510,12 @@
 				"manufacturer": "Saud Kruger",
 				"class": 3,
 				"hullCost": 47798080,
-				"speed": 303,
-				"boost": 384,
-				"boostEnergy": 17,
+				"speed": 300,
+				"boost": 380,
+				"boostEnergy": 16,
 				"agility": 2,
-				"baseShieldStrength": 114,
-				"baseArmour": 396,
+				"baseShieldStrength": 220,
+				"baseArmour": 220,
 				"hullMass": 580,
 				"masslock": 13,
 				"pipSpeed": 0.08375,
@@ -2648,12 +2648,12 @@
 				"manufacturer": "Faulcon DeLacy",
 				"class": 2,
 				"hullCost": 55171380,
-				"speed": 234,
-				"boost": 305,
-				"boostEnergy": 24,
+				"speed": 230,
+				"boost": 300,
+				"boostEnergy": 23,
 				"agility": 6,
-				"baseShieldStrength": 294,
-				"baseArmour": 468,
+				"baseShieldStrength": 260,
+				"baseArmour": 260,
 				"hullMass": 350,
 				"masslock": 17,
 				"pipSpeed": 0.0975
@@ -2772,11 +2772,11 @@
 				"class": 1,
 				"hullCost": 12870,
 				"speed": 220,
-				"boost": 321,
+				"boost": 320,
 				"boostEnergy": 7,
 				"agility": 8,
-				"baseShieldStrength": 52,
-				"baseArmour": 108,
+				"baseShieldStrength": 40,
+				"baseArmour": 60,
 				"hullMass": 25,
 				"masslock": 6,
 				"pipSpeed": 0.1375
@@ -2874,12 +2874,12 @@
 				"manufacturer": "Lakon",
 				"class": 2,
 				"hullCost": 865790,
-				"speed": 223,
-				"boost": 355,
-				"boostEnergy": 11,
+				"speed": 220,
+				"boost": 350,
+				"boostEnergy": 10,
 				"agility": 3,
-				"baseShieldStrength": 77,
-				"baseArmour": 162,
+				"baseShieldStrength": 90,
+				"baseArmour": 90,
 				"hullMass": 155,
 				"masslock": 8,
 				"pipSpeed": 0.1475
@@ -2985,12 +2985,12 @@
 				"manufacturer": "Lakon",
 				"class": 3,
 				"hullCost": 16881510,
-				"speed": 181,
-				"boost": 301,
-				"boostEnergy": 11,
+				"speed": 180,
+				"boost": 300,
+				"boostEnergy": 10,
 				"agility": 2,
-				"baseShieldStrength": 78,
-				"baseArmour": 306,
+				"baseShieldStrength": 155,
+				"baseArmour": 170,
 				"hullMass": 420,
 				"masslock": 10,
 				"pipSpeed": 0.16625
@@ -3104,12 +3104,12 @@
 				"manufacturer": "Lakon",
 				"class": 3,
 				"hullCost": 73255150,
-				"speed": 131,
-				"boost": 201,
-				"boostEnergy": 21,
+				"speed": 130,
+				"boost": 200,
+				"boostEnergy": 19,
 				"agility": 0,
-				"baseShieldStrength": 88,
-				"baseArmour": 432,
+				"baseShieldStrength": 240,
+				"baseArmour": 240,
 				"hullMass": 1000,
 				"masslock": 16,
 				"pipSpeed": 0.17375,
@@ -3228,12 +3228,12 @@
 				"manufacturer": "Faulcon DeLacy",
 				"class": 1,
 				"hullCost": 95900,
-				"speed": 310,
-				"boost": 388,
-				"boostEnergy": 11,
+				"speed": 320,
+				"boost": 400,
+				"boostEnergy": 10,
 				"agility": 6,
-				"baseShieldStrength": 137,
-				"baseArmour": 126,
+				"baseShieldStrength": 105,
+				"baseArmour": 70,
 				"hullMass": 60,
 				"masslock": 7,
 				"pipSpeed": 0.09375
@@ -3335,12 +3335,12 @@
 				"manufacturer": "Faulcon DeLacy",
 				"class": 1,
 				"hullCost": 310220,
-				"speed": 271,
-				"boost": 342,
+				"speed": 270,
+				"boost": 340,
 				"boostEnergy": 10,
 				"agility": 4,
-				"baseShieldStrength": 103,
-				"baseArmour": 270,
+				"baseShieldStrength": 150,
+				"baseArmour": 150,
 				"hullMass": 190,
 				"masslock": 7,
 				"pipSpeed": 0.0875
@@ -3446,12 +3446,12 @@
 				"manufacturer": "Core Dynamics",
 				"class": 1,
 				"hullCost": 4689640,
-				"speed": 215,
-				"boost": 348,
-				"boostEnergy": 17,
+				"speed": 210,
+				"boost": 340,
+				"boostEnergy": 16,
 				"agility": 9,
-				"baseShieldStrength": 293,
-				"baseArmour": 288,
+				"baseShieldStrength": 240,
+				"baseArmour": 160,
 				"hullMass": 230,
 				"masslock": 10,
 				"pipSpeed": 0.02375
@@ -4009,8 +4009,6 @@
 			],
 			"t": [
 				{
-					"M": 0.17,
-					"P": 0.235,
 					"class": 8,
 					"cost": 2007240,
 					"edID": 128064098,
@@ -4020,13 +4018,15 @@
 					"integrity": 135,
 					"mass": 160,
 					"maxmass": 3360,
+					"maxmul": 1.03,
+					"minmass": 1120,
+					"minmul": 0.83,
 					"optmass": 2240,
+					"optmul": 1,
 					"power": 7.2,
 					"rating": "E"
 				},
 				{
-					"M": 0.14,
-					"P": 0.5145,
 					"class": 8,
 					"cost": 6021720,
 					"edID": 128064099,
@@ -4036,13 +4036,15 @@
 					"integrity": 120,
 					"mass": 64,
 					"maxmass": 3780,
+					"maxmul": 1.06,
+					"minmass": 1260,
+					"minmul": 0.86,
 					"optmass": 2520,
+					"optmul": 1,
 					"power": 8.1,
 					"rating": "D"
 				},
 				{
-					"M": 0.1,
-					"P": 1,
 					"class": 8,
 					"cost": 18065170,
 					"edID": 128064100,
@@ -4052,13 +4054,15 @@
 					"integrity": 150,
 					"mass": 160,
 					"maxmass": 4200,
+					"maxmul": 1.1,
+					"minmass": 1400,
+					"minmul": 0.9,
 					"optmass": 2800,
+					"optmul": 1,
 					"power": 9,
 					"rating": "C"
 				},
 				{
-					"M": 0.07,
-					"P": 1.51,
 					"class": 8,
 					"cost": 54195500,
 					"edID": 128064101,
@@ -4068,13 +4072,15 @@
 					"integrity": 180,
 					"mass": 256,
 					"maxmass": 4620,
+					"maxmul": 1.13,
+					"minmass": 1540,
+					"minmul": 0.93,
 					"optmass": 3080,
+					"optmul": 1,
 					"power": 9.9,
 					"rating": "B"
 				},
 				{
-					"M": 0.04,
-					"P": 2.33,
 					"class": 8,
 					"cost": 162586490,
 					"edID": 128064102,
@@ -4084,13 +4090,15 @@
 					"integrity": 165,
 					"mass": 160,
 					"maxmass": 5040,
-					"optmass": 3360,
+					"maxmul": 1.16,
+					"minmass": 1680,
+					"minmul": 0.96,
+					"optmass": 5040,
+					"optmul": 1,
 					"power": 10.8,
 					"rating": "A"
 				},
 				{
-					"M": 0.17,
-					"P": 0.235,
 					"class": 7,
 					"cost": 633200,
 					"edID": 128064093,
@@ -4100,13 +4108,15 @@
 					"integrity": 118,
 					"mass": 80,
 					"maxmass": 2160,
+					"maxmul": 1.03,
+					"minmass": 720,
+					"minmul": 0.83,
 					"optmass": 1440,
+					"optmul": 1,
 					"power": 6.08,
 					"rating": "E"
 				},
 				{
-					"M": 0.14,
-					"P": 0.5145,
 					"class": 7,
 					"cost": 1899600,
 					"edID": 128064094,
@@ -4116,13 +4126,15 @@
 					"integrity": 105,
 					"mass": 32,
 					"maxmass": 2430,
+					"maxmul": 0.86,
+					"minmass": 810,
+					"minmul": 0.86,
 					"optmass": 1620,
+					"optmul": 1,
 					"power": 6.84,
 					"rating": "D"
 				},
 				{
-					"M": 0.1,
-					"P": 1,
 					"class": 7,
 					"cost": 5698790,
 					"edID": 128064095,
@@ -4132,13 +4144,15 @@
 					"integrity": 131,
 					"mass": 80,
 					"maxmass": 2700,
+					"maxmul": 1.1,
+					"minmass": 900,
+					"minmul": 0.9,
 					"optmass": 1800,
+					"optmul": 1,
 					"power": 7.6,
 					"rating": "C"
 				},
 				{
-					"M": 0.07,
-					"P": 1.51,
 					"class": 7,
 					"cost": 17096370,
 					"edID": 128064096,
@@ -4148,13 +4162,15 @@
 					"integrity": 157,
 					"mass": 128,
 					"maxmass": 2970,
+					"maxmul": 1.13,
+					"minmass": 990,
+					"minmul": 0.93,
 					"optmass": 1980,
+					"optmul": 1,
 					"power": 8.36,
 					"rating": "B"
 				},
 				{
-					"M": 0.04,
-					"P": 2.33,
 					"class": 7,
 					"cost": 51289110,
 					"edID": 128064097,
@@ -4164,13 +4180,15 @@
 					"integrity": 144,
 					"mass": 80,
 					"maxmass": 3240,
+					"maxmul": 1.16,
+					"minmass": 1080,
+					"minmul": 0.96,
 					"optmass": 2160,
+					"optmul": 1,
 					"power": 9.12,
 					"rating": "A"
 				},
 				{
-					"M": 0.17,
-					"P": 0.235,
 					"class": 6,
 					"cost": 199750,
 					"edID": 128064088,
@@ -4180,13 +4198,15 @@
 					"integrity": 102,
 					"mass": 40,
 					"maxmass": 1440,
+					"maxmul": 1.03,
+					"minmass": 480,
+					"minmul": 0.83,
 					"optmass": 960,
+					"optmul": 1,
 					"power": 5.04,
 					"rating": "E"
 				},
 				{
-					"M": 0.14,
-					"P": 0.5145,
 					"class": 6,
 					"cost": 599240,
 					"edID": 128064089,
@@ -4196,13 +4216,15 @@
 					"integrity": 90,
 					"mass": 16,
 					"maxmass": 1620,
+					"maxmul": 1.06,
+					"minmass": 540,
+					"minmul": 0.86,
 					"optmass": 1080,
+					"optmul": 1,
 					"power": 5.67,
 					"rating": "D"
 				},
 				{
-					"M": 0.1,
-					"P": 1,
 					"class": 6,
 					"cost": 1797730,
 					"edID": 128064090,
@@ -4212,13 +4234,15 @@
 					"integrity": 113,
 					"mass": 40,
 					"maxmass": 1800,
+					"maxmul": 1.1,
+					"minmass": 600,
+					"minmul": 0.9,
 					"optmass": 1200,
+					"optmul": 1,
 					"power": 6.3,
 					"rating": "C"
 				},
 				{
-					"M": 0.07,
-					"P": 1.51,
 					"class": 6,
 					"cost": 5393180,
 					"edID": 128064091,
@@ -4228,13 +4252,15 @@
 					"integrity": 136,
 					"mass": 64,
 					"maxmass": 1980,
+					"maxmul": 1.13,
+					"minmass": 660,
+					"minmul": 0.93,
 					"optmass": 1320,
+					"optmul": 1,
 					"power": 6.93,
 					"rating": "B"
 				},
 				{
-					"M": 0.04,
-					"P": 2.33,
 					"class": 6,
 					"cost": 16179530,
 					"edID": 128064092,
@@ -4244,13 +4270,15 @@
 					"integrity": 124,
 					"mass": 40,
 					"maxmass": 2160,
+					"maxmul": 1.16,
+					"minmass": 720,
+					"minmul": 0.96,
 					"optmass": 1440,
+					"optmul": 1,
 					"power": 7.56,
 					"rating": "A"
 				},
 				{
-					"M": 0.17,
-					"P": 0.235,
 					"class": 5,
 					"cost": 63010,
 					"edID": 128064083,
@@ -4260,13 +4288,15 @@
 					"integrity": 86,
 					"mass": 20,
 					"maxmass": 840,
+					"maxmul": 1.03,
+					"minmass": 280,
+					"minmul": 0.83,
 					"optmass": 560,
+					"optmul": 1,
 					"power": 4.08,
 					"rating": "E"
 				},
 				{
-					"M": 0.14,
-					"P": 0.5145,
 					"class": 5,
 					"cost": 189040,
 					"edID": 128064084,
@@ -4276,13 +4306,15 @@
 					"integrity": 77,
 					"mass": 8,
 					"maxmass": 945,
+					"maxmul": 1.06,
+					"minmass": 315,
+					"minmul": 0.86,
 					"optmass": 630,
+					"optmul": 1,
 					"power": 4.59,
 					"rating": "D"
 				},
 				{
-					"M": 0.1,
-					"P": 1,
 					"class": 5,
 					"cost": 567110,
 					"edID": 128064085,
@@ -4292,13 +4324,15 @@
 					"integrity": 96,
 					"mass": 20,
 					"maxmass": 1050,
+					"maxmul": 1.1,
+					"minmass": 350,
+					"minmul": 0.9,
 					"optmass": 700,
+					"optmul": 1,
 					"power": 5.1,
 					"rating": "C"
 				},
 				{
-					"M": 0.07,
-					"P": 1.51,
 					"class": 5,
 					"cost": 1701320,
 					"edID": 128064086,
@@ -4308,13 +4342,15 @@
 					"integrity": 115,
 					"mass": 32,
 					"maxmass": 1155,
+					"maxmul": 1.13,
+					"minmass": 385,
+					"minmul": 0.93,
 					"optmass": 770,
+					"optmul": 1,
 					"power": 5.61,
 					"rating": "B"
 				},
 				{
-					"M": 0.04,
-					"P": 2.33,
 					"class": 5,
 					"cost": 5103950,
 					"edID": 128064087,
@@ -4324,13 +4360,15 @@
 					"integrity": 106,
 					"mass": 20,
 					"maxmass": 1260,
+					"maxmul": 1.16,
+					"minmass": 420,
+					"minmul": 0.96,
 					"optmass": 840,
+					"optmul": 1,
 					"power": 6.12,
 					"rating": "A"
 				},
 				{
-					"M": 0.17,
-					"P": 0.235,
 					"class": 4,
 					"cost": 19880,
 					"edID": 128064078,
@@ -4340,13 +4378,15 @@
 					"integrity": 72,
 					"mass": 10,
 					"maxmass": 420,
+					"maxmul": 1.03,
+					"minmass": 140,
+					"minmul": 0.83,
 					"optmass": 280,
+					"optmul": 1,
 					"power": 3.28,
 					"rating": "E"
 				},
 				{
-					"M": 0.14,
-					"P": 0.5145,
 					"class": 4,
 					"cost": 59630,
 					"edID": 128064079,
@@ -4355,14 +4395,16 @@
 					"id": "td",
 					"integrity": 64,
 					"mass": 4,
-					"maxmass": 473,
+					"maxmass": 472.5,
+					"maxmul": 1.06,
+					"minmass": 157.5,
+					"minmul": 0.86,
 					"optmass": 315,
+					"optmul": 1,
 					"power": 3.69,
 					"rating": "D"
 				},
 				{
-					"M": 0.1,
-					"P": 1,
 					"class": 4,
 					"cost": 178900,
 					"edID": 128064080,
@@ -4372,13 +4414,15 @@
 					"integrity": 80,
 					"mass": 10,
 					"maxmass": 525,
+					"maxmul": 1.1,
+					"minmass": 175,
+					"minmul": 0.9,
 					"optmass": 350,
+					"optmul": 1,
 					"power": 4.1,
 					"rating": "C"
 				},
 				{
-					"M": 0.07,
-					"P": 1.51,
 					"class": 4,
 					"cost": 536690,
 					"edID": 128064081,
@@ -4387,14 +4431,16 @@
 					"id": "tb",
 					"integrity": 96,
 					"mass": 16,
-					"maxmass": 578,
+					"maxmass": 577.5,
+					"maxmul": 1.13,
+					"minmass": 192.5,
+					"minmul": 0.93,
 					"optmass": 385,
+					"optmul": 1,
 					"power": 4.51,
 					"rating": "B"
 				},
 				{
-					"M": 0.04,
-					"P": 2.33,
 					"class": 4,
 					"cost": 1610080,
 					"edID": 128064082,
@@ -4404,13 +4450,15 @@
 					"integrity": 88,
 					"mass": 10,
 					"maxmass": 630,
+					"maxmul": 1.16,
+					"minmass": 210,
+					"minmul": 0.96,
 					"optmass": 420,
+					"optmul": 1,
 					"power": 4.92,
 					"rating": "A"
 				},
 				{
-					"M": 0.17,
-					"P": 0.235,
 					"class": 3,
 					"cost": 6270,
 					"edID": 128064073,
@@ -4420,13 +4468,15 @@
 					"integrity": 58,
 					"mass": 5,
 					"maxmass": 120,
+					"maxmul": 1.03,
+					"minmass": 40,
+					"minmul": 0.83,
 					"optmass": 80,
+					"optmul": 1,
 					"power": 2.48,
 					"rating": "E"
 				},
 				{
-					"M": 0.14,
-					"P": 0.5145,
 					"class": 3,
 					"cost": 18810,
 					"edID": 128064074,
@@ -4436,13 +4486,15 @@
 					"integrity": 51,
 					"mass": 2,
 					"maxmass": 135,
+					"maxmul": 1.06,
+					"minmass": 45,
+					"minmul": 0.86,
 					"optmass": 90,
+					"optmul": 1,
 					"power": 2.79,
 					"rating": "D"
 				},
 				{
-					"M": 0.1,
-					"P": 1,
 					"class": 3,
 					"cost": 56440,
 					"edID": 128064075,
@@ -4452,13 +4504,15 @@
 					"integrity": 64,
 					"mass": 5,
 					"maxmass": 150,
+					"maxmul": 1.1,
+					"minmass": 50,
+					"minmul": 0.9,
 					"optmass": 100,
+					"optmul": 1,
 					"power": 3.1,
 					"rating": "C"
 				},
 				{
-					"M": 0.07,
-					"P": 1.51,
 					"class": 3,
 					"cost": 169300,
 					"edID": 128064076,
@@ -4468,13 +4522,15 @@
 					"integrity": 77,
 					"mass": 8,
 					"maxmass": 165,
+					"maxmul": 1.13,
+					"minmass": 55,
+					"minmul": 0.93,
 					"optmass": 110,
+					"optmul": 1,
 					"power": 3.41,
 					"rating": "B"
 				},
 				{
-					"M": 0.04,
-					"P": 2.33,
 					"class": 3,
 					"cost": 507910,
 					"edID": 128064077,
@@ -4484,13 +4540,15 @@
 					"integrity": 72,
 					"mass": 5,
 					"maxmass": 180,
+					"maxmul": 1.16,
+					"minmass": 60,
+					"minmul": 0.96,
 					"optmass": 120,
+					"optmul": 1,
 					"power": 3.72,
 					"rating": "A"
 				},
 				{
-					"M": 0.17,
-					"P": 0.235,
 					"class": 2,
 					"cost": 1980,
 					"edID": 128064068,
@@ -4500,13 +4558,15 @@
 					"integrity": 46,
 					"mass": 2.5,
 					"maxmass": 72,
+					"maxmul": 1.03,
+					"minmass": 24,
+					"minmul": 0.83,
 					"optmass": 48,
+					"optmul": 1,
 					"power": 2,
 					"rating": "E"
 				},
 				{
-					"M": 0.14,
-					"P": 0.5145,
 					"class": 2,
 					"cost": 5930,
 					"edID": 128064069,
@@ -4516,13 +4576,15 @@
 					"integrity": 41,
 					"mass": 1,
 					"maxmass": 81,
+					"maxmul": 1.06,
+					"minmass": 27,
+					"minmul": 0.86,
 					"optmass": 54,
+					"optmul": 1,
 					"power": 2.25,
 					"rating": "D"
 				},
 				{
-					"M": 0.1,
-					"P": 1,
 					"class": 2,
 					"cost": 17800,
 					"edID": 128064070,
@@ -4532,13 +4594,15 @@
 					"integrity": 51,
 					"mass": 2.5,
 					"maxmass": 90,
+					"maxmul": 1.1,
+					"minmass": 30,
+					"minmul": 0.9,
 					"optmass": 60,
+					"optmul": 1,
 					"power": 2.5,
 					"rating": "C"
 				},
 				{
-					"M": 0.07,
-					"P": 1.51,
 					"class": 2,
 					"cost": 53410,
 					"edID": 128064071,
@@ -4548,13 +4612,15 @@
 					"integrity": 61,
 					"mass": 4,
 					"maxmass": 99,
+					"maxmul": 1.13,
+					"minmass": 33,
+					"minmul": 0.93,
 					"optmass": 66,
+					"optmul": 1,
 					"power": 2.75,
 					"rating": "B"
 				},
 				{
-					"M": 0.04,
-					"P": 2.33,
 					"class": 2,
 					"cost": 160220,
 					"edID": 128064072,
@@ -4564,41 +4630,49 @@
 					"integrity": 56,
 					"mass": 2.5,
 					"maxmass": 108,
+					"maxmul": 0.96,
+					"minmass": 36,
+					"minmul": 1.16,
 					"optmass": 72,
+					"optmul": 1,
 					"power": 3,
 					"rating": "A"
 				},
 				{
-					"M": 0.04,
-					"P": 2.33,
 					"class": 3,
-					"cost": 5103952,
+					"cost": 5103950,
 					"edID": 128682013,
 					"eddbID": 1548,
 					"grp": "t",
 					"id": "tz",
-					"integrity": 70,
+					"integrity": 55,
 					"mass": 5,
 					"maxmass": 200,
+					"maxmul": 1.6,
+					"minmass": 70,
+					"minmul": 0.9,
 					"name": "Enhanced Performance",
 					"optmass": 90,
+					"optmul": 1.25,
 					"power": 5,
 					"rating": "A"
 				},
 				{
-					"M": 0.04,
-					"P": 2.33,
 					"class": 2,
 					"cost": 1610080,
 					"edID": 128682014,
 					"eddbID": 1547,
 					"grp": "t",
 					"id": "u0",
-					"integrity": 56,
+					"integrity": 40,
 					"mass": 2.5,
 					"maxmass": 120,
+					"maxmul": 1.6,
+					"minmass": 50,
+					"minmul": 0.9,
 					"name": "Enhanced Performance",
 					"optmass": 60,
+					"optmul": 1.25,
 					"power": 4,
 					"rating": "A"
 				}
@@ -10186,9 +10260,9 @@
 					"id": "B6",
 					"mass": 1.3,
 					"maxmass": 63,
-					"maxmul": 0.4,
+					"maxmul": 1.4,
 					"minmass": 13,
-					"minmul": 1.4,
+					"minmul": 0.4,
 					"optmass": 25,
 					"optmul": 0.9,
 					"power": 1.2,
@@ -10204,9 +10278,9 @@
 					"id": "B5",
 					"mass": 2.5,
 					"maxmass": 138,
-					"maxmul": 0.4,
+					"maxmul": 1.4,
 					"minmass": 23,
-					"minmul": 1.4,
+					"minmul": 0.4,
 					"optmass": 55,
 					"optmul": 0.9,
 					"power": 1.5,
@@ -10222,9 +10296,9 @@
 					"id": "B4",
 					"mass": 5,
 					"maxmass": 413,
-					"maxmul": 0.4,
+					"maxmul": 1.4,
 					"minmass": 83,
-					"minmul": 1.4,
+					"minmul": 0.4,
 					"optmass": 165,
 					"optmul": 0.9,
 					"power": 1.8,
@@ -10240,9 +10314,9 @@
 					"id": "B3",
 					"mass": 10,
 					"maxmass": 713,
-					"maxmul": 0.4,
+					"maxmul": 1.4,
 					"minmass": 143,
-					"minmul": 1.4,
+					"minmul": 0.4,
 					"optmass": 285,
 					"optmul": 0.9,
 					"power": 2.2,
@@ -10258,9 +10332,9 @@
 					"id": "B2",
 					"mass": 20,
 					"maxmass": 1013,
-					"maxmul": 0.4,
+					"maxmul": 1.4,
 					"minmass": 203,
-					"minmul": 1.4,
+					"minmul": 0.4,
 					"optmass": 405,
 					"optmul": 0.9,
 					"power": 2.6,
@@ -10276,9 +10350,9 @@
 					"id": "B1",
 					"mass": 40,
 					"maxmass": 1350,
-					"maxmul": 0.4,
+					"maxmul": 1.4,
 					"minmass": 270,
-					"minmul": 1.4,
+					"minmul": 0.4,
 					"optmass": 540,
 					"optmul": 0.9,
 					"power": 3.1,
@@ -10294,9 +10368,9 @@
 					"id": "B0",
 					"mass": 80,
 					"maxmass": 2650,
-					"maxmul": 0.4,
+					"maxmul": 1.4,
 					"minmass": 530,
-					"minmul": 1.4,
+					"minmul": 0.4,
 					"optmass": 1060,
 					"optmul": 0.9,
 					"power": 3.5,
@@ -10312,9 +10386,9 @@
 					"id": "B7",
 					"mass": 160,
 					"maxmass": 4500,
-					"maxmul": 0.4,
+					"maxmul": 1.4,
 					"minmass": 900,
-					"minmul": 1.4,
+					"minmul": 0.4,
 					"optmass": 1800,
 					"optmul": 0.9,
 					"power": 4,
@@ -12268,9 +12342,9 @@
 					"id": "p6",
 					"mass": 2.5,
 					"maxmass": 63,
-					"maxmul": 1,
+					"maxmul": 2,
 					"minmass": 13,
-					"minmul": 2,
+					"minmul": 1,
 					"optmass": 25,
 					"optmul": 1.5,
 					"power": 2.52,
@@ -12287,9 +12361,9 @@
 					"id": "p5",
 					"mass": 5,
 					"maxmass": 138,
-					"maxmul": 1,
+					"maxmul": 2,
 					"minmass": 23,
-					"minmul": 2,
+					"minmul": 1,
 					"optmass": 55,
 					"optmul": 1.5,
 					"power": 3.15,
@@ -12306,9 +12380,9 @@
 					"id": "p4",
 					"mass": 10,
 					"maxmass": 413,
-					"maxmul": 1,
+					"maxmul": 2,
 					"minmass": 83,
-					"minmul": 2,
+					"minmul": 1,
 					"optmass": 165,
 					"optmul": 1.5,
 					"power": 3.78,
@@ -12325,9 +12399,9 @@
 					"id": "p3",
 					"mass": 20,
 					"maxmass": 713,
-					"maxmul": 1,
+					"maxmul": 2,
 					"minmass": 143,
-					"minmul": 2,
+					"minmul": 1,
 					"optmass": 285,
 					"optmul": 1.5,
 					"power": 4.62,
@@ -12344,9 +12418,9 @@
 					"id": "p2",
 					"mass": 40,
 					"maxmass": 1013,
-					"maxmul": 1,
+					"maxmul": 2,
 					"minmass": 203,
-					"minmul": 2,
+					"minmul": 1,
 					"optmass": 405,
 					"optmul": 1.5,
 					"power": 5.46,
@@ -12363,9 +12437,9 @@
 					"id": "p1",
 					"mass": 80,
 					"maxmass": 1350,
-					"maxmul": 1,
+					"maxmul": 2,
 					"minmass": 270,
-					"minmul": 2,
+					"minmul": 1,
 					"optmass": 540,
 					"optmul": 1.5,
 					"power": 6.51,
@@ -12382,9 +12456,9 @@
 					"id": "p0",
 					"mass": 160,
 					"maxmass": 2650,
-					"maxmul": 1,
+					"maxmul": 2,
 					"minmass": 530,
-					"minmul": 2,
+					"minmul": 1,
 					"optmass": 1060,
 					"optmul": 1.5,
 					"power": 7.35,
@@ -12401,9 +12475,9 @@
 					"id": "p7",
 					"mass": 320,
 					"maxmass": 4500,
-					"maxmul": 1,
+					"maxmul": 2,
 					"minmass": 900,
-					"minmul": 2,
+					"minmul": 1,
 					"optmass": 1800,
 					"optmul": 1.5,
 					"power": 8.4,
@@ -13723,9 +13797,9 @@
 					"id": "4t",
 					"mass": 160,
 					"maxmass": 4500,
-					"maxmul": 0.3,
+					"maxmul": 1.3,
 					"minmass": 900,
-					"minmul": 1.3,
+					"minmul": 0.3,
 					"optmass": 1800,
 					"optmul": 0.8,
 					"power": 2.4,
@@ -13741,9 +13815,9 @@
 					"id": "4s",
 					"mass": 64,
 					"maxmass": 4500,
-					"maxmul": 0.4,
+					"maxmul": 1.4,
 					"minmass": 900,
-					"minmul": 1.4,
+					"minmul": 0.4,
 					"optmass": 1800,
 					"optmul": 0.9,
 					"power": 3.2,
@@ -13759,9 +13833,9 @@
 					"id": "4r",
 					"mass": 160,
 					"maxmass": 4500,
-					"maxmul": 0.5,
+					"maxmul": 1.5,
 					"minmass": 900,
-					"minmul": 1.5,
+					"minmul": 0.5,
 					"optmass": 1800,
 					"optmul": 1,
 					"power": 4,
@@ -13777,9 +13851,9 @@
 					"id": "4q",
 					"mass": 256,
 					"maxmass": 4500,
-					"maxmul": 0.6,
+					"maxmul": 1.6,
 					"minmass": 900,
-					"minmul": 1.6,
+					"minmul": 0.6,
 					"optmass": 1800,
 					"optmul": 1.1,
 					"power": 4.8,
@@ -13795,9 +13869,9 @@
 					"id": "4p",
 					"mass": 160,
 					"maxmass": 4500,
-					"maxmul": 0.7,
+					"maxmul": 1.7,
 					"minmass": 900,
-					"minmul": 1.7,
+					"minmul": 0.7,
 					"optmass": 1800,
 					"optmul": 1.2,
 					"power": 5.6,
@@ -13813,9 +13887,9 @@
 					"id": "4o",
 					"mass": 80,
 					"maxmass": 2650,
-					"maxmul": 0.3,
+					"maxmul": 1.3,
 					"minmass": 530,
-					"minmul": 1.3,
+					"minmul": 0.3,
 					"optmass": 1060,
 					"optmul": 0.8,
 					"power": 2.1,
@@ -13831,9 +13905,9 @@
 					"id": "4n",
 					"mass": 32,
 					"maxmass": 2650,
-					"maxmul": 0.4,
+					"maxmul": 1.4,
 					"minmass": 530,
-					"minmul": 1.4,
+					"minmul": 0.4,
 					"optmass": 1060,
 					"optmul": 0.9,
 					"power": 2.8,
@@ -13849,9 +13923,9 @@
 					"id": "4m",
 					"mass": 80,
 					"maxmass": 2650,
-					"maxmul": 0.5,
+					"maxmul": 1.5,
 					"minmass": 530,
-					"minmul": 1.5,
+					"minmul": 0.5,
 					"optmass": 1060,
 					"optmul": 1,
 					"power": 3.5,
@@ -13867,9 +13941,9 @@
 					"id": "4l",
 					"mass": 128,
 					"maxmass": 2650,
-					"maxmul": 0.6,
+					"maxmul": 1.6,
 					"minmass": 530,
-					"minmul": 1.6,
+					"minmul": 0.6,
 					"optmass": 1060,
 					"optmul": 1.1,
 					"power": 4.2,
@@ -13885,9 +13959,9 @@
 					"id": "4k",
 					"mass": 80,
 					"maxmass": 2650,
-					"maxmul": 0.7,
+					"maxmul": 1.7,
 					"minmass": 530,
-					"minmul": 1.7,
+					"minmul": 0.7,
 					"optmass": 1060,
 					"optmul": 1.2,
 					"power": 4.9,
@@ -13903,9 +13977,9 @@
 					"id": "4j",
 					"mass": 40,
 					"maxmass": 1350,
-					"maxmul": 0.3,
+					"maxmul": 1.3,
 					"minmass": 270,
-					"minmul": 1.3,
+					"minmul": 0.3,
 					"optmass": 540,
 					"optmul": 0.8,
 					"power": 1.86,
@@ -13921,9 +13995,9 @@
 					"id": "4i",
 					"mass": 16,
 					"maxmass": 1350,
-					"maxmul": 0.4,
+					"maxmul": 1.4,
 					"minmass": 270,
-					"minmul": 1.4,
+					"minmul": 0.4,
 					"optmass": 540,
 					"optmul": 0.9,
 					"power": 2.48,
@@ -13939,9 +14013,9 @@
 					"id": "4h",
 					"mass": 40,
 					"maxmass": 1350,
-					"maxmul": 0.5,
+					"maxmul": 1.5,
 					"minmass": 270,
-					"minmul": 1.5,
+					"minmul": 0.5,
 					"optmass": 540,
 					"optmul": 1,
 					"power": 3.1,
@@ -13957,9 +14031,9 @@
 					"id": "4g",
 					"mass": 64,
 					"maxmass": 1350,
-					"maxmul": 0.6,
+					"maxmul": 1.6,
 					"minmass": 270,
-					"minmul": 1.6,
+					"minmul": 0.6,
 					"optmass": 540,
 					"optmul": 1.1,
 					"power": 3.72,
@@ -13975,9 +14049,9 @@
 					"id": "4f",
 					"mass": 40,
 					"maxmass": 1350,
-					"maxmul": 0.7,
+					"maxmul": 1.7,
 					"minmass": 270,
-					"minmul": 1.7,
+					"minmul": 0.7,
 					"optmass": 540,
 					"optmul": 1.2,
 					"power": 4.34,
@@ -13993,9 +14067,9 @@
 					"id": "4e",
 					"mass": 20,
 					"maxmass": 1013,
-					"maxmul": 0.3,
+					"maxmul": 1.3,
 					"minmass": 203,
-					"minmul": 1.3,
+					"minmul": 0.3,
 					"optmass": 405,
 					"optmul": 0.8,
 					"power": 1.56,
@@ -14011,9 +14085,9 @@
 					"id": "4d",
 					"mass": 8,
 					"maxmass": 1013,
-					"maxmul": 0.4,
+					"maxmul": 1.4,
 					"minmass": 203,
-					"minmul": 1.4,
+					"minmul": 0.4,
 					"optmass": 405,
 					"optmul": 0.9,
 					"power": 2.08,
@@ -14029,9 +14103,9 @@
 					"id": "4c",
 					"mass": 20,
 					"maxmass": 1013,
-					"maxmul": 0.5,
+					"maxmul": 1.5,
 					"minmass": 203,
-					"minmul": 1.5,
+					"minmul": 0.5,
 					"optmass": 405,
 					"optmul": 1,
 					"power": 2.6,
@@ -14047,9 +14121,9 @@
 					"id": "4b",
 					"mass": 32,
 					"maxmass": 1013,
-					"maxmul": 0.6,
+					"maxmul": 1.6,
 					"minmass": 203,
-					"minmul": 1.6,
+					"minmul": 0.6,
 					"optmass": 405,
 					"optmul": 1.1,
 					"power": 3.12,
@@ -14065,9 +14139,9 @@
 					"id": "4a",
 					"mass": 20,
 					"maxmass": 1013,
-					"maxmul": 0.7,
+					"maxmul": 1.7,
 					"minmass": 203,
-					"minmul": 1.7,
+					"minmul": 0.7,
 					"optmass": 405,
 					"optmul": 1.2,
 					"power": 3.64,
@@ -14083,9 +14157,9 @@
 					"id": "49",
 					"mass": 10,
 					"maxmass": 713,
-					"maxmul": 0.3,
+					"maxmul": 1.3,
 					"minmass": 143,
-					"minmul": 1.3,
+					"minmul": 0.3,
 					"optmass": 285,
 					"optmul": 0.8,
 					"power": 1.32,
@@ -14101,9 +14175,9 @@
 					"id": "48",
 					"mass": 4,
 					"maxmass": 713,
-					"maxmul": 0.4,
+					"maxmul": 1.4,
 					"minmass": 143,
-					"minmul": 1.4,
+					"minmul": 0.4,
 					"optmass": 285,
 					"optmul": 0.9,
 					"power": 1.76,
@@ -14119,9 +14193,9 @@
 					"id": "47",
 					"mass": 10,
 					"maxmass": 713,
-					"maxmul": 0.5,
+					"maxmul": 1.5,
 					"minmass": 143,
-					"minmul": 1.5,
+					"minmul": 0.5,
 					"optmass": 285,
 					"optmul": 1,
 					"power": 2.2,
@@ -14137,9 +14211,9 @@
 					"id": "46",
 					"mass": 16,
 					"maxmass": 713,
-					"maxmul": 0.6,
+					"maxmul": 1.6,
 					"minmass": 143,
-					"minmul": 1.6,
+					"minmul": 0.6,
 					"optmass": 285,
 					"optmul": 1.1,
 					"power": 2.64,
@@ -14155,9 +14229,9 @@
 					"id": "45",
 					"mass": 10,
 					"maxmass": 713,
-					"maxmul": 0.7,
+					"maxmul": 1.7,
 					"minmass": 143,
-					"minmul": 1.7,
+					"minmul": 0.7,
 					"optmass": 285,
 					"optmul": 1.2,
 					"power": 3.08,
@@ -14173,9 +14247,9 @@
 					"id": "44",
 					"mass": 5,
 					"maxmass": 413,
-					"maxmul": 0.3,
+					"maxmul": 1.3,
 					"minmass": 83,
-					"minmul": 1.3,
+					"minmul": 0.3,
 					"optmass": 165,
 					"optmul": 0.8,
 					"power": 1.08,
@@ -14191,9 +14265,9 @@
 					"id": "43",
 					"mass": 2,
 					"maxmass": 413,
-					"maxmul": 0.4,
+					"maxmul": 1.4,
 					"minmass": 83,
-					"minmul": 1.4,
+					"minmul": 0.4,
 					"optmass": 165,
 					"optmul": 0.9,
 					"power": 1.44,
@@ -14209,9 +14283,9 @@
 					"id": "42",
 					"mass": 5,
 					"maxmass": 413,
-					"maxmul": 0.5,
+					"maxmul": 1.5,
 					"minmass": 83,
-					"minmul": 1.5,
+					"minmul": 0.5,
 					"optmass": 165,
 					"optmul": 1,
 					"power": 1.8,
@@ -14227,9 +14301,9 @@
 					"id": "41",
 					"mass": 8,
 					"maxmass": 413,
-					"maxmul": 0.6,
+					"maxmul": 1.6,
 					"minmass": 83,
-					"minmul": 1.6,
+					"minmul": 0.6,
 					"optmass": 165,
 					"optmul": 1.1,
 					"power": 2.16,
@@ -14245,9 +14319,9 @@
 					"id": "40",
 					"mass": 5,
 					"maxmass": 413,
-					"maxmul": 0.7,
+					"maxmul": 1.7,
 					"minmass": 83,
-					"minmul": 1.7,
+					"minmul": 0.7,
 					"optmass": 165,
 					"optmul": 1.2,
 					"power": 2.52,
@@ -14263,9 +14337,9 @@
 					"id": "3v",
 					"mass": 2.5,
 					"maxmass": 138,
-					"maxmul": 0.3,
+					"maxmul": 1.3,
 					"minmass": 28,
-					"minmul": 1.3,
+					"minmul": 0.3,
 					"optmass": 55,
 					"optmul": 0.8,
 					"power": 0.9,
@@ -14281,9 +14355,9 @@
 					"id": "3u",
 					"mass": 1,
 					"maxmass": 138,
-					"maxmul": 0.4,
+					"maxmul": 1.4,
 					"minmass": 28,
-					"minmul": 1.4,
+					"minmul": 0.4,
 					"optmass": 55,
 					"optmul": 0.9,
 					"power": 1.2,
@@ -14299,9 +14373,9 @@
 					"id": "3t",
 					"mass": 2.5,
 					"maxmass": 138,
-					"maxmul": 0.5,
+					"maxmul": 1.5,
 					"minmass": 28,
-					"minmul": 1.5,
+					"minmul": 0.5,
 					"optmass": 55,
 					"optmul": 1,
 					"power": 1.5,
@@ -14317,9 +14391,9 @@
 					"id": "3s",
 					"mass": 4,
 					"maxmass": 138,
-					"maxmul": 0.6,
+					"maxmul": 1.6,
 					"minmass": 28,
-					"minmul": 1.6,
+					"minmul": 0.6,
 					"optmass": 55,
 					"optmul": 1.1,
 					"power": 1.8,
@@ -14335,9 +14409,9 @@
 					"id": "3r",
 					"mass": 2.5,
 					"maxmass": 138,
-					"maxmul": 0.7,
+					"maxmul": 1.7,
 					"minmass": 28,
-					"minmul": 1.7,
+					"minmul": 0.7,
 					"optmass": 55,
 					"optmul": 1.2,
 					"power": 2.1,
@@ -14353,9 +14427,9 @@
 					"id": "1x",
 					"mass": 1.3,
 					"maxmass": 63,
-					"maxmul": 0.7,
+					"maxmul": 1.7,
 					"minmass": 13,
-					"minmul": 1.7,
+					"minmul": 0.7,
 					"optmass": 25,
 					"optmul": 1.2,
 					"power": 1.68,
diff --git a/modules/internal/bi_weave_shield_generator.json b/modules/internal/bi_weave_shield_generator.json
index 2326538..3533f68 100644
--- a/modules/internal/bi_weave_shield_generator.json
+++ b/modules/internal/bi_weave_shield_generator.json
@@ -9,9 +9,9 @@
       "id": "B6",
       "mass": 1.3,
       "maxmass": 63,
-      "maxmul": 0.4,
+      "maxmul": 1.4,
       "minmass": 13,
-      "minmul": 1.4,
+      "minmul": 0.4,
       "optmass": 25,
       "optmul": 0.9,
       "power": 1.2,
@@ -27,9 +27,9 @@
       "id": "B5",
       "mass": 2.5,
       "maxmass": 138,
-      "maxmul": 0.4,
+      "maxmul": 1.4,
       "minmass": 23,
-      "minmul": 1.4,
+      "minmul": 0.4,
       "optmass": 55,
       "optmul": 0.9,
       "power": 1.5,
@@ -45,9 +45,9 @@
       "id": "B4",
       "mass": 5,
       "maxmass": 413,
-      "maxmul": 0.4,
+      "maxmul": 1.4,
       "minmass": 83,
-      "minmul": 1.4,
+      "minmul": 0.4,
       "optmass": 165,
       "optmul": 0.9,
       "power": 1.8,
@@ -63,9 +63,9 @@
       "id": "B3",
       "mass": 10,
       "maxmass": 713,
-      "maxmul": 0.4,
+      "maxmul": 1.4,
       "minmass": 143,
-      "minmul": 1.4,
+      "minmul": 0.4,
       "optmass": 285,
       "optmul": 0.9,
       "power": 2.2,
@@ -81,9 +81,9 @@
       "id": "B2",
       "mass": 20,
       "maxmass": 1013,
-      "maxmul": 0.4,
+      "maxmul": 1.4,
       "minmass": 203,
-      "minmul": 1.4,
+      "minmul": 0.4,
       "optmass": 405,
       "optmul": 0.9,
       "power": 2.6,
@@ -99,9 +99,9 @@
       "id": "B1",
       "mass": 40,
       "maxmass": 1350,
-      "maxmul": 0.4,
+      "maxmul": 1.4,
       "minmass": 270,
-      "minmul": 1.4,
+      "minmul": 0.4,
       "optmass": 540,
       "optmul": 0.9,
       "power": 3.1,
@@ -117,9 +117,9 @@
       "id": "B0",
       "mass": 80,
       "maxmass": 2650,
-      "maxmul": 0.4,
+      "maxmul": 1.4,
       "minmass": 530,
-      "minmul": 1.4,
+      "minmul": 0.4,
       "optmass": 1060,
       "optmul": 0.9,
       "power": 3.5,
@@ -135,9 +135,9 @@
       "id": "B7",
       "mass": 160,
       "maxmass": 4500,
-      "maxmul": 0.4,
+      "maxmul": 1.4,
       "minmass": 900,
-      "minmul": 1.4,
+      "minmul": 0.4,
       "optmass": 1800,
       "optmul": 0.9,
       "power": 4,
diff --git a/modules/internal/pristmatic_shield_generator.json b/modules/internal/pristmatic_shield_generator.json
index ab3803a..2e0b2b7 100644
--- a/modules/internal/pristmatic_shield_generator.json
+++ b/modules/internal/pristmatic_shield_generator.json
@@ -9,9 +9,9 @@
       "id": "p6",
       "mass": 2.5,
       "maxmass": 63,
-      "maxmul": 1,
+      "maxmul": 2,
       "minmass": 13,
-      "minmul": 2,
+      "minmul": 1,
       "optmass": 25,
       "optmul": 1.5,
       "power": 2.52,
@@ -28,9 +28,9 @@
       "id": "p5",
       "mass": 5,
       "maxmass": 138,
-      "maxmul": 1,
+      "maxmul": 2,
       "minmass": 23,
-      "minmul": 2,
+      "minmul": 1,
       "optmass": 55,
       "optmul": 1.5,
       "power": 3.15,
@@ -47,9 +47,9 @@
       "id": "p4",
       "mass": 10,
       "maxmass": 413,
-      "maxmul": 1,
+      "maxmul": 2,
       "minmass": 83,
-      "minmul": 2,
+      "minmul": 1,
       "optmass": 165,
       "optmul": 1.5,
       "power": 3.78,
@@ -66,9 +66,9 @@
       "id": "p3",
       "mass": 20,
       "maxmass": 713,
-      "maxmul": 1,
+      "maxmul": 2,
       "minmass": 143,
-      "minmul": 2,
+      "minmul": 1,
       "optmass": 285,
       "optmul": 1.5,
       "power": 4.62,
@@ -85,9 +85,9 @@
       "id": "p2",
       "mass": 40,
       "maxmass": 1013,
-      "maxmul": 1,
+      "maxmul": 2,
       "minmass": 203,
-      "minmul": 2,
+      "minmul": 1,
       "optmass": 405,
       "optmul": 1.5,
       "power": 5.46,
@@ -104,9 +104,9 @@
       "id": "p1",
       "mass": 80,
       "maxmass": 1350,
-      "maxmul": 1,
+      "maxmul": 2,
       "minmass": 270,
-      "minmul": 2,
+      "minmul": 1,
       "optmass": 540,
       "optmul": 1.5,
       "power": 6.51,
@@ -123,9 +123,9 @@
       "id": "p0",
       "mass": 160,
       "maxmass": 2650,
-      "maxmul": 1,
+      "maxmul": 2,
       "minmass": 530,
-      "minmul": 2,
+      "minmul": 1,
       "optmass": 1060,
       "optmul": 1.5,
       "power": 7.35,
@@ -142,9 +142,9 @@
       "id": "p7",
       "mass": 320,
       "maxmass": 4500,
-      "maxmul": 1,
+      "maxmul": 2,
       "minmass": 900,
-      "minmul": 2,
+      "minmul": 1,
       "optmass": 1800,
       "optmul": 1.5,
       "power": 8.4,
diff --git a/modules/internal/shield_generator.json b/modules/internal/shield_generator.json
index 1dfd804..8386291 100644
--- a/modules/internal/shield_generator.json
+++ b/modules/internal/shield_generator.json
@@ -9,9 +9,9 @@
       "id": "4t",
       "mass": 160,
       "maxmass": 4500,
-      "maxmul": 0.3,
+      "maxmul": 1.3,
       "minmass": 900,
-      "minmul": 1.3,
+      "minmul": 0.3,
       "optmass": 1800,
       "optmul": 0.8,
       "power": 2.4,
@@ -27,9 +27,9 @@
       "id": "4s",
       "mass": 64,
       "maxmass": 4500,
-      "maxmul": 0.4,
+      "maxmul": 1.4,
       "minmass": 900,
-      "minmul": 1.4,
+      "minmul": 0.4,
       "optmass": 1800,
       "optmul": 0.9,
       "power": 3.2,
@@ -45,9 +45,9 @@
       "id": "4r",
       "mass": 160,
       "maxmass": 4500,
-      "maxmul": 0.5,
+      "maxmul": 1.5,
       "minmass": 900,
-      "minmul": 1.5,
+      "minmul": 0.5,
       "optmass": 1800,
       "optmul": 1,
       "power": 4,
@@ -63,9 +63,9 @@
       "id": "4q",
       "mass": 256,
       "maxmass": 4500,
-      "maxmul": 0.6,
+      "maxmul": 1.6,
       "minmass": 900,
-      "minmul": 1.6,
+      "minmul": 0.6,
       "optmass": 1800,
       "optmul": 1.1,
       "power": 4.8,
@@ -81,9 +81,9 @@
       "id": "4p",
       "mass": 160,
       "maxmass": 4500,
-      "maxmul": 0.7,
+      "maxmul": 1.7,
       "minmass": 900,
-      "minmul": 1.7,
+      "minmul": 0.7,
       "optmass": 1800,
       "optmul": 1.2,
       "power": 5.6,
@@ -99,9 +99,9 @@
       "id": "4o",
       "mass": 80,
       "maxmass": 2650,
-      "maxmul": 0.3,
+      "maxmul": 1.3,
       "minmass": 530,
-      "minmul": 1.3,
+      "minmul": 0.3,
       "optmass": 1060,
       "optmul": 0.8,
       "power": 2.1,
@@ -117,9 +117,9 @@
       "id": "4n",
       "mass": 32,
       "maxmass": 2650,
-      "maxmul": 0.4,
+      "maxmul": 1.4,
       "minmass": 530,
-      "minmul": 1.4,
+      "minmul": 0.4,
       "optmass": 1060,
       "optmul": 0.9,
       "power": 2.8,
@@ -135,9 +135,9 @@
       "id": "4m",
       "mass": 80,
       "maxmass": 2650,
-      "maxmul": 0.5,
+      "maxmul": 1.5,
       "minmass": 530,
-      "minmul": 1.5,
+      "minmul": 0.5,
       "optmass": 1060,
       "optmul": 1,
       "power": 3.5,
@@ -153,9 +153,9 @@
       "id": "4l",
       "mass": 128,
       "maxmass": 2650,
-      "maxmul": 0.6,
+      "maxmul": 1.6,
       "minmass": 530,
-      "minmul": 1.6,
+      "minmul": 0.6,
       "optmass": 1060,
       "optmul": 1.1,
       "power": 4.2,
@@ -171,9 +171,9 @@
       "id": "4k",
       "mass": 80,
       "maxmass": 2650,
-      "maxmul": 0.7,
+      "maxmul": 1.7,
       "minmass": 530,
-      "minmul": 1.7,
+      "minmul": 0.7,
       "optmass": 1060,
       "optmul": 1.2,
       "power": 4.9,
@@ -189,9 +189,9 @@
       "id": "4j",
       "mass": 40,
       "maxmass": 1350,
-      "maxmul": 0.3,
+      "maxmul": 1.3,
       "minmass": 270,
-      "minmul": 1.3,
+      "minmul": 0.3,
       "optmass": 540,
       "optmul": 0.8,
       "power": 1.86,
@@ -207,9 +207,9 @@
       "id": "4i",
       "mass": 16,
       "maxmass": 1350,
-      "maxmul": 0.4,
+      "maxmul": 1.4,
       "minmass": 270,
-      "minmul": 1.4,
+      "minmul": 0.4,
       "optmass": 540,
       "optmul": 0.9,
       "power": 2.48,
@@ -225,9 +225,9 @@
       "id": "4h",
       "mass": 40,
       "maxmass": 1350,
-      "maxmul": 0.5,
+      "maxmul": 1.5,
       "minmass": 270,
-      "minmul": 1.5,
+      "minmul": 0.5,
       "optmass": 540,
       "optmul": 1,
       "power": 3.1,
@@ -243,9 +243,9 @@
       "id": "4g",
       "mass": 64,
       "maxmass": 1350,
-      "maxmul": 0.6,
+      "maxmul": 1.6,
       "minmass": 270,
-      "minmul": 1.6,
+      "minmul": 0.6,
       "optmass": 540,
       "optmul": 1.1,
       "power": 3.72,
@@ -261,9 +261,9 @@
       "id": "4f",
       "mass": 40,
       "maxmass": 1350,
-      "maxmul": 0.7,
+      "maxmul": 1.7,
       "minmass": 270,
-      "minmul": 1.7,
+      "minmul": 0.7,
       "optmass": 540,
       "optmul": 1.2,
       "power": 4.34,
@@ -279,9 +279,9 @@
       "id": "4e",
       "mass": 20,
       "maxmass": 1013,
-      "maxmul": 0.3,
+      "maxmul": 1.3,
       "minmass": 203,
-      "minmul": 1.3,
+      "minmul": 0.3,
       "optmass": 405,
       "optmul": 0.8,
       "power": 1.56,
@@ -297,9 +297,9 @@
       "id": "4d",
       "mass": 8,
       "maxmass": 1013,
-      "maxmul": 0.4,
+      "maxmul": 1.4,
       "minmass": 203,
-      "minmul": 1.4,
+      "minmul": 0.4,
       "optmass": 405,
       "optmul": 0.9,
       "power": 2.08,
@@ -315,9 +315,9 @@
       "id": "4c",
       "mass": 20,
       "maxmass": 1013,
-      "maxmul": 0.5,
+      "maxmul": 1.5,
       "minmass": 203,
-      "minmul": 1.5,
+      "minmul": 0.5,
       "optmass": 405,
       "optmul": 1,
       "power": 2.6,
@@ -333,9 +333,9 @@
       "id": "4b",
       "mass": 32,
       "maxmass": 1013,
-      "maxmul": 0.6,
+      "maxmul": 1.6,
       "minmass": 203,
-      "minmul": 1.6,
+      "minmul": 0.6,
       "optmass": 405,
       "optmul": 1.1,
       "power": 3.12,
@@ -351,9 +351,9 @@
       "id": "4a",
       "mass": 20,
       "maxmass": 1013,
-      "maxmul": 0.7,
+      "maxmul": 1.7,
       "minmass": 203,
-      "minmul": 1.7,
+      "minmul": 0.7,
       "optmass": 405,
       "optmul": 1.2,
       "power": 3.64,
@@ -369,9 +369,9 @@
       "id": "49",
       "mass": 10,
       "maxmass": 713,
-      "maxmul": 0.3,
+      "maxmul": 1.3,
       "minmass": 143,
-      "minmul": 1.3,
+      "minmul": 0.3,
       "optmass": 285,
       "optmul": 0.8,
       "power": 1.32,
@@ -387,9 +387,9 @@
       "id": "48",
       "mass": 4,
       "maxmass": 713,
-      "maxmul": 0.4,
+      "maxmul": 1.4,
       "minmass": 143,
-      "minmul": 1.4,
+      "minmul": 0.4,
       "optmass": 285,
       "optmul": 0.9,
       "power": 1.76,
@@ -405,9 +405,9 @@
       "id": "47",
       "mass": 10,
       "maxmass": 713,
-      "maxmul": 0.5,
+      "maxmul": 1.5,
       "minmass": 143,
-      "minmul": 1.5,
+      "minmul": 0.5,
       "optmass": 285,
       "optmul": 1,
       "power": 2.2,
@@ -423,9 +423,9 @@
       "id": "46",
       "mass": 16,
       "maxmass": 713,
-      "maxmul": 0.6,
+      "maxmul": 1.6,
       "minmass": 143,
-      "minmul": 1.6,
+      "minmul": 0.6,
       "optmass": 285,
       "optmul": 1.1,
       "power": 2.64,
@@ -441,9 +441,9 @@
       "id": "45",
       "mass": 10,
       "maxmass": 713,
-      "maxmul": 0.7,
+      "maxmul": 1.7,
       "minmass": 143,
-      "minmul": 1.7,
+      "minmul": 0.7,
       "optmass": 285,
       "optmul": 1.2,
       "power": 3.08,
@@ -459,9 +459,9 @@
       "id": "44",
       "mass": 5,
       "maxmass": 413,
-      "maxmul": 0.3,
+      "maxmul": 1.3,
       "minmass": 83,
-      "minmul": 1.3,
+      "minmul": 0.3,
       "optmass": 165,
       "optmul": 0.8,
       "power": 1.08,
@@ -477,9 +477,9 @@
       "id": "43",
       "mass": 2,
       "maxmass": 413,
-      "maxmul": 0.4,
+      "maxmul": 1.4,
       "minmass": 83,
-      "minmul": 1.4,
+      "minmul": 0.4,
       "optmass": 165,
       "optmul": 0.9,
       "power": 1.44,
@@ -495,9 +495,9 @@
       "id": "42",
       "mass": 5,
       "maxmass": 413,
-      "maxmul": 0.5,
+      "maxmul": 1.5,
       "minmass": 83,
-      "minmul": 1.5,
+      "minmul": 0.5,
       "optmass": 165,
       "optmul": 1,
       "power": 1.8,
@@ -513,9 +513,9 @@
       "id": "41",
       "mass": 8,
       "maxmass": 413,
-      "maxmul": 0.6,
+      "maxmul": 1.6,
       "minmass": 83,
-      "minmul": 1.6,
+      "minmul": 0.6,
       "optmass": 165,
       "optmul": 1.1,
       "power": 2.16,
@@ -531,9 +531,9 @@
       "id": "40",
       "mass": 5,
       "maxmass": 413,
-      "maxmul": 0.7,
+      "maxmul": 1.7,
       "minmass": 83,
-      "minmul": 1.7,
+      "minmul": 0.7,
       "optmass": 165,
       "optmul": 1.2,
       "power": 2.52,
@@ -549,9 +549,9 @@
       "id": "3v",
       "mass": 2.5,
       "maxmass": 138,
-      "maxmul": 0.3,
+      "maxmul": 1.3,
       "minmass": 28,
-      "minmul": 1.3,
+      "minmul": 0.3,
       "optmass": 55,
       "optmul": 0.8,
       "power": 0.9,
@@ -567,9 +567,9 @@
       "id": "3u",
       "mass": 1,
       "maxmass": 138,
-      "maxmul": 0.4,
+      "maxmul": 1.4,
       "minmass": 28,
-      "minmul": 1.4,
+      "minmul": 0.4,
       "optmass": 55,
       "optmul": 0.9,
       "power": 1.2,
@@ -585,9 +585,9 @@
       "id": "3t",
       "mass": 2.5,
       "maxmass": 138,
-      "maxmul": 0.5,
+      "maxmul": 1.5,
       "minmass": 28,
-      "minmul": 1.5,
+      "minmul": 0.5,
       "optmass": 55,
       "optmul": 1,
       "power": 1.5,
@@ -603,9 +603,9 @@
       "id": "3s",
       "mass": 4,
       "maxmass": 138,
-      "maxmul": 0.6,
+      "maxmul": 1.6,
       "minmass": 28,
-      "minmul": 1.6,
+      "minmul": 0.6,
       "optmass": 55,
       "optmul": 1.1,
       "power": 1.8,
@@ -621,9 +621,9 @@
       "id": "3r",
       "mass": 2.5,
       "maxmass": 138,
-      "maxmul": 0.7,
+      "maxmul": 1.7,
       "minmass": 28,
-      "minmul": 1.7,
+      "minmul": 0.7,
       "optmass": 55,
       "optmul": 1.2,
       "power": 2.1,
@@ -639,9 +639,9 @@
       "id": "1x",
       "mass": 1.3,
       "maxmass": 63,
-      "maxmul": 0.7,
+      "maxmul": 1.7,
       "minmass": 13,
-      "minmul": 1.7,
+      "minmul": 0.7,
       "optmass": 25,
       "optmul": 1.2,
       "power": 1.68,
diff --git a/modules/standard/thrusters.json b/modules/standard/thrusters.json
index 76a731b..2349a3c 100644
--- a/modules/standard/thrusters.json
+++ b/modules/standard/thrusters.json
@@ -1,8 +1,6 @@
 {
   "t": [
     {
-      "M": 0.17,
-      "P": 0.235,
       "class": 8,
       "cost": 2007240,
       "edID": 128064098,
@@ -12,13 +10,15 @@
       "integrity": 135,
       "mass": 160,
       "maxmass": 3360,
+      "maxmul": 1.03,
+      "minmass": 1120,
+      "minmul": 0.83,
       "optmass": 2240,
+      "optmul": 1,
       "power": 7.2,
       "rating": "E"
     },
     {
-      "M": 0.14,
-      "P": 0.5145,
       "class": 8,
       "cost": 6021720,
       "edID": 128064099,
@@ -28,13 +28,15 @@
       "integrity": 120,
       "mass": 64,
       "maxmass": 3780,
+      "maxmul": 1.06,
+      "minmass": 1260,
+      "minmul": 0.86,
       "optmass": 2520,
+      "optmul": 1,
       "power": 8.1,
       "rating": "D"
     },
     {
-      "M": 0.1,
-      "P": 1,
       "class": 8,
       "cost": 18065170,
       "edID": 128064100,
@@ -44,13 +46,15 @@
       "integrity": 150,
       "mass": 160,
       "maxmass": 4200,
+      "maxmul": 1.1,
+      "minmass": 1400,
+      "minmul": 0.9,
       "optmass": 2800,
+      "optmul": 1,
       "power": 9,
       "rating": "C"
     },
     {
-      "M": 0.07,
-      "P": 1.51,
       "class": 8,
       "cost": 54195500,
       "edID": 128064101,
@@ -60,13 +64,15 @@
       "integrity": 180,
       "mass": 256,
       "maxmass": 4620,
+      "maxmul": 1.13,
+      "minmass": 1540,
+      "minmul": 0.93,
       "optmass": 3080,
+      "optmul": 1,
       "power": 9.9,
       "rating": "B"
     },
     {
-      "M": 0.04,
-      "P": 2.33,
       "class": 8,
       "cost": 162586490,
       "edID": 128064102,
@@ -76,13 +82,15 @@
       "integrity": 165,
       "mass": 160,
       "maxmass": 5040,
-      "optmass": 3360,
+      "maxmul": 1.16,
+      "minmass": 1680,
+      "minmul": 0.96,
+      "optmass": 5040,
+      "optmul": 1,
       "power": 10.8,
       "rating": "A"
     },
     {
-      "M": 0.17,
-      "P": 0.235,
       "class": 7,
       "cost": 633200,
       "edID": 128064093,
@@ -92,13 +100,15 @@
       "integrity": 118,
       "mass": 80,
       "maxmass": 2160,
+      "maxmul": 1.03,
+      "minmass": 720,
+      "minmul": 0.83,
       "optmass": 1440,
+      "optmul": 1,
       "power": 6.08,
       "rating": "E"
     },
     {
-      "M": 0.14,
-      "P": 0.5145,
       "class": 7,
       "cost": 1899600,
       "edID": 128064094,
@@ -108,13 +118,15 @@
       "integrity": 105,
       "mass": 32,
       "maxmass": 2430,
+      "maxmul": 0.86,
+      "minmass": 810,
+      "minmul": 0.86,
       "optmass": 1620,
+      "optmul": 1,
       "power": 6.84,
       "rating": "D"
     },
     {
-      "M": 0.1,
-      "P": 1,
       "class": 7,
       "cost": 5698790,
       "edID": 128064095,
@@ -124,13 +136,15 @@
       "integrity": 131,
       "mass": 80,
       "maxmass": 2700,
+      "maxmul": 1.1,
+      "minmass": 900,
+      "minmul": 0.9,
       "optmass": 1800,
+      "optmul": 1,
       "power": 7.6,
       "rating": "C"
     },
     {
-      "M": 0.07,
-      "P": 1.51,
       "class": 7,
       "cost": 17096370,
       "edID": 128064096,
@@ -140,13 +154,15 @@
       "integrity": 157,
       "mass": 128,
       "maxmass": 2970,
+      "maxmul": 1.13,
+      "minmass": 990,
+      "minmul": 0.93,
       "optmass": 1980,
+      "optmul": 1,
       "power": 8.36,
       "rating": "B"
     },
     {
-      "M": 0.04,
-      "P": 2.33,
       "class": 7,
       "cost": 51289110,
       "edID": 128064097,
@@ -156,13 +172,15 @@
       "integrity": 144,
       "mass": 80,
       "maxmass": 3240,
+      "maxmul": 1.16,
+      "minmass": 1080,
+      "minmul": 0.96,
       "optmass": 2160,
+      "optmul": 1,
       "power": 9.12,
       "rating": "A"
     },
     {
-      "M": 0.17,
-      "P": 0.235,
       "class": 6,
       "cost": 199750,
       "edID": 128064088,
@@ -172,13 +190,15 @@
       "integrity": 102,
       "mass": 40,
       "maxmass": 1440,
+      "maxmul": 1.03,
+      "minmass": 480,
+      "minmul": 0.83,
       "optmass": 960,
+      "optmul": 1,
       "power": 5.04,
       "rating": "E"
     },
     {
-      "M": 0.14,
-      "P": 0.5145,
       "class": 6,
       "cost": 599240,
       "edID": 128064089,
@@ -188,13 +208,15 @@
       "integrity": 90,
       "mass": 16,
       "maxmass": 1620,
+      "maxmul": 1.06,
+      "minmass": 540,
+      "minmul": 0.86,
       "optmass": 1080,
+      "optmul": 1,
       "power": 5.67,
       "rating": "D"
     },
     {
-      "M": 0.1,
-      "P": 1,
       "class": 6,
       "cost": 1797730,
       "edID": 128064090,
@@ -204,13 +226,15 @@
       "integrity": 113,
       "mass": 40,
       "maxmass": 1800,
+      "maxmul": 1.1,
+      "minmass": 600,
+      "minmul": 0.9,
       "optmass": 1200,
+      "optmul": 1,
       "power": 6.3,
       "rating": "C"
     },
     {
-      "M": 0.07,
-      "P": 1.51,
       "class": 6,
       "cost": 5393180,
       "edID": 128064091,
@@ -220,13 +244,15 @@
       "integrity": 136,
       "mass": 64,
       "maxmass": 1980,
+      "maxmul": 1.13,
+      "minmass": 660,
+      "minmul": 0.93,
       "optmass": 1320,
+      "optmul": 1,
       "power": 6.93,
       "rating": "B"
     },
     {
-      "M": 0.04,
-      "P": 2.33,
       "class": 6,
       "cost": 16179530,
       "edID": 128064092,
@@ -236,13 +262,15 @@
       "integrity": 124,
       "mass": 40,
       "maxmass": 2160,
+      "maxmul": 1.16,
+      "minmass": 720,
+      "minmul": 0.96,
       "optmass": 1440,
+      "optmul": 1,
       "power": 7.56,
       "rating": "A"
     },
     {
-      "M": 0.17,
-      "P": 0.235,
       "class": 5,
       "cost": 63010,
       "edID": 128064083,
@@ -252,13 +280,15 @@
       "integrity": 86,
       "mass": 20,
       "maxmass": 840,
+      "maxmul": 1.03,
+      "minmass": 280,
+      "minmul": 0.83,
       "optmass": 560,
+      "optmul": 1,
       "power": 4.08,
       "rating": "E"
     },
     {
-      "M": 0.14,
-      "P": 0.5145,
       "class": 5,
       "cost": 189040,
       "edID": 128064084,
@@ -268,13 +298,15 @@
       "integrity": 77,
       "mass": 8,
       "maxmass": 945,
+      "maxmul": 1.06,
+      "minmass": 315,
+      "minmul": 0.86,
       "optmass": 630,
+      "optmul": 1,
       "power": 4.59,
       "rating": "D"
     },
     {
-      "M": 0.1,
-      "P": 1,
       "class": 5,
       "cost": 567110,
       "edID": 128064085,
@@ -284,13 +316,15 @@
       "integrity": 96,
       "mass": 20,
       "maxmass": 1050,
+      "maxmul": 1.1,
+      "minmass": 350,
+      "minmul": 0.9,
       "optmass": 700,
+      "optmul": 1,
       "power": 5.1,
       "rating": "C"
     },
     {
-      "M": 0.07,
-      "P": 1.51,
       "class": 5,
       "cost": 1701320,
       "edID": 128064086,
@@ -300,13 +334,15 @@
       "integrity": 115,
       "mass": 32,
       "maxmass": 1155,
+      "maxmul": 1.13,
+      "minmass": 385,
+      "minmul": 0.93,
       "optmass": 770,
+      "optmul": 1,
       "power": 5.61,
       "rating": "B"
     },
     {
-      "M": 0.04,
-      "P": 2.33,
       "class": 5,
       "cost": 5103950,
       "edID": 128064087,
@@ -316,13 +352,15 @@
       "integrity": 106,
       "mass": 20,
       "maxmass": 1260,
+      "maxmul": 1.16,
+      "minmass": 420,
+      "minmul": 0.96,
       "optmass": 840,
+      "optmul": 1,
       "power": 6.12,
       "rating": "A"
     },
     {
-      "M": 0.17,
-      "P": 0.235,
       "class": 4,
       "cost": 19880,
       "edID": 128064078,
@@ -332,13 +370,15 @@
       "integrity": 72,
       "mass": 10,
       "maxmass": 420,
+      "maxmul": 1.03,
+      "minmass": 140,
+      "minmul": 0.83,
       "optmass": 280,
+      "optmul": 1,
       "power": 3.28,
       "rating": "E"
     },
     {
-      "M": 0.14,
-      "P": 0.5145,
       "class": 4,
       "cost": 59630,
       "edID": 128064079,
@@ -347,14 +387,16 @@
       "id": "td",
       "integrity": 64,
       "mass": 4,
-      "maxmass": 473,
+      "maxmass": 472.5,
+      "maxmul": 1.06,
+      "minmass": 157.5,
+      "minmul": 0.86,
       "optmass": 315,
+      "optmul": 1,
       "power": 3.69,
       "rating": "D"
     },
     {
-      "M": 0.1,
-      "P": 1,
       "class": 4,
       "cost": 178900,
       "edID": 128064080,
@@ -364,13 +406,15 @@
       "integrity": 80,
       "mass": 10,
       "maxmass": 525,
+      "maxmul": 1.1,
+      "minmass": 175,
+      "minmul": 0.9,
       "optmass": 350,
+      "optmul": 1,
       "power": 4.1,
       "rating": "C"
     },
     {
-      "M": 0.07,
-      "P": 1.51,
       "class": 4,
       "cost": 536690,
       "edID": 128064081,
@@ -379,14 +423,16 @@
       "id": "tb",
       "integrity": 96,
       "mass": 16,
-      "maxmass": 578,
+      "maxmass": 577.5,
+      "maxmul": 1.13,
+      "minmass": 192.5,
+      "minmul": 0.93,
       "optmass": 385,
+      "optmul": 1,
       "power": 4.51,
       "rating": "B"
     },
     {
-      "M": 0.04,
-      "P": 2.33,
       "class": 4,
       "cost": 1610080,
       "edID": 128064082,
@@ -396,13 +442,15 @@
       "integrity": 88,
       "mass": 10,
       "maxmass": 630,
+      "maxmul": 1.16,
+      "minmass": 210,
+      "minmul": 0.96,
       "optmass": 420,
+      "optmul": 1,
       "power": 4.92,
       "rating": "A"
     },
     {
-      "M": 0.17,
-      "P": 0.235,
       "class": 3,
       "cost": 6270,
       "edID": 128064073,
@@ -412,13 +460,15 @@
       "integrity": 58,
       "mass": 5,
       "maxmass": 120,
+      "maxmul": 1.03,
+      "minmass": 40,
+      "minmul": 0.83,
       "optmass": 80,
+      "optmul": 1,
       "power": 2.48,
       "rating": "E"
     },
     {
-      "M": 0.14,
-      "P": 0.5145,
       "class": 3,
       "cost": 18810,
       "edID": 128064074,
@@ -428,13 +478,15 @@
       "integrity": 51,
       "mass": 2,
       "maxmass": 135,
+      "maxmul": 1.06,
+      "minmass": 45,
+      "minmul": 0.86,
       "optmass": 90,
+      "optmul": 1,
       "power": 2.79,
       "rating": "D"
     },
     {
-      "M": 0.1,
-      "P": 1,
       "class": 3,
       "cost": 56440,
       "edID": 128064075,
@@ -444,13 +496,15 @@
       "integrity": 64,
       "mass": 5,
       "maxmass": 150,
+      "maxmul": 1.1,
+      "minmass": 50,
+      "minmul": 0.9,
       "optmass": 100,
+      "optmul": 1,
       "power": 3.1,
       "rating": "C"
     },
     {
-      "M": 0.07,
-      "P": 1.51,
       "class": 3,
       "cost": 169300,
       "edID": 128064076,
@@ -460,13 +514,15 @@
       "integrity": 77,
       "mass": 8,
       "maxmass": 165,
+      "maxmul": 1.13,
+      "minmass": 55,
+      "minmul": 0.93,
       "optmass": 110,
+      "optmul": 1,
       "power": 3.41,
       "rating": "B"
     },
     {
-      "M": 0.04,
-      "P": 2.33,
       "class": 3,
       "cost": 507910,
       "edID": 128064077,
@@ -476,13 +532,15 @@
       "integrity": 72,
       "mass": 5,
       "maxmass": 180,
+      "maxmul": 1.16,
+      "minmass": 60,
+      "minmul": 0.96,
       "optmass": 120,
+      "optmul": 1,
       "power": 3.72,
       "rating": "A"
     },
     {
-      "M": 0.17,
-      "P": 0.235,
       "class": 2,
       "cost": 1980,
       "edID": 128064068,
@@ -492,13 +550,15 @@
       "integrity": 46,
       "mass": 2.5,
       "maxmass": 72,
+      "maxmul": 1.03,
+      "minmass": 24,
+      "minmul": 0.83,
       "optmass": 48,
+      "optmul": 1,
       "power": 2,
       "rating": "E"
     },
     {
-      "M": 0.14,
-      "P": 0.5145,
       "class": 2,
       "cost": 5930,
       "edID": 128064069,
@@ -508,13 +568,15 @@
       "integrity": 41,
       "mass": 1,
       "maxmass": 81,
+      "maxmul": 1.06,
+      "minmass": 27,
+      "minmul": 0.86,
       "optmass": 54,
+      "optmul": 1,
       "power": 2.25,
       "rating": "D"
     },
     {
-      "M": 0.1,
-      "P": 1,
       "class": 2,
       "cost": 17800,
       "edID": 128064070,
@@ -524,13 +586,15 @@
       "integrity": 51,
       "mass": 2.5,
       "maxmass": 90,
+      "maxmul": 1.1,
+      "minmass": 30,
+      "minmul": 0.9,
       "optmass": 60,
+      "optmul": 1,
       "power": 2.5,
       "rating": "C"
     },
     {
-      "M": 0.07,
-      "P": 1.51,
       "class": 2,
       "cost": 53410,
       "edID": 128064071,
@@ -540,13 +604,15 @@
       "integrity": 61,
       "mass": 4,
       "maxmass": 99,
+      "maxmul": 1.13,
+      "minmass": 33,
+      "minmul": 0.93,
       "optmass": 66,
+      "optmul": 1,
       "power": 2.75,
       "rating": "B"
     },
     {
-      "M": 0.04,
-      "P": 2.33,
       "class": 2,
       "cost": 160220,
       "edID": 128064072,
@@ -556,41 +622,49 @@
       "integrity": 56,
       "mass": 2.5,
       "maxmass": 108,
+      "maxmul": 0.96,
+      "minmass": 36,
+      "minmul": 1.16,
       "optmass": 72,
+      "optmul": 1,
       "power": 3,
       "rating": "A"
     },
     {
-      "M": 0.04,
-      "P": 2.33,
       "class": 3,
-      "cost": 5103952,
+      "cost": 5103950,
       "edID": 128682013,
       "eddbID": 1548,
       "grp": "t",
       "id": "tz",
-      "integrity": 70,
+      "integrity": 55,
       "mass": 5,
       "maxmass": 200,
+      "maxmul": 1.6,
+      "minmass": 70,
+      "minmul": 0.9,
       "name": "Enhanced Performance",
       "optmass": 90,
+      "optmul": 1.25,
       "power": 5,
       "rating": "A"
     },
     {
-      "M": 0.04,
-      "P": 2.33,
       "class": 2,
       "cost": 1610080,
       "edID": 128682014,
       "eddbID": 1547,
       "grp": "t",
       "id": "u0",
-      "integrity": 56,
+      "integrity": 40,
       "mass": 2.5,
       "maxmass": 120,
+      "maxmul": 1.6,
+      "minmass": 50,
+      "minmul": 0.9,
       "name": "Enhanced Performance",
       "optmass": 60,
+      "optmul": 1.25,
       "power": 4,
       "rating": "A"
     }
diff --git a/ships/adder.json b/ships/adder.json
index fe8a9bf..d91b9d9 100755
--- a/ships/adder.json
+++ b/ships/adder.json
@@ -11,8 +11,8 @@
       "boost": 320,
       "boostEnergy": 9,
       "agility": 8,
-      "baseShieldStrength": 78,
-      "baseArmour": 162,
+      "baseShieldStrength": 60,
+      "baseArmour": 90,
       "hullMass": 35,
       "masslock": 7,
       "pipSpeed": 0.13625
diff --git a/ships/anaconda.json b/ships/anaconda.json
index 02c884b..532e144 100755
--- a/ships/anaconda.json
+++ b/ships/anaconda.json
@@ -7,12 +7,12 @@
       "manufacturer": "Faulcon DeLacy",
       "class": 3,
       "hullCost": 141889930,
-      "speed": 183,
-      "boost": 244,
-      "boostEnergy": 29,
+      "speed": 180,
+      "boost": 240,
+      "boostEnergy": 27,
       "agility": 2,
-      "baseShieldStrength": 362,
-      "baseArmour": 945,
+      "baseShieldStrength": 350,
+      "baseArmour": 525,
       "hullMass": 400,
       "masslock": 23,
       "pipSpeed": 0.13875,
diff --git a/ships/asp.json b/ships/asp.json
index 06389e5..28fef6d 100755
--- a/ships/asp.json
+++ b/ships/asp.json
@@ -7,12 +7,12 @@
       "manufacturer": "Lakon",
       "class": 2,
       "hullCost": 6135660,
-      "speed": 254,
-      "boost": 345,
-      "boostEnergy": 14,
+      "speed": 250,
+      "boost": 340,
+      "boostEnergy": 13,
       "agility": 6,
-      "baseShieldStrength": 152,
-      "baseArmour": 378,
+      "baseShieldStrength": 140,
+      "baseArmour": 210,
       "hullMass": 280,
       "masslock": 11,
       "pipSpeed": 0.13
diff --git a/ships/asp_scout.json b/ships/asp_scout.json
index 3212324..40e2f55 100644
--- a/ships/asp_scout.json
+++ b/ships/asp_scout.json
@@ -6,12 +6,12 @@
       "manufacturer": "Lakon",
       "class": 2,
       "hullCost": 3818240,
-      "speed": 223,
-      "boost": 304,
+      "speed": 220,
+      "boost": 300,
       "boostEnergy": 13,
       "agility": 8,
-      "baseShieldStrength": 105,
-      "baseArmour": 324,
+      "baseShieldStrength": 120,
+      "baseArmour": 180,
       "hullMass": 150,
       "masslock": 8,
       "pipSpeed": 0.125
diff --git a/ships/beluga.json b/ships/beluga.json
index e50a266..6a6774e 100755
--- a/ships/beluga.json
+++ b/ships/beluga.json
@@ -7,12 +7,12 @@
       "manufacturer": "Saud Kruger",
       "class": 3,
       "hullCost": 79654610,
-      "speed": 195,
-      "boost": 273,
-      "boostEnergy": 20,
+      "speed": 200,
+      "boost": 280,
+      "boostEnergy": 19,
       "agility": 2,
-      "baseShieldStrength": 92,
-      "baseArmour": 504,
+      "baseShieldStrength": 280,
+      "baseArmour": 280,
       "hullMass": 1100,
       "masslock": 18,
       "pipSpeed": -1,
diff --git a/ships/cobra_mk_iii.json b/ships/cobra_mk_iii.json
index 344c318..95b8707 100755
--- a/ships/cobra_mk_iii.json
+++ b/ships/cobra_mk_iii.json
@@ -7,12 +7,12 @@
       "manufacturer": "Faulcon DeLacy",
       "class": 1,
       "hullCost": 205800,
-      "speed": 282,
-      "boost": 402,
-      "boostEnergy": 11,
+      "speed": 280,
+      "boost": 400,
+      "boostEnergy": 10,
       "agility": 6,
-      "baseShieldStrength": 92,
-      "baseArmour": 216,
+      "baseShieldStrength": 80,
+      "baseArmour": 120,
       "hullMass": 180,
       "masslock": 8,
       "pipSpeed": 0.125
diff --git a/ships/cobra_mk_iv.json b/ships/cobra_mk_iv.json
index ca88335..5016555 100644
--- a/ships/cobra_mk_iv.json
+++ b/ships/cobra_mk_iv.json
@@ -8,11 +8,11 @@
       "class": 1,
       "hullCost": 603740,
       "speed": 200,
-      "boost": 299,
-      "boostEnergy": 11,
+      "boost": 300,
+      "boostEnergy": 10,
       "agility": 4,
-      "baseShieldStrength": 125,
-      "baseArmour": 216,
+      "baseShieldStrength": 120,
+      "baseArmour": 120,
       "hullMass": 210,
       "masslock": 8,
       "pipSpeed": 0.125
diff --git a/ships/diamondback_explorer.json b/ships/diamondback_explorer.json
index 855b9df..5a92d00 100644
--- a/ships/diamondback_explorer.json
+++ b/ships/diamondback_explorer.json
@@ -6,12 +6,12 @@
       "manufacturer": "Lakon",
       "class": 1,
       "hullCost": 1635700,
-      "speed": 242,
-      "boost": 316,
-      "boostEnergy": 14,
+      "speed": 260,
+      "boost": 340,
+      "boostEnergy": 13,
       "agility": 5,
-      "baseShieldStrength": 115,
-      "baseArmour": 270,
+      "baseShieldStrength": 150,
+      "baseArmour": 150,
       "hullMass": 298,
       "masslock": 10,
       "pipSpeed": 0.09625
diff --git a/ships/diamondback_scout.json b/ships/diamondback_scout.json
index cbbb815..a70fa3a 100644
--- a/ships/diamondback_scout.json
+++ b/ships/diamondback_scout.json
@@ -7,12 +7,12 @@
       "manufacturer": "Lakon",
       "class": 1,
       "hullCost": 461340,
-      "speed": 283,
-      "boost": 384,
-      "boostEnergy": 11,
+      "speed": 280,
+      "boost": 380,
+      "boostEnergy": 10,
       "agility": 8,
-      "baseShieldStrength": 93,
-      "baseArmour": 216,
+      "baseShieldStrength": 120,
+      "baseArmour": 120,
       "hullMass": 170,
       "masslock": 8,
       "pipSpeed": 0.09875
diff --git a/ships/eagle.json b/ships/eagle.json
index 984b228..f1a7db5 100755
--- a/ships/eagle.json
+++ b/ships/eagle.json
@@ -7,12 +7,12 @@
       "manufacturer": "Core Dynamics",
       "class": 1,
       "hullCost": 10440,
-      "speed": 239,
-      "boost": 349,
-      "boostEnergy": 9,
+      "speed": 240,
+      "boost": 350,
+      "boostEnergy": 8,
       "agility": 10,
-      "baseShieldStrength": 89,
-      "baseArmour": 72,
+      "baseShieldStrength": 60,
+      "baseArmour": 40,
       "hullMass": 50,
       "masslock": 6,
       "pipSpeed": 0.0625
diff --git a/ships/federal_assault_ship.json b/ships/federal_assault_ship.json
index b3f4c6a..c9e9086 100644
--- a/ships/federal_assault_ship.json
+++ b/ships/federal_assault_ship.json
@@ -6,12 +6,12 @@
       "manufacturer": "Core Dynamics",
       "class": 2,
       "hullCost": 19072000,
-      "speed": 214,
-      "boost": 357,
-      "boostEnergy": 21,
+      "speed": 210,
+      "boost": 350,
+      "boostEnergy": 19,
       "agility": 6,
-      "baseShieldStrength": 133,
-      "baseArmour": 540,
+      "baseShieldStrength": 200,
+      "baseArmour": 300,
       "hullMass": 480,
       "masslock": 14,
       "pipSpeed": 0.11125
diff --git a/ships/federal_corvette.json b/ships/federal_corvette.json
index e844bb4..621ef26 100644
--- a/ships/federal_corvette.json
+++ b/ships/federal_corvette.json
@@ -7,11 +7,11 @@
       "manufacturer": "Core Dynamics",
       "class": 3,
       "hullCost": 182589570,
-      "speed": 198,
-      "boost": 257,
+      "speed": 200,
+      "boost": 260,
       "boostEnergy": 27,
       "agility": 2,
-      "baseShieldStrength": 516,
+      "baseShieldStrength": 555,
       "baseArmour": 666,
       "hullMass": 900,
       "masslock": 24,
diff --git a/ships/federal_dropship.json b/ships/federal_dropship.json
index dd36fc9..7d7a051 100755
--- a/ships/federal_dropship.json
+++ b/ships/federal_dropship.json
@@ -7,12 +7,12 @@
       "manufacturer": "Core Dynamics",
       "class": 2,
       "hullCost": 13469990,
-      "speed": 182,
-      "boost": 304,
-      "boostEnergy": 21,
+      "speed": 180,
+      "boost": 300,
+      "boostEnergy": 19,
       "agility": 2,
-      "baseShieldStrength": 104,
-      "baseArmour": 540,
+      "baseShieldStrength": 200,
+      "baseArmour": 300,
       "hullMass": 580,
       "masslock": 14,
       "pipSpeed": 0.0725
diff --git a/ships/federal_gunship.json b/ships/federal_gunship.json
index 4b2aeef..9b9191b 100644
--- a/ships/federal_gunship.json
+++ b/ships/federal_gunship.json
@@ -7,12 +7,12 @@
       "manufacturer": "Core Dynamics",
       "class": 2,
       "hullCost": 34774790,
-      "speed": 171,
-      "boost": 282,
-      "boostEnergy": 21,
+      "speed": 170,
+      "boost": 280,
+      "boostEnergy": 23,
       "agility": 2,
-      "baseShieldStrength": 186,
-      "baseArmour": 630,
+      "baseShieldStrength": 250,
+      "baseArmour": 350,
       "hullMass": 580,
       "masslock": 14,
       "pipSpeed": 0.1025,
diff --git a/ships/fer_de_lance.json b/ships/fer_de_lance.json
index b9cb728..31695a7 100755
--- a/ships/fer_de_lance.json
+++ b/ships/fer_de_lance.json
@@ -7,12 +7,12 @@
       "manufacturer": "Zorgon Peterson",
       "class": 2,
       "hullCost": 51232230,
-      "speed": 265,
-      "boost": 357,
-      "boostEnergy": 21,
+      "speed": 260,
+      "boost": 350,
+      "boostEnergy": 19,
       "agility": 6,
-      "baseShieldStrength": 271,
-      "baseArmour": 405,
+      "baseShieldStrength": 300,
+      "baseArmour": 225,
       "hullMass": 250,
       "masslock": 12,
       "pipSpeed": 0.03875
diff --git a/ships/hauler.json b/ships/hauler.json
index 7f9c38c..8b472ad 100755
--- a/ships/hauler.json
+++ b/ships/hauler.json
@@ -7,12 +7,12 @@
       "manufacturer": "Zorgon Peterson",
       "class": 1,
       "hullCost": 29790,
-      "speed": 203,
-      "boost": 305,
+      "speed": 200,
+      "boost": 300,
       "agility": 6,
       "boostEnergy": 7,
-      "baseShieldStrength": 65,
-      "baseArmour": 90,
+      "baseShieldStrength": 50,
+      "baseArmour": 50,
       "hullMass": 14,
       "masslock": 6,
       "pipSpeed": 0.1625
diff --git a/ships/imperial_clipper.json b/ships/imperial_clipper.json
index a4acfac..a90ab4c 100755
--- a/ships/imperial_clipper.json
+++ b/ships/imperial_clipper.json
@@ -7,12 +7,12 @@
       "manufacturer": "Gutamaya",
       "class": 3,
       "hullCost": 21077780,
-      "speed": 306,
-      "boost": 388,
-      "boostEnergy": 21,
+      "speed": 300,
+      "boost": 380,
+      "boostEnergy": 19,
       "agility": 2,
-      "baseShieldStrength": 186,
-      "baseArmour": 486,
+      "baseShieldStrength": 180,
+      "baseArmour": 270,
       "hullMass": 400,
       "masslock": 12,
       "pipSpeed": 0.1
diff --git a/ships/imperial_courier.json b/ships/imperial_courier.json
index dfae0e2..ccc9e33 100644
--- a/ships/imperial_courier.json
+++ b/ships/imperial_courier.json
@@ -8,10 +8,10 @@
       "hullCost": 2481550,
       "speed": 280,
       "boost": 380,
-      "boostEnergy": 11,
+      "boostEnergy": 10,
       "agility": 6,
-      "baseShieldStrength": 230,
-      "baseArmour": 144,
+      "baseShieldStrength": 200,
+      "baseArmour": 80,
       "hullMass": 35,
       "masslock": 7,
       "pipSpeed": 0.05375
diff --git a/ships/imperial_cutter.json b/ships/imperial_cutter.json
index 6d47857..c866894 100644
--- a/ships/imperial_cutter.json
+++ b/ships/imperial_cutter.json
@@ -6,12 +6,12 @@
       "manufacturer": "Gutamaya",
       "class": 3,
       "hullCost": 199926890,
-      "speed": 202,
-      "boost": 323,
-      "boostEnergy": 24,
+      "speed": 200,
+      "boost": 320,
+      "boostEnergy": 23,
       "agility": 2,
-      "baseShieldStrength": 703,
-      "baseArmour": 720,
+      "baseShieldStrength": 600,
+      "baseArmour": 400,
       "hullMass": 1100,
       "masslock": 27,
       "pipSpeed": 0.05,
diff --git a/ships/imperial_eagle.json b/ships/imperial_eagle.json
index d265345..31b9000 100644
--- a/ships/imperial_eagle.json
+++ b/ships/imperial_eagle.json
@@ -7,12 +7,12 @@
       "manufacturer": "Core Dynamics",
       "class": 1,
       "hullCost": 72180,
-      "speed": 298,
-      "boost": 397,
-      "boostEnergy": 9,
+      "speed": 300,
+      "boost": 400,
+      "boostEnergy": 8,
       "agility": 6,
-      "baseShieldStrength": 104,
-      "baseArmour": 108,
+      "baseShieldStrength": 80,
+      "baseArmour": 60,
       "hullMass": 50,
       "masslock": 6,
       "pipSpeed": 0.075
diff --git a/ships/keelback.json b/ships/keelback.json
index 67d7186..ba03717 100644
--- a/ships/keelback.json
+++ b/ships/keelback.json
@@ -7,12 +7,12 @@
       "manufacturer": "Lakon",
       "class": 2,
       "hullCost": 2951180,
-      "speed": 202,
-      "boost": 303,
+      "speed": 200,
+      "boost": 300,
       "boostEnergy": 10,
       "agility": 2,
-      "baseShieldStrength": 99,
-      "baseArmour": 243,
+      "baseShieldStrength": 135,
+      "baseArmour": 135,
       "hullMass": 180,
       "masslock": 8,
       "pipSpeed": 0.1375,
diff --git a/ships/orca.json b/ships/orca.json
index 6a2ea23..a28993f 100755
--- a/ships/orca.json
+++ b/ships/orca.json
@@ -7,12 +7,12 @@
       "manufacturer": "Saud Kruger",
       "class": 3,
       "hullCost": 47798080,
-      "speed": 303,
-      "boost": 384,
-      "boostEnergy": 17,
+      "speed": 300,
+      "boost": 380,
+      "boostEnergy": 16,
       "agility": 2,
-      "baseShieldStrength": 114,
-      "baseArmour": 396,
+      "baseShieldStrength": 220,
+      "baseArmour": 220,
       "hullMass": 580,
       "masslock": 13,
       "pipSpeed": 0.08375,
diff --git a/ships/python.json b/ships/python.json
index 21096cd..b7f9cbe 100755
--- a/ships/python.json
+++ b/ships/python.json
@@ -7,12 +7,12 @@
       "manufacturer": "Faulcon DeLacy",
       "class": 2,
       "hullCost": 55171380,
-      "speed": 234,
-      "boost": 305,
-      "boostEnergy": 24,
+      "speed": 230,
+      "boost": 300,
+      "boostEnergy": 23,
       "agility": 6,
-      "baseShieldStrength": 294,
-      "baseArmour": 468,
+      "baseShieldStrength": 260,
+      "baseArmour": 260,
       "hullMass": 350,
       "masslock": 17,
       "pipSpeed": 0.0975
diff --git a/ships/sidewinder.json b/ships/sidewinder.json
index 36357f8..af0a6bb 100755
--- a/ships/sidewinder.json
+++ b/ships/sidewinder.json
@@ -8,11 +8,11 @@
       "class": 1,
       "hullCost": 12870,
       "speed": 220,
-      "boost": 321,
+      "boost": 320,
       "boostEnergy": 7,
       "agility": 8,
-      "baseShieldStrength": 52,
-      "baseArmour": 108,
+      "baseShieldStrength": 40,
+      "baseArmour": 60,
       "hullMass": 25,
       "masslock": 6,
       "pipSpeed": 0.1375
diff --git a/ships/type_6_transporter.json b/ships/type_6_transporter.json
index 24fa79e..70fc260 100755
--- a/ships/type_6_transporter.json
+++ b/ships/type_6_transporter.json
@@ -7,12 +7,12 @@
       "manufacturer": "Lakon",
       "class": 2,
       "hullCost": 865790,
-      "speed": 223,
-      "boost": 355,
-      "boostEnergy": 11,
+      "speed": 220,
+      "boost": 350,
+      "boostEnergy": 10,
       "agility": 3,
-      "baseShieldStrength": 77,
-      "baseArmour": 162,
+      "baseShieldStrength": 90,
+      "baseArmour": 90,
       "hullMass": 155,
       "masslock": 8,
       "pipSpeed": 0.1475
diff --git a/ships/type_7_transport.json b/ships/type_7_transport.json
index e35b280..e1cac0a 100755
--- a/ships/type_7_transport.json
+++ b/ships/type_7_transport.json
@@ -7,12 +7,12 @@
       "manufacturer": "Lakon",
       "class": 3,
       "hullCost": 16881510,
-      "speed": 181,
-      "boost": 301,
-      "boostEnergy": 11,
+      "speed": 180,
+      "boost": 300,
+      "boostEnergy": 10,
       "agility": 2,
-      "baseShieldStrength": 78,
-      "baseArmour": 306,
+      "baseShieldStrength": 155,
+      "baseArmour": 170,
       "hullMass": 420,
       "masslock": 10,
       "pipSpeed": 0.16625
diff --git a/ships/type_9_heavy.json b/ships/type_9_heavy.json
index 2316948..c1b7ae7 100755
--- a/ships/type_9_heavy.json
+++ b/ships/type_9_heavy.json
@@ -7,12 +7,12 @@
       "manufacturer": "Lakon",
       "class": 3,
       "hullCost": 73255150,
-      "speed": 131,
-      "boost": 201,
-      "boostEnergy": 21,
+      "speed": 130,
+      "boost": 200,
+      "boostEnergy": 19,
       "agility": 0,
-      "baseShieldStrength": 88,
-      "baseArmour": 432,
+      "baseShieldStrength": 240,
+      "baseArmour": 240,
       "hullMass": 1000,
       "masslock": 16,
       "pipSpeed": 0.17375,
diff --git a/ships/viper.json b/ships/viper.json
index 49c0c3c..8dd469a 100755
--- a/ships/viper.json
+++ b/ships/viper.json
@@ -7,12 +7,12 @@
       "manufacturer": "Faulcon DeLacy",
       "class": 1,
       "hullCost": 95900,
-      "speed": 310,
-      "boost": 388,
-      "boostEnergy": 11,
+      "speed": 320,
+      "boost": 400,
+      "boostEnergy": 10,
       "agility": 6,
-      "baseShieldStrength": 137,
-      "baseArmour": 126,
+      "baseShieldStrength": 105,
+      "baseArmour": 70,
       "hullMass": 60,
       "masslock": 7,
       "pipSpeed": 0.09375
diff --git a/ships/viper_mk_iv.json b/ships/viper_mk_iv.json
index e9149e3..4d95ee3 100644
--- a/ships/viper_mk_iv.json
+++ b/ships/viper_mk_iv.json
@@ -7,12 +7,12 @@
       "manufacturer": "Faulcon DeLacy",
       "class": 1,
       "hullCost": 310220,
-      "speed": 271,
-      "boost": 342,
+      "speed": 270,
+      "boost": 340,
       "boostEnergy": 10,
       "agility": 4,
-      "baseShieldStrength": 103,
-      "baseArmour": 270,
+      "baseShieldStrength": 150,
+      "baseArmour": 150,
       "hullMass": 190,
       "masslock": 7,
       "pipSpeed": 0.0875
diff --git a/ships/vulture.json b/ships/vulture.json
index 16e3848..19fc022 100755
--- a/ships/vulture.json
+++ b/ships/vulture.json
@@ -7,12 +7,12 @@
       "manufacturer": "Core Dynamics",
       "class": 1,
       "hullCost": 4689640,
-      "speed": 215,
-      "boost": 348,
-      "boostEnergy": 17,
+      "speed": 210,
+      "boost": 340,
+      "boostEnergy": 16,
       "agility": 9,
-      "baseShieldStrength": 293,
-      "baseArmour": 288,
+      "baseShieldStrength": 240,
+      "baseArmour": 160,
       "hullMass": 230,
       "masslock": 10,
       "pipSpeed": 0.02375