diff --git a/api/api_autogen/library/defaults/Lcoefcr_MEtidalLCOECalculator.json b/api/api_autogen/library/defaults/Lcoefcr_MEtidalLCOECalculator.json
index 926c9ba434..d165893d40 100644
--- a/api/api_autogen/library/defaults/Lcoefcr_MEtidalLCOECalculator.json
+++ b/api/api_autogen/library/defaults/Lcoefcr_MEtidalLCOECalculator.json
@@ -2,7 +2,7 @@
 	"defaults": {
 		"SimpleLCOE": {
 			"annual_energy": 0,
-			"capital_cost": 1.49331e+07,
+			"capital_cost": 1.52173e+07,
 			"fixed_charge_rate": 0.108,
 			"fixed_operating_cost": 1.36208e+06,
 			"variable_operating_cost": 0
diff --git a/api/api_autogen/library/defaults/Lcoefcr_MEwaveLCOECalculator.json b/api/api_autogen/library/defaults/Lcoefcr_MEwaveLCOECalculator.json
index 284699f0cc..72298cdcc7 100644
--- a/api/api_autogen/library/defaults/Lcoefcr_MEwaveLCOECalculator.json
+++ b/api/api_autogen/library/defaults/Lcoefcr_MEwaveLCOECalculator.json
@@ -2,7 +2,7 @@
 	"defaults": {
 		"SimpleLCOE": {
 			"annual_energy": 0,
-			"capital_cost": 4.07204e+08,
+			"capital_cost": 4.04642e+08,
 			"fixed_charge_rate": 0.108,
 			"fixed_operating_cost": 5.43132e+06,
 			"variable_operating_cost": 0
diff --git a/api/api_autogen/library/defaults/MhkTidal_MEtidalLCOECalculator.json b/api/api_autogen/library/defaults/MhkTidal_MEtidalLCOECalculator.json
index c7b4f03d6d..c76d2fef63 100644
--- a/api/api_autogen/library/defaults/MhkTidal_MEtidalLCOECalculator.json
+++ b/api/api_autogen/library/defaults/MhkTidal_MEtidalLCOECalculator.json
@@ -1,9 +1,9 @@
 {
 	"defaults": {
 		"MHKTidal": {
-			"balance_of_system_cost_total": 9.49882e+06,
+			"balance_of_system_cost_total": 9.76005e+06,
 			"device_costs_total": 4.23112e+06,
-			"financial_cost_total": 1.20321e+06,
+			"financial_cost_total": 1.2261e+06,
 			"fixed_charge_rate": 0.108,
 			"loss_additional": 0,
 			"loss_array_spacing": 0,
diff --git a/api/api_autogen/library/defaults/MhkWave_MEwaveBatterySingleOwner.json b/api/api_autogen/library/defaults/MhkWave_MEwaveBatterySingleOwner.json
index 2c2ee851bc..d95751d353 100644
--- a/api/api_autogen/library/defaults/MhkWave_MEwaveBatterySingleOwner.json
+++ b/api/api_autogen/library/defaults/MhkWave_MEwaveBatterySingleOwner.json
@@ -1,11 +1,11 @@
 {
 	"defaults": {
 		"MHKWave": {
-			"balance_of_system_cost_total": 7.91507e+07,
+			"balance_of_system_cost_total": 7.67951e+07,
 			"device_costs_total": 2.95244e+08,
 			"device_rated_power": 286,
 			"energy_period": [9.014900, 9.280300, 8.887900, 8.869400, 9.339900, 9.750500, 10.629600, 12.332300, 13.610500, 13.701300, 13.432600, 13.104500, 12.777200, 12.455900, 12.125500, 11.790900, 11.434900, 11.095400, 10.801300, 10.508500, 10.213000, 9.962600, 9.796400, 9.708500, 9.623300, 9.524800, 9.484100, 9.515300, 9.704800, 9.834900, 9.990300, 9.906900, 9.755800, 9.685300, 9.636800, 9.550000, 9.422400, 9.275200, 9.118800, 8.979300, 8.762600, 8.547800, 8.596600, 8.732100, 9.149600, 9.697200, 10.222800, 10.504600, 10.600600, 10.655500, 10.772800, 11.085700, 11.738200, 12.693600, 13.554900, 14.027200, 14.175700, 13.921500, 13.223400, 12.986700, 13.005900, 12.996800, 12.676200, 12.114400, 11.957200, 11.828100, 11.886700, 12.074900, 12.292300, 12.653600, 13.291700, 13.991800, 14.414400, 14.498100, 14.382700, 14.082100, 13.743300, 13.320100, 12.820700, 12.238300, 11.392600, 10.526300, 10.200800, 10.609200, 11.455700, 11.425800, 11.209500, 10.840800, 10.219900, 10.410600, 10.597100, 10.794800, 12.062400, 13.242800, 13.663400, 14.154200, 14.342000, 14.358900, 12.850700, 13.289700, 13.747000, 13.693500, 13.546500, 13.370700, 13.191200, 13.021300, 12.853000, 12.695300, 12.532100, 12.344100, 12.121800, 11.854000, 11.568700, 11.439900, 11.569400, 11.656800, 11.436000, 10.938500, 10.273500, 10.154600, 10.335500, 10.831200, 11.120000, 10.944800, 10.886100, 10.776500, 10.606200, 10.349200, 9.957100, 10.210500, 10.496400, 10.488200, 10.207300, 9.739600, 9.083000, 9.613800, 11.267400, 12.925500, 13.718000, 14.393300, 14.954200, 14.940700, 14.535000, 14.056200, 12.323100, 11.990700, 14.087800, 15.033900, 13.530900, 13.348000, 13.449000, 13.331000, 13.222500, 14.238100, 14.771900, 14.752900, 14.531100, 13.957400, 13.508600, 13.153800, 12.392000, 11.809200, 12.478100, 12.539800, 12.200000, 12.160300, 12.099100, 12.008300, 11.891000, 11.781600, 11.735200, 11.756700, 11.854300, 12.097400, 12.619400, 13.290100, 13.695200, 13.738600, 13.531100, 13.214300, 12.832300, 12.430400, 12.019200, 11.685300, 11.511000, 11.368400, 11.146700, 10.326500, 8.984500, 8.062300, 8.356200, 8.262400, 8.963800, 9.893600, 10.203600, 10.953600, 13.924200, 15.038000, 14.945800, 14.510200, 13.965100, 13.403600, 12.924400, 12.533200, 12.179100, 11.879800, 11.606000, 11.384000, 11.194300, 10.987500, 10.801100, 10.616800, 10.501200, 10.462500, 10.478400, 10.512000, 10.530200, 10.512700, 10.430800, 10.278600, 10.169100, 10.346500, 10.938600, 11.465400, 11.132100, 11.193800, 11.689100, 12.336800, 12.813300, 12.955200, 12.811400, 12.714300, 12.832400, 12.934900, 12.934000, 12.890000, 12.878800, 12.880000, 12.806800, 12.645300, 12.423200, 12.180300, 11.914100, 11.618100, 11.320600, 11.022300, 10.699400, 10.372600, 10.059200, 9.535500, 8.424900, 7.949900, 7.823700, 8.038600, 8.198700, 8.544500, 8.871000, 9.743400, 10.936300, 11.942700, 12.431400, 12.495200, 12.299800, 11.956400, 11.328200, 10.620100, 10.091600, 9.880300, 9.867000, 9.789500, 9.716500, 9.688800, 9.676900, 9.914600, 10.133200, 9.954800, 9.197500, 8.745800, 8.103400, 7.863100, 8.186400, 9.840100, 10.962000, 11.285600, 11.487600, 11.509900, 11.100400, 10.520400, 9.434400, 9.771600, 10.122500, 10.265400, 11.102700, 11.751200, 12.094800, 12.496900, 12.929600, 13.198500, 13.584200, 13.852900, 13.749100, 13.518800, 13.407800, 13.326300, 13.019600, 12.432600, 11.996700, 11.777700, 11.654200, 11.474800, 11.277500, 11.195000, 11.152200, 11.017900, 10.785100, 10.499300, 10.191000, 9.686700, 9.546600, 9.666500, 9.529100, 9.515900, 9.696100, 9.833000, 9.900800, 9.917500, 9.914000, 9.872900, 9.639200, 9.040900, 9.181900, 9.877800, 10.081200, 10.086100, 9.883500, 9.435300, 9.620700, 11.131100, 12.743500, 13.492800, 13.687400, 13.706300, 13.180800, 12.813900, 12.999900, 13.558900, 14.492300, 15.161500, 15.386400, 15.220700, 14.818700, 14.162800, 13.215400, 13.015800, 13.685800, 14.746800, 15.117600, 14.976000, 14.717000, 14.475000, 14.246400, 14.001400, 13.788000, 13.596000, 13.391400, 13.173600, 12.938600, 12.688000, 12.445800, 12.161800, 11.692700, 11.394900, 11.343700, 11.432100, 11.455600, 11.461300, 11.528600, 11.610400, 11.597400, 11.481200, 11.327300, 11.165900, 10.991300, 10.839500, 10.691900, 10.556100, 10.546000, 10.768500, 11.183500, 11.565400, 11.739200, 11.699500, 11.557800, 11.431200, 11.378000, 11.347000, 11.580600, 12.117400, 12.555200, 12.686400, 12.583900, 12.437500, 12.293900, 12.109900, 11.874600, 11.613200, 11.345400, 11.072700, 10.795200, 10.536000, 10.350400, 10.285300, 10.428700, 10.886200, 11.663200, 12.341200, 12.591700, 12.659300, 12.623200, 12.493200, 12.371800, 12.292700, 12.188600, 11.997700, 11.676200, 11.206600, 10.471700, 10.188800, 10.141000, 10.110600, 10.441700, 9.100100, 10.078800, 10.768600, 12.339500, 13.521400, 13.682400, 13.526000, 13.257900, 12.948200, 12.631100, 12.294100, 11.985200, 11.713400, 11.408700, 11.083700, 10.828600, 10.606000, 9.775000, 8.724600, 8.648600, 7.976600, 8.404400, 8.586200, 8.524800, 8.584600, 8.890700, 9.421300, 10.207600, 10.647600, 11.170600, 12.469700, 13.883800, 14.206600, 13.967500, 13.546700, 13.126100, 12.695100, 12.312400, 11.981200, 11.721500, 11.430800, 11.131300, 10.802100, 10.464100, 10.181400, 10.333500, 11.587200, 12.764800, 12.405200, 12.406800, 12.806300, 13.516000, 14.055000, 14.416000, 15.071200, 15.055100, 14.700700, 14.074000, 13.134600, 11.240900, 11.219400, 11.267500, 11.402600, 11.697700, 12.009300, 12.203300, 12.106900, 11.815200, 11.467900, 11.146800, 10.896300, 10.710400, 10.575700, 10.548100, 10.831000, 11.499000, 12.526300, 13.402300, 13.824000, 13.921000, 13.540700, 13.086300, 12.775900, 12.547500, 12.353100, 12.096800, 11.823500, 11.522400, 11.309000, 11.173800, 11.016700, 10.756200, 10.536600, 10.649900, 11.332400, 11.921400, 12.634500, 13.240100, 13.653300, 13.559800, 12.149500, 11.124400, 11.206700, 11.201400, 11.100200, 10.713300, 9.959900, 10.178400, 10.426800, 10.684400, 10.908700, 11.049700, 11.115400, 11.032700, 9.758800, 11.181800, 12.545400, 13.093200, 13.125800, 13.038400, 12.957800, 12.865800, 12.748900, 12.597300, 12.376100, 12.062900, 11.231600, 10.684000, 10.756600, 11.693300, 13.093300, 13.454100, 13.208000, 12.698700, 12.313400, 12.924100, 12.883000, 12.561100, 12.136300, 11.821600, 11.663400, 11.742900, 11.951800, 12.163600, 12.251400, 12.177300, 11.966100, 11.684000, 11.342300, 10.967600, 10.713000, 10.881900, 11.241000, 11.438800, 11.575900, 11.651000, 11.641200, 11.641300, 11.783500, 12.196600, 12.835100, 13.464200, 13.928300, 14.184400, 14.137800, 13.347900, 12.878100, 12.846900, 12.911400, 13.053900, 13.627800, 13.663100, 13.450900, 13.159900, 12.860300, 12.462900, 11.718300, 10.795400, 10.363700, 10.359500, 10.261900, 10.078200, 9.837600, 9.633400, 9.362500, 8.872800, 8.726100, 8.692800, 8.658700, 8.603000, 8.589600, 8.740600, 9.136800, 9.670000, 10.193800, 10.718000, 11.198200, 11.575800, 11.513400, 10.794200, 9.416600, 9.822800, 9.858600, 9.631800, 9.982900, 10.820900, 11.125700, 11.076000, 10.952500, 10.828900, 10.669300, 10.464400, 10.334200, 10.298600, 9.703700, 9.265800, 8.980400, 8.560600, 8.594800, 9.043300, 9.364300, 9.567100, 9.701700, 9.740600, 9.743000, 9.818100, 10.452000, 11.335400, 12.136300, 12.759900, 13.212400, 13.382400, 12.123600, 10.240200, 10.112100, 10.851900, 11.005400, 10.633000, 10.075600, 9.877500, 10.252100, 10.941200, 11.160300, 11.061800, 10.871700, 10.633700, 10.389400, 10.149700, 9.909300, 9.695700, 9.508900, 9.319700, 9.216800, 9.225400, 9.278600, 9.395900, 9.255700, 8.474600, 9.239200, 10.730200, 11.787300, 12.468900, 12.746000, 12.715200, 12.479800, 12.100900, 11.709500, 11.139700, 10.725200, 10.145200, 10.817100, 11.183500, 11.576900, 11.944200, 11.987500, 12.045200, 12.516700, 12.560800, 13.215300, 13.780000, 14.142600, 14.307600, 14.300300, 14.266400, 14.269500, 14.249800, 14.176000, 14.070600, 13.959200, 13.839100, 13.678100, 13.478700, 13.290200, 13.116300, 12.971800, 12.824600, 12.669300, 12.503800, 12.298500, 12.036900, 11.707600, 10.035900, 8.492800, 8.858800, 9.360900, 10.406200, 11.635300, 12.560700, 13.382200, 13.855400, 14.066000, 14.197500, 14.236100, 14.106500, 13.868000, 13.588800, 13.137600, 11.622000, 10.871800, 10.580600, 11.353700, 11.827500, 12.078800, 12.276000, 12.879000, 13.208200, 13.023700, 12.699800, 12.343400, 11.910300, 11.507300, 11.572200, 11.510600, 11.378700, 11.247600, 11.139100, 11.041100, 10.957000, 10.895300, 10.888100, 10.926800, 11.013000, 11.126300, 11.170300, 11.067600, 10.581200, 10.428700, 10.508000, 10.736700, 10.054600, 8.861800, 9.214500, 9.049800, 8.816000, 8.831300, 8.988800, 9.203800, 9.255000, 9.164000, 9.089600, 8.819200, 8.935800, 9.434400, 10.025700, 10.265700, 10.310000, 10.314600, 10.271100, 9.935100, 8.983200, 9.124100, 10.403100, 11.211300, 11.506900, 11.836200, 11.910300, 12.340400, 12.527800, 12.432600, 12.157600, 11.773000, 11.440600, 11.190200, 11.028900, 10.952200, 10.822400, 10.212900, 9.315000, 9.092600, 9.044700, 9.137100, 9.240200, 9.386900, 9.754100, 10.002600, 10.000100, 10.132500, 10.411400, 10.502800, 10.453000, 10.438200, 10.461500, 10.441700, 10.372900, 10.278700, 10.196600, 10.165800, 10.198100, 10.275000, 10.068600, 10.025400, 10.481100, 11.019200, 11.361500, 11.545700, 11.421500, 10.704600, 9.075400, 9.143300, 9.306600, 9.191800, 9.123200, 9.336800, 9.358400, 9.482300, 9.457300, 9.551800, 9.584800, 9.641800, 9.717100, 9.764200, 9.769600, 9.624400, 9.362000, 9.468400, 9.527700, 9.533700, 9.625000, 9.960300, 9.887800, 8.996400, 8.631300, 9.318800, 10.120200, 10.735100, 11.205100, 11.623400, 12.037500, 12.318300, 11.310500, 10.638700, 10.560400, 10.751500, 10.659800, 10.424900, 10.143800, 9.882900, 9.194500, 9.317300, 9.229000, 9.206100, 8.907900, 8.474800, 8.206700, 7.714300, 7.930700, 8.421200, 9.048700, 9.564700, 10.142200, 10.736900, 10.991300, 10.460600, 10.108400, 10.588300, 11.049200, 11.267800, 10.826600, 9.962900, 9.618500, 10.285100, 11.306400, 11.754400, 11.866600, 11.748400, 11.536100, 11.341600, 11.121900, 10.843600, 10.396500, 10.096700, 9.893000, 9.688700, 9.532400, 9.626500, 9.051200, 9.056800, 9.832300, 10.043100, 9.673800, 10.146100, 9.838400, 9.832200, 9.788700, 9.689100, 9.770000, 9.975400, 10.168500, 10.314400, 10.396100, 10.490200, 10.568700, 10.570700, 10.655300, 10.809300, 10.950900, 11.079900, 11.098500, 10.972700, 10.760100, 10.424100, 9.964500, 9.577400, 9.456200, 9.405500, 9.358100, 9.418700, 9.095100, 8.572200, 8.298300, 8.207200, 8.445300, 8.702900, 8.965300, 9.173400, 9.208100, 8.116100, 7.496700, 7.621800, 7.839400, 7.888400, 8.154000, 8.182700, 7.954800, 7.631800, 7.747400, 8.047300, 8.430100, 8.706200, 8.876600, 8.921500, 8.877800, 8.672100, 8.222300, 7.504100, 7.680800, 7.731200, 7.947300, 8.024600, 7.919200, 7.553800, 7.491900, 7.765200, 7.853800, 7.876700, 7.826300, 7.874400, 7.707600, 7.324300, 7.163600, 7.290300, 7.430000, 7.675400, 7.818000, 7.867700, 7.914400, 7.721800, 7.175700, 7.377600, 7.679900, 7.894200, 8.073700, 8.188800, 8.311900, 8.269800, 8.051100, 8.296500, 8.462500, 8.533700, 8.528500, 8.465700, 8.370400, 8.209600, 8.152300, 8.192400, 8.179400, 8.119700, 8.052300, 7.957800, 7.805800, 7.663500, 7.327500, 7.422200, 7.555600, 7.618800, 6.802500, 6.028800, 7.648300, 8.737200, 9.290400, 9.646700, 9.756300, 9.681300, 9.503300, 9.201100, 8.216500, 7.456400, 7.191200, 7.267600, 7.364900, 7.490900, 7.486400, 7.218800, 6.743900, 6.690000, 6.748400, 7.123500, 7.467400, 7.723800, 8.076200, 8.469300, 8.534000, 8.150900, 7.935600, 8.140100, 8.272700, 8.319600, 8.282600, 8.174200, 8.093300, 7.861000, 7.761400, 7.849100, 7.945100, 8.000800, 7.995600, 7.944300, 7.908600, 7.663700, 7.517500, 7.684400, 7.773800, 7.752400, 7.698600, 7.668200, 7.749800, 7.664600, 7.684100, 7.995100, 8.222100, 8.390700, 8.532400, 8.492500, 8.202600, 7.687900, 7.385600, 7.402500, 7.290300, 7.540600, 7.951900, 8.268700, 8.350800, 8.242500, 7.961900, 8.054400, 8.207900, 8.400700, 8.543500, 7.746600, 7.009700, 7.969600, 8.927300, 9.699100, 10.485700, 10.717600, 10.721800, 10.733600, 10.740000, 10.679400, 10.574000, 10.407600, 10.216400, 10.019600, 9.853900, 9.608100, 9.115700, 8.810200, 8.802900, 9.029600, 9.201100, 9.275100, 9.359200, 9.421600, 9.402500, 9.321400, 9.244500, 9.161000, 8.980700, 8.697500, 8.651700, 8.717600, 8.599500, 8.322600, 7.858500, 8.094800, 8.234400, 8.348500, 8.424500, 8.440100, 8.327800, 7.890600, 7.541900, 7.578800, 8.035400, 9.291500, 10.662400, 11.201600, 11.182000, 10.590000, 10.053800, 10.071900, 10.128200, 10.020200, 9.690900, 9.614600, 9.782100, 9.955300, 9.953200, 9.868700, 9.818300, 9.751600, 9.627400, 9.492300, 9.363400, 9.268300, 9.208800, 9.153800, 9.080500, 8.988800, 8.906900, 8.862600, 8.442400, 7.740000, 7.179300, 7.164300, 7.222300, 7.193000, 7.133900, 6.980700, 6.502500, 6.045300, 6.115200, 6.486700, 6.706100, 6.729500, 6.809500, 7.085700, 7.032100, 7.185900, 7.660300, 8.281300, 8.715200, 8.930700, 8.988500, 8.962500, 9.000000, 9.084300, 9.220400, 9.369200, 9.473800, 9.488100, 9.533700, 9.553900, 9.499000, 9.343600, 8.851700, 8.708700, 8.778500, 8.722600, 8.314600, 7.950500, 7.864100, 8.019200, 8.534500, 8.928700, 9.288600, 9.566000, 9.747300, 9.826000, 9.819300, 9.767700, 9.689900, 8.906700, 8.120300, 7.888500, 8.497700, 9.431300, 9.846600, 9.899200, 9.917300, 9.931900, 9.900200, 9.839500, 9.788900, 9.755000, 9.759700, 9.801800, 9.844400, 9.863000, 9.848100, 9.804800, 9.737100, 9.464800, 9.049300, 8.941900, 8.845000, 8.683000, 8.373000, 7.829400, 7.510000, 7.488500, 7.322400, 7.164900, 7.208200, 7.455600, 7.730200, 7.914400, 7.934900, 7.861400, 7.776700, 7.657000, 7.641400, 7.666400, 7.456300, 6.890500, 6.820000, 7.145200, 7.708700, 8.643400, 9.490100, 9.728100, 9.471000, 8.990100, 8.576700, 8.190600, 7.947100, 7.393400, 7.104200, 7.158200, 7.200700, 7.270700, 7.198200, 7.109400, 7.081500, 6.951800, 7.170700, 7.672200, 7.996600, 8.098300, 8.160300, 8.074300, 7.885200, 7.144000, 7.448100, 7.721800, 8.041400, 8.293800, 8.355100, 8.579400, 8.685300, 8.923100, 8.878000, 9.632300, 9.873200, 9.832200, 9.807200, 9.580200, 9.139600, 8.729700, 8.678600, 8.897600, 8.864800, 8.918500, 8.688400, 8.238900, 7.837000, 7.708200, 7.780100, 8.053800, 7.971800, 7.923700, 7.832700, 7.654900, 7.247700, 7.022100, 7.046700, 7.366300, 7.748800, 8.130200, 8.492800, 8.559600, 8.184900, 8.106300, 8.123700, 8.419700, 8.636800, 8.624100, 8.629800, 8.410700, 8.114200, 8.006000, 7.765900, 7.874100, 8.026300, 7.989100, 7.937200, 7.859400, 7.594700, 6.931400, 6.761700, 6.822800, 7.128200, 7.362900, 7.692400, 7.904000, 7.612500, 7.024300, 6.917400, 7.080200, 7.355200, 7.445000, 7.513700, 7.534900, 7.118300, 6.701600, 6.836700, 7.158200, 7.434000, 7.607200, 7.677800, 7.699600, 7.558400, 7.332300, 7.244800, 7.399500, 7.753100, 8.383000, 8.666400, 8.898000, 8.923000, 8.798500, 8.376200, 8.425800, 8.504500, 8.518300, 8.469300, 8.291100, 8.131000, 7.950700, 7.660000, 7.699200, 7.807600, 7.811100, 7.634800, 7.652400, 7.546100, 7.124100, 6.762700, 7.161400, 7.414900, 7.553100, 7.594400, 7.665000, 7.520400, 7.304300, 7.362800, 7.611200, 7.983700, 8.013100, 8.019400, 7.968200, 7.611600, 7.425800, 7.374700, 7.616200, 7.703200, 7.610000, 7.551500, 7.448600, 7.209600, 6.827900, 6.976300, 7.191600, 7.612300, 7.880200, 8.062000, 8.107000, 7.759100, 7.494600, 7.526700, 7.620000, 7.691900, 7.558200, 7.691800, 7.636400, 7.205000, 7.086000, 7.007900, 7.162600, 7.318800, 7.335600, 7.250200, 7.065900, 6.978900, 7.136800, 7.151900, 7.475700, 7.634100, 7.648700, 7.493500, 6.959200, 6.451500, 6.487900, 6.510900, 6.653100, 7.043400, 7.394200, 7.754600, 7.703200, 7.410300, 7.146700, 7.269600, 7.877200, 8.069200, 8.319500, 8.372700, 8.352200, 8.307700, 8.167000, 8.268900, 8.733300, 8.779100, 8.880500, 8.801500, 8.827300, 8.800000, 8.616800, 8.706200, 8.986500, 9.149500, 9.233500, 9.229200, 9.080000, 9.066000, 9.058800, 9.022400, 8.949300, 8.899400, 8.837400, 8.768700, 8.738100, 8.711900, 8.698200, 8.681500, 8.647700, 8.591600, 8.525100, 8.461300, 8.394000, 8.301600, 7.954300, 7.803000, 7.859200, 7.871600, 7.855900, 7.757400, 7.503500, 7.199700, 6.883900, 6.784000, 7.133100, 7.363200, 7.520800, 7.607300, 7.641300, 7.531900, 7.289600, 7.124600, 7.394800, 7.543200, 7.588300, 7.680500, 7.765300, 7.997300, 8.308200, 8.528200, 8.785900, 9.094700, 9.228800, 9.303100, 9.296400, 9.312300, 9.184300, 8.963900, 9.371100, 9.740800, 9.908400, 9.990600, 9.950600, 9.807700, 9.603900, 9.135300, 9.412200, 9.431700, 9.358100, 9.275900, 9.095800, 9.041200, 9.022700, 8.937000, 8.822900, 8.746700, 8.704100, 8.665700, 8.645700, 8.606600, 8.478800, 8.304500, 8.331700, 8.429200, 8.499500, 8.559700, 8.613900, 8.550300, 8.372100, 8.215400, 8.358900, 8.569600, 8.614100, 8.526800, 8.328400, 8.209900, 7.905800, 7.795000, 7.866400, 7.996200, 7.879900, 7.790800, 7.661800, 7.502100, 7.315500, 7.330900, 7.755700, 7.969000, 7.949500, 7.916400, 7.898200, 7.792300, 7.689100, 8.051800, 8.490100, 8.649700, 8.715600, 8.642500, 8.539200, 8.410700, 8.359500, 8.395300, 8.646300, 8.759800, 8.628300, 8.444200, 8.192000, 7.960100, 7.736500, 7.704800, 8.107000, 8.337900, 8.490400, 8.587700, 8.605200, 8.648100, 8.454600, 7.973600, 8.375600, 8.495600, 8.470100, 8.549300, 8.541400, 8.602900, 8.665000, 8.618900, 8.462100, 8.410700, 8.377400, 8.387100, 8.421200, 8.467100, 8.464900, 8.462700, 8.500600, 8.492000, 8.521500, 8.593800, 8.621700, 8.589700, 8.514800, 8.327700, 8.396100, 8.450100, 8.406000, 8.364700, 8.348900, 8.308800, 8.243700, 8.197900, 8.184700, 8.195900, 8.177700, 8.144200, 8.104700, 8.013300, 7.867500, 7.780500, 7.802800, 7.799900, 7.795500, 7.764000, 7.749100, 7.826300, 7.868600, 7.910300, 8.022500, 8.064100, 7.958900, 7.804300, 7.659700, 7.353900, 7.035900, 6.869200, 7.060200, 7.286200, 7.246100, 7.150500, 7.052700, 6.803400, 6.592900, 6.684900, 6.949600, 7.306700, 7.510500, 7.410700, 7.393300, 7.262200, 6.944800, 6.821300, 7.061200, 7.320400, 7.574000, 7.753900, 7.768500, 7.574000, 7.179700, 6.980800, 7.189900, 7.382400, 7.434700, 7.441200, 7.430000, 7.330900, 7.047600, 6.869100, 7.259300, 7.465200, 7.488700, 7.361200, 7.349400, 7.308100, 6.988700, 6.894200, 7.209800, 7.371900, 7.535300, 7.574400, 7.441200, 7.230700, 7.071000, 6.917900, 7.162300, 7.363800, 7.426100, 7.387400, 7.433000, 7.363900, 7.226500, 7.131000, 7.356000, 7.510700, 7.599800, 7.613300, 7.634200, 7.450100, 7.273700, 7.238000, 7.580600, 7.853700, 7.884300, 7.838000, 7.633800, 7.257300, 6.981600, 6.929500, 7.188300, 7.299100, 7.291800, 7.270700, 7.265100, 7.266300, 6.979300, 7.114600, 7.561800, 7.707700, 7.731900, 7.648600, 7.581900, 7.371500, 7.234200, 7.148400, 7.316700, 7.461400, 7.666000, 7.751800, 7.583900, 7.484200, 7.250000, 6.829700, 6.986600, 7.133000, 7.123100, 7.150100, 7.084200, 7.028000, 6.890200, 6.896200, 7.408300, 7.854300, 8.143200, 8.354800, 8.459400, 8.508000, 8.495800, 8.375300, 8.385700, 8.458800, 8.559400, 8.591000, 8.632100, 8.713100, 8.732200, 8.760500, 8.820200, 8.876600, 8.918400, 8.939500, 8.917200, 8.864200, 8.800100, 8.743100, 8.683900, 8.609400, 8.530900, 8.461800, 8.420700, 8.388600, 7.728100, 7.378700, 7.732900, 7.921300, 8.010400, 7.856800, 7.221700, 6.588900, 6.174300, 6.279800, 6.613700, 6.868500, 7.099000, 7.329600, 7.613600, 7.942900, 7.734700, 8.077500, 8.352500, 8.386400, 8.242100, 7.920700, 7.746600, 7.232900, 6.507800, 6.520100, 6.904100, 7.156900, 7.213400, 7.278900, 7.341600, 7.246400, 7.142100, 7.026100, 7.463400, 7.920300, 8.244900, 8.460200, 8.619600, 8.752200, 8.788300, 8.739900, 8.789000, 8.930400, 9.053200, 9.066700, 9.024700, 8.938000, 8.664700, 8.292900, 8.152600, 8.162100, 8.205800, 8.252800, 8.209200, 7.740300, 6.999400, 6.755100, 7.108200, 7.460600, 7.510600, 7.565600, 7.514300, 7.536900, 7.276300, 7.399900, 8.095400, 8.365200, 8.384400, 8.286100, 8.260100, 8.292600, 8.311300, 8.195800, 8.165700, 8.209500, 8.247200, 8.290800, 8.283400, 8.244300, 8.191100, 8.158600, 8.104700, 8.126100, 8.144000, 7.978100, 7.840500, 7.319500, 7.096100, 6.982700, 7.057500, 7.443600, 7.408100, 7.318700, 7.253700, 7.116100, 6.944100, 7.077500, 7.299000, 7.447500, 7.442400, 7.346500, 7.222000, 7.176400, 6.851500, 6.580900, 6.904400, 7.108400, 7.135100, 7.287700, 7.327200, 7.108600, 6.860200, 6.988600, 7.383600, 7.698500, 7.888700, 7.957800, 7.921100, 7.848000, 7.796000, 7.816400, 7.902600, 8.052600, 8.265300, 8.442600, 8.541200, 8.498000, 7.410500, 6.992800, 7.149600, 7.342800, 7.446500, 7.579700, 7.738600, 7.613000, 7.200000, 7.252000, 7.759800, 8.202400, 8.451500, 8.565800, 8.648900, 8.706700, 8.767500, 8.767700, 8.727900, 8.663000, 8.670100, 8.762300, 8.935800, 9.131400, 9.231500, 9.062100, 8.956300, 8.630800, 8.262900, 8.092000, 7.912700, 7.589800, 7.087600, 7.180100, 7.534700, 7.691200, 7.510700, 7.447400, 7.252900, 6.869700, 6.692200, 7.101300, 7.619200, 7.654200, 7.824100, 7.658000, 7.604600, 7.359800, 6.698100, 7.342500, 7.547700, 7.368100, 7.098700, 7.467900, 8.042000, 8.672500, 9.167900, 9.426700, 9.468900, 9.205300, 8.829100, 8.693600, 8.642300, 8.608400, 8.553500, 8.159400, 8.019300, 8.084000, 8.172000, 8.273400, 8.378200, 8.452100, 8.479600, 8.419200, 8.483500, 8.477800, 8.444800, 8.427700, 8.450500, 8.303900, 7.469400, 7.083100, 7.406800, 7.694200, 7.851900, 7.888400, 7.844500, 7.810500, 7.567000, 7.254800, 7.425800, 7.584700, 7.632200, 7.601600, 7.574700, 7.527600, 7.504800, 7.441200, 7.521000, 7.663500, 7.725800, 7.687400, 7.656600, 7.594400, 7.370600, 6.981400, 7.268700, 7.409000, 7.425000, 7.392400, 7.371900, 7.425000, 7.295400, 7.236200, 7.624100, 8.004500, 8.319800, 8.551800, 8.743700, 8.927700, 8.969200, 8.745800, 8.668100, 8.652000, 8.675400, 8.616400, 8.540300, 8.496300, 8.480600, 8.552800, 8.678400, 8.795200, 8.863400, 8.863100, 8.753600, 8.607000, 8.146700, 8.216800, 8.355800, 8.532000, 8.671900, 8.657600, 8.101700, 7.823200, 7.688200, 7.888800, 7.951200, 7.850000, 7.786400, 7.938300, 8.253600, 8.726000, 9.209600, 9.662400, 10.026800, 10.292300, 10.400700, 10.195900, 9.990200, 9.785200, 9.463000, 8.891800, 8.939900, 9.011800, 8.882700, 8.476100, 8.257900, 8.025700, 8.283700, 8.465000, 8.626900, 8.723400, 8.650100, 8.373000, 8.200000, 8.192900, 8.087000, 7.702800, 8.205500, 8.632900, 8.926600, 9.062000, 9.074700, 9.116100, 9.269800, 9.088100, 9.119700, 9.824400, 11.075100, 12.031300, 12.224800, 12.113600, 11.914100, 11.453700, 11.162900, 10.884000, 10.577200, 10.295600, 10.239200, 10.543900, 11.000400, 11.267600, 11.508000, 11.622900, 11.800600, 12.278900, 12.837300, 13.141700, 13.218400, 13.179800, 13.092000, 12.962200, 12.782200, 12.556900, 12.306400, 11.997700, 11.294000, 10.322700, 10.269000, 10.633000, 11.461100, 12.547400, 13.160000, 13.317000, 12.935600, 11.933100, 11.551800, 11.326800, 11.106300, 10.914800, 10.879800, 10.885100, 10.831000, 10.785400, 10.903300, 10.812800, 11.642800, 12.678800, 12.009100, 11.785800, 13.200800, 14.039000, 13.779200, 13.582500, 13.892200, 14.108100, 14.162100, 13.925300, 13.344200, 12.813700, 12.720500, 12.496900, 11.960100, 11.088800, 10.462100, 10.070000, 9.910900, 9.465300, 9.628800, 9.942400, 10.409300, 11.045900, 11.546400, 11.851000, 11.719900, 11.378600, 11.535200, 11.450500, 10.781000, 10.035500, 9.597600, 9.592600, 9.016800, 8.305700, 8.224000, 8.731300, 8.858300, 8.720400, 8.579100, 8.598100, 8.550200, 8.313500, 8.873200, 9.155300, 9.009600, 8.948400, 9.011300, 9.218500, 9.310200, 9.184200, 9.300600, 9.527600, 9.762800, 10.044100, 10.272200, 10.172600, 9.639200, 9.074600, 9.091900, 9.142500, 9.128000, 9.090300, 9.059400, 8.984000, 8.488100, 7.751900, 7.733000, 7.691000, 7.818900, 8.265800, 8.861800, 9.206500, 9.657200, 10.775100, 11.293800, 11.082800, 10.820800, 10.622400, 10.470900, 10.426800, 10.358900, 9.475300, 9.259000, 9.307000, 9.141700, 9.339200, 9.305400, 9.102300, 8.585400, 8.396200, 8.776600, 9.138300, 9.268700, 9.263400, 9.342000, 9.480000, 9.660100, 9.610600, 9.583400, 9.623300, 9.685900, 9.776600, 9.940300, 10.307900, 10.756500, 10.986500, 11.014800, 10.958900, 10.853700, 10.710500, 10.602000, 10.599000, 10.343200, 9.303100, 8.898200, 8.843300, 8.766800, 8.832400, 8.844900, 8.701100, 8.576100, 8.494100, 8.600000, 8.714300, 8.794200, 8.784000, 8.744700, 8.648800, 8.419700, 8.035900, 8.118200, 8.259100, 8.185700, 7.910600, 7.975900, 7.971400, 7.506300, 7.460900, 8.083900, 8.423600, 8.508500, 8.436100, 8.415700, 8.347700, 7.856500, 7.450000, 7.993100, 8.270100, 8.709200, 9.451200, 10.022700, 10.277700, 10.366600, 10.392700, 10.397500, 10.421900, 10.500200, 10.679300, 11.006900, 11.499800, 12.048600, 12.410400, 12.614200, 12.749700, 12.738300, 12.650900, 12.468400, 11.874000, 10.947100, 9.927300, 9.693800, 10.049200, 10.285600, 10.330500, 10.370300, 10.519800, 10.663300, 10.658400, 10.496700, 9.722000, 8.224800, 8.129900, 8.573400, 10.278100, 12.091900, 12.126300, 11.480500, 9.833800, 8.235500, 8.964500, 9.830800, 10.369200, 11.476500, 12.825200, 13.424000, 13.500900, 13.595300, 13.641200, 13.687600, 13.752400, 13.817700, 13.757800, 13.546400, 13.253600, 12.931800, 12.650900, 12.413000, 12.158600, 11.886900, 11.624800, 11.398500, 11.227500, 11.053300, 10.809700, 10.542600, 10.318500, 10.038600, 8.574700, 8.156300, 7.699500, 7.692000, 7.669500, 8.096200, 9.176000, 10.236500, 11.130800, 12.205500, 12.892700, 12.854400, 12.405200, 11.864000, 11.367900, 10.950300, 10.602000, 10.304800, 10.051100, 9.862200, 9.781200, 9.782600, 9.798900, 9.169400, 8.460700, 8.467500, 8.084800, 8.193100, 8.804800, 9.348700, 9.561600, 9.629900, 9.595100, 9.700300, 9.762300, 9.681300, 9.506300, 9.341700, 9.413600, 10.452700, 12.270400, 14.815700, 17.147300, 17.781600, 17.645700, 17.353900, 17.006700, 16.596500, 16.181500, 15.754700, 15.330800, 14.950400, 14.592500, 14.252800, 13.934700, 13.626900, 13.326200, 13.040300, 12.767700, 12.492300, 12.239700, 11.975900, 11.684400, 11.575000, 11.604400, 11.642700, 11.608200, 11.508100, 11.401800, 11.388900, 11.596600, 11.872500, 11.999300, 11.966500, 11.818400, 11.633700, 11.492900, 11.378500, 11.218900, 10.920300, 9.899800, 8.824100, 8.035600, 8.617800, 9.392500, 9.666900, 9.737300, 9.818800, 10.026900, 10.337400, 10.644400, 10.888100, 11.103000, 11.320800, 11.522800, 11.657500, 11.698600, 11.704200, 11.716300, 11.665600, 11.523400, 11.355400, 10.690800, 8.665900, 9.416200, 9.697900, 9.734200, 10.242700, 11.211100, 12.231400, 13.195400, 13.637400, 13.605700, 13.278600, 12.932600, 12.685800, 12.359100, 12.020000, 11.776000, 11.486500, 11.072000, 10.655100, 10.313300, 10.028500, 9.889300, 10.270200, 11.186600, 11.620800, 11.937500, 12.407700, 12.701700, 12.655900, 12.257300, 11.800600, 11.181100, 10.698700, 10.335300, 10.623500, 10.983700, 10.904100, 10.342700, 10.024500, 9.815000, 9.236000, 8.826100, 8.872300, 9.127100, 9.114400, 9.378900, 9.387600, 9.281900, 9.034500, 8.679600, 8.785500, 8.977800, 8.998900, 9.339800, 9.548000, 9.535000, 9.439800, 9.605900, 10.079600, 10.705300, 11.117600, 11.311800, 11.361200, 11.248100, 11.050500, 10.815100, 10.588800, 10.343100, 9.799600, 9.643900, 9.801600, 10.205000, 10.441100, 10.612300, 10.689000, 10.693700, 10.739600, 11.010300, 11.404900, 11.599300, 11.556000, 11.406500, 11.234000, 10.965300, 10.556900, 9.922500, 9.438400, 8.952400, 8.377600, 8.746500, 9.298600, 9.795800, 10.188200, 10.412200, 10.402100, 10.440600, 10.319400, 10.150900, 9.938300, 9.522000, 9.032300, 9.137400, 9.354800, 9.521000, 9.589700, 9.518900, 8.502600, 7.976000, 8.105700, 8.062900, 8.650600, 9.344100, 9.947600, 10.260600, 10.248200, 10.013300, 9.743100, 9.552800, 9.377900, 9.202600, 9.003800, 8.768500, 8.553100, 8.379800, 8.230200, 8.107800, 8.009200, 7.694700, 7.597200, 7.658100, 7.754200, 7.858100, 7.945700, 7.767800, 7.412100, 7.159100, 7.111800, 7.400200, 7.798500, 8.528500, 9.388200, 9.641200, 9.789200, 10.151600, 10.514500, 10.736400, 10.786600, 10.706900, 10.665200, 10.629000, 10.648000, 10.615200, 10.584500, 10.584000, 10.563600, 10.487200, 10.357500, 10.192800, 10.001000, 9.803700, 9.610600, 9.393900, 8.923900, 7.748000, 7.273700, 7.111500, 7.422600, 8.030500, 8.580600, 8.571900, 9.036100, 8.895700, 9.200200, 9.278100, 9.594000, 10.085500, 10.479700, 10.729100, 10.800500, 10.850600, 11.033700, 11.284500, 11.466000, 11.483000, 11.482200, 11.380700, 11.207600, 11.006500, 10.805500, 10.611200, 10.289400, 9.963100, 9.776800, 9.695200, 9.660800, 9.596800, 9.450900, 9.232200, 9.100400, 9.585500, 10.780100, 10.620800, 10.577800, 10.713600, 10.526500, 10.249700, 9.992100, 9.667100, 9.406400, 9.270000, 9.279300, 9.208800, 8.954600, 8.131300, 8.016500, 7.792700, 8.190300, 8.096800, 8.150200, 8.297600, 9.012800, 9.950900, 10.248900, 9.967400, 9.671700, 9.611200, 10.098200, 10.007600, 9.964400, 10.646600, 11.393300, 11.908800, 12.591000, 13.255400, 13.524200, 13.392500, 13.028700, 12.568000, 12.102700, 11.707600, 11.395200, 10.697700, 9.872200, 9.384200, 9.637500, 9.787000, 9.869500, 9.947500, 9.940300, 9.886500, 9.862000, 9.805600, 9.702200, 9.572500, 9.281200, 8.391600, 8.228000, 8.332700, 8.620100, 8.936200, 9.125400, 9.297500, 9.586900, 9.884000, 10.150400, 10.341600, 10.558000, 10.609000, 10.495200, 10.314500, 10.084000, 9.748600, 9.336900, 8.903400, 8.237600, 8.198300, 8.221400, 8.133700, 9.105200, 10.236700, 10.878600, 11.064900, 10.988700, 10.949300, 10.948100, 10.889400, 10.810300, 10.708900, 10.581400, 10.452200, 10.334700, 10.237300, 10.154100, 10.067200, 9.961900, 9.825700, 9.692300, 9.610400, 9.583700, 9.588700, 9.623900, 9.785600, 10.040700, 10.045200, 9.999300, 10.103900, 9.913800, 8.184900, 7.999200, 8.099700, 8.615800, 8.855400, 9.367400, 9.141100, 8.742700, 8.566900, 9.125100, 8.847100, 9.022400, 8.345300, 8.317100, 9.261900, 9.615600, 9.562600, 9.977800, 10.197500, 10.093200, 9.893400, 9.769500, 10.179900, 10.501500, 10.321200, 9.866900, 9.152100, 8.441600, 8.104300, 8.300000, 8.302700, 8.902300, 9.228400, 9.353500, 9.457000, 9.521800, 9.517400, 9.446700, 9.325400, 9.181800, 9.066500, 8.989300, 8.924100, 8.596000, 8.408100, 8.207100, 7.987900, 8.584300, 8.498300, 8.518100, 8.300900, 8.515700, 8.395000, 9.343500, 9.653500, 10.150000, 10.225500, 10.576500, 11.319200, 10.816200, 10.153100, 10.447500, 10.828500, 10.932400, 10.217500, 9.641200, 8.729100, 8.499200, 9.354600, 9.959600, 10.315600, 10.717400, 11.053900, 11.228900, 11.260200, 11.176700, 11.011500, 10.811200, 10.591400, 10.186400, 9.644800, 9.046000, 8.627500, 8.509100, 8.495500, 8.066500, 7.252600, 7.820500, 8.130800, 8.501000, 8.483300, 8.533000, 9.131300, 9.594200, 9.771400, 10.288000, 10.468000, 10.506900, 10.452300, 10.462000, 10.528100, 10.546400, 10.465400, 10.245600, 10.021000, 9.948800, 10.048600, 10.269800, 10.567300, 10.900400],
-			"financial_cost_total": 3.28096e+07,
+			"financial_cost_total": 3.26032e+07,
 			"loss_additional": 0,
 			"loss_array_spacing": 0,
 			"loss_downtime": 2,
diff --git a/api/api_autogen/library/defaults/MhkWave_MEwaveLCOECalculator.json b/api/api_autogen/library/defaults/MhkWave_MEwaveLCOECalculator.json
index 226ad025da..5b32a37ee0 100644
--- a/api/api_autogen/library/defaults/MhkWave_MEwaveLCOECalculator.json
+++ b/api/api_autogen/library/defaults/MhkWave_MEwaveLCOECalculator.json
@@ -1,11 +1,11 @@
 {
 	"defaults": {
 		"MHKWave": {
-			"balance_of_system_cost_total": 7.91507e+07,
+			"balance_of_system_cost_total": 7.67951e+07,
 			"device_costs_total": 2.95244e+08,
 			"device_rated_power": 286,
 			"energy_period": [9.014900, 9.280300, 8.887900, 8.869400, 9.339900, 9.750500, 10.629600, 12.332300, 13.610500, 13.701300, 13.432600, 13.104500, 12.777200, 12.455900, 12.125500, 11.790900, 11.434900, 11.095400, 10.801300, 10.508500, 10.213000, 9.962600, 9.796400, 9.708500, 9.623300, 9.524800, 9.484100, 9.515300, 9.704800, 9.834900, 9.990300, 9.906900, 9.755800, 9.685300, 9.636800, 9.550000, 9.422400, 9.275200, 9.118800, 8.979300, 8.762600, 8.547800, 8.596600, 8.732100, 9.149600, 9.697200, 10.222800, 10.504600, 10.600600, 10.655500, 10.772800, 11.085700, 11.738200, 12.693600, 13.554900, 14.027200, 14.175700, 13.921500, 13.223400, 12.986700, 13.005900, 12.996800, 12.676200, 12.114400, 11.957200, 11.828100, 11.886700, 12.074900, 12.292300, 12.653600, 13.291700, 13.991800, 14.414400, 14.498100, 14.382700, 14.082100, 13.743300, 13.320100, 12.820700, 12.238300, 11.392600, 10.526300, 10.200800, 10.609200, 11.455700, 11.425800, 11.209500, 10.840800, 10.219900, 10.410600, 10.597100, 10.794800, 12.062400, 13.242800, 13.663400, 14.154200, 14.342000, 14.358900, 12.850700, 13.289700, 13.747000, 13.693500, 13.546500, 13.370700, 13.191200, 13.021300, 12.853000, 12.695300, 12.532100, 12.344100, 12.121800, 11.854000, 11.568700, 11.439900, 11.569400, 11.656800, 11.436000, 10.938500, 10.273500, 10.154600, 10.335500, 10.831200, 11.120000, 10.944800, 10.886100, 10.776500, 10.606200, 10.349200, 9.957100, 10.210500, 10.496400, 10.488200, 10.207300, 9.739600, 9.083000, 9.613800, 11.267400, 12.925500, 13.718000, 14.393300, 14.954200, 14.940700, 14.535000, 14.056200, 12.323100, 11.990700, 14.087800, 15.033900, 13.530900, 13.348000, 13.449000, 13.331000, 13.222500, 14.238100, 14.771900, 14.752900, 14.531100, 13.957400, 13.508600, 13.153800, 12.392000, 11.809200, 12.478100, 12.539800, 12.200000, 12.160300, 12.099100, 12.008300, 11.891000, 11.781600, 11.735200, 11.756700, 11.854300, 12.097400, 12.619400, 13.290100, 13.695200, 13.738600, 13.531100, 13.214300, 12.832300, 12.430400, 12.019200, 11.685300, 11.511000, 11.368400, 11.146700, 10.326500, 8.984500, 8.062300, 8.356200, 8.262400, 8.963800, 9.893600, 10.203600, 10.953600, 13.924200, 15.038000, 14.945800, 14.510200, 13.965100, 13.403600, 12.924400, 12.533200, 12.179100, 11.879800, 11.606000, 11.384000, 11.194300, 10.987500, 10.801100, 10.616800, 10.501200, 10.462500, 10.478400, 10.512000, 10.530200, 10.512700, 10.430800, 10.278600, 10.169100, 10.346500, 10.938600, 11.465400, 11.132100, 11.193800, 11.689100, 12.336800, 12.813300, 12.955200, 12.811400, 12.714300, 12.832400, 12.934900, 12.934000, 12.890000, 12.878800, 12.880000, 12.806800, 12.645300, 12.423200, 12.180300, 11.914100, 11.618100, 11.320600, 11.022300, 10.699400, 10.372600, 10.059200, 9.535500, 8.424900, 7.949900, 7.823700, 8.038600, 8.198700, 8.544500, 8.871000, 9.743400, 10.936300, 11.942700, 12.431400, 12.495200, 12.299800, 11.956400, 11.328200, 10.620100, 10.091600, 9.880300, 9.867000, 9.789500, 9.716500, 9.688800, 9.676900, 9.914600, 10.133200, 9.954800, 9.197500, 8.745800, 8.103400, 7.863100, 8.186400, 9.840100, 10.962000, 11.285600, 11.487600, 11.509900, 11.100400, 10.520400, 9.434400, 9.771600, 10.122500, 10.265400, 11.102700, 11.751200, 12.094800, 12.496900, 12.929600, 13.198500, 13.584200, 13.852900, 13.749100, 13.518800, 13.407800, 13.326300, 13.019600, 12.432600, 11.996700, 11.777700, 11.654200, 11.474800, 11.277500, 11.195000, 11.152200, 11.017900, 10.785100, 10.499300, 10.191000, 9.686700, 9.546600, 9.666500, 9.529100, 9.515900, 9.696100, 9.833000, 9.900800, 9.917500, 9.914000, 9.872900, 9.639200, 9.040900, 9.181900, 9.877800, 10.081200, 10.086100, 9.883500, 9.435300, 9.620700, 11.131100, 12.743500, 13.492800, 13.687400, 13.706300, 13.180800, 12.813900, 12.999900, 13.558900, 14.492300, 15.161500, 15.386400, 15.220700, 14.818700, 14.162800, 13.215400, 13.015800, 13.685800, 14.746800, 15.117600, 14.976000, 14.717000, 14.475000, 14.246400, 14.001400, 13.788000, 13.596000, 13.391400, 13.173600, 12.938600, 12.688000, 12.445800, 12.161800, 11.692700, 11.394900, 11.343700, 11.432100, 11.455600, 11.461300, 11.528600, 11.610400, 11.597400, 11.481200, 11.327300, 11.165900, 10.991300, 10.839500, 10.691900, 10.556100, 10.546000, 10.768500, 11.183500, 11.565400, 11.739200, 11.699500, 11.557800, 11.431200, 11.378000, 11.347000, 11.580600, 12.117400, 12.555200, 12.686400, 12.583900, 12.437500, 12.293900, 12.109900, 11.874600, 11.613200, 11.345400, 11.072700, 10.795200, 10.536000, 10.350400, 10.285300, 10.428700, 10.886200, 11.663200, 12.341200, 12.591700, 12.659300, 12.623200, 12.493200, 12.371800, 12.292700, 12.188600, 11.997700, 11.676200, 11.206600, 10.471700, 10.188800, 10.141000, 10.110600, 10.441700, 9.100100, 10.078800, 10.768600, 12.339500, 13.521400, 13.682400, 13.526000, 13.257900, 12.948200, 12.631100, 12.294100, 11.985200, 11.713400, 11.408700, 11.083700, 10.828600, 10.606000, 9.775000, 8.724600, 8.648600, 7.976600, 8.404400, 8.586200, 8.524800, 8.584600, 8.890700, 9.421300, 10.207600, 10.647600, 11.170600, 12.469700, 13.883800, 14.206600, 13.967500, 13.546700, 13.126100, 12.695100, 12.312400, 11.981200, 11.721500, 11.430800, 11.131300, 10.802100, 10.464100, 10.181400, 10.333500, 11.587200, 12.764800, 12.405200, 12.406800, 12.806300, 13.516000, 14.055000, 14.416000, 15.071200, 15.055100, 14.700700, 14.074000, 13.134600, 11.240900, 11.219400, 11.267500, 11.402600, 11.697700, 12.009300, 12.203300, 12.106900, 11.815200, 11.467900, 11.146800, 10.896300, 10.710400, 10.575700, 10.548100, 10.831000, 11.499000, 12.526300, 13.402300, 13.824000, 13.921000, 13.540700, 13.086300, 12.775900, 12.547500, 12.353100, 12.096800, 11.823500, 11.522400, 11.309000, 11.173800, 11.016700, 10.756200, 10.536600, 10.649900, 11.332400, 11.921400, 12.634500, 13.240100, 13.653300, 13.559800, 12.149500, 11.124400, 11.206700, 11.201400, 11.100200, 10.713300, 9.959900, 10.178400, 10.426800, 10.684400, 10.908700, 11.049700, 11.115400, 11.032700, 9.758800, 11.181800, 12.545400, 13.093200, 13.125800, 13.038400, 12.957800, 12.865800, 12.748900, 12.597300, 12.376100, 12.062900, 11.231600, 10.684000, 10.756600, 11.693300, 13.093300, 13.454100, 13.208000, 12.698700, 12.313400, 12.924100, 12.883000, 12.561100, 12.136300, 11.821600, 11.663400, 11.742900, 11.951800, 12.163600, 12.251400, 12.177300, 11.966100, 11.684000, 11.342300, 10.967600, 10.713000, 10.881900, 11.241000, 11.438800, 11.575900, 11.651000, 11.641200, 11.641300, 11.783500, 12.196600, 12.835100, 13.464200, 13.928300, 14.184400, 14.137800, 13.347900, 12.878100, 12.846900, 12.911400, 13.053900, 13.627800, 13.663100, 13.450900, 13.159900, 12.860300, 12.462900, 11.718300, 10.795400, 10.363700, 10.359500, 10.261900, 10.078200, 9.837600, 9.633400, 9.362500, 8.872800, 8.726100, 8.692800, 8.658700, 8.603000, 8.589600, 8.740600, 9.136800, 9.670000, 10.193800, 10.718000, 11.198200, 11.575800, 11.513400, 10.794200, 9.416600, 9.822800, 9.858600, 9.631800, 9.982900, 10.820900, 11.125700, 11.076000, 10.952500, 10.828900, 10.669300, 10.464400, 10.334200, 10.298600, 9.703700, 9.265800, 8.980400, 8.560600, 8.594800, 9.043300, 9.364300, 9.567100, 9.701700, 9.740600, 9.743000, 9.818100, 10.452000, 11.335400, 12.136300, 12.759900, 13.212400, 13.382400, 12.123600, 10.240200, 10.112100, 10.851900, 11.005400, 10.633000, 10.075600, 9.877500, 10.252100, 10.941200, 11.160300, 11.061800, 10.871700, 10.633700, 10.389400, 10.149700, 9.909300, 9.695700, 9.508900, 9.319700, 9.216800, 9.225400, 9.278600, 9.395900, 9.255700, 8.474600, 9.239200, 10.730200, 11.787300, 12.468900, 12.746000, 12.715200, 12.479800, 12.100900, 11.709500, 11.139700, 10.725200, 10.145200, 10.817100, 11.183500, 11.576900, 11.944200, 11.987500, 12.045200, 12.516700, 12.560800, 13.215300, 13.780000, 14.142600, 14.307600, 14.300300, 14.266400, 14.269500, 14.249800, 14.176000, 14.070600, 13.959200, 13.839100, 13.678100, 13.478700, 13.290200, 13.116300, 12.971800, 12.824600, 12.669300, 12.503800, 12.298500, 12.036900, 11.707600, 10.035900, 8.492800, 8.858800, 9.360900, 10.406200, 11.635300, 12.560700, 13.382200, 13.855400, 14.066000, 14.197500, 14.236100, 14.106500, 13.868000, 13.588800, 13.137600, 11.622000, 10.871800, 10.580600, 11.353700, 11.827500, 12.078800, 12.276000, 12.879000, 13.208200, 13.023700, 12.699800, 12.343400, 11.910300, 11.507300, 11.572200, 11.510600, 11.378700, 11.247600, 11.139100, 11.041100, 10.957000, 10.895300, 10.888100, 10.926800, 11.013000, 11.126300, 11.170300, 11.067600, 10.581200, 10.428700, 10.508000, 10.736700, 10.054600, 8.861800, 9.214500, 9.049800, 8.816000, 8.831300, 8.988800, 9.203800, 9.255000, 9.164000, 9.089600, 8.819200, 8.935800, 9.434400, 10.025700, 10.265700, 10.310000, 10.314600, 10.271100, 9.935100, 8.983200, 9.124100, 10.403100, 11.211300, 11.506900, 11.836200, 11.910300, 12.340400, 12.527800, 12.432600, 12.157600, 11.773000, 11.440600, 11.190200, 11.028900, 10.952200, 10.822400, 10.212900, 9.315000, 9.092600, 9.044700, 9.137100, 9.240200, 9.386900, 9.754100, 10.002600, 10.000100, 10.132500, 10.411400, 10.502800, 10.453000, 10.438200, 10.461500, 10.441700, 10.372900, 10.278700, 10.196600, 10.165800, 10.198100, 10.275000, 10.068600, 10.025400, 10.481100, 11.019200, 11.361500, 11.545700, 11.421500, 10.704600, 9.075400, 9.143300, 9.306600, 9.191800, 9.123200, 9.336800, 9.358400, 9.482300, 9.457300, 9.551800, 9.584800, 9.641800, 9.717100, 9.764200, 9.769600, 9.624400, 9.362000, 9.468400, 9.527700, 9.533700, 9.625000, 9.960300, 9.887800, 8.996400, 8.631300, 9.318800, 10.120200, 10.735100, 11.205100, 11.623400, 12.037500, 12.318300, 11.310500, 10.638700, 10.560400, 10.751500, 10.659800, 10.424900, 10.143800, 9.882900, 9.194500, 9.317300, 9.229000, 9.206100, 8.907900, 8.474800, 8.206700, 7.714300, 7.930700, 8.421200, 9.048700, 9.564700, 10.142200, 10.736900, 10.991300, 10.460600, 10.108400, 10.588300, 11.049200, 11.267800, 10.826600, 9.962900, 9.618500, 10.285100, 11.306400, 11.754400, 11.866600, 11.748400, 11.536100, 11.341600, 11.121900, 10.843600, 10.396500, 10.096700, 9.893000, 9.688700, 9.532400, 9.626500, 9.051200, 9.056800, 9.832300, 10.043100, 9.673800, 10.146100, 9.838400, 9.832200, 9.788700, 9.689100, 9.770000, 9.975400, 10.168500, 10.314400, 10.396100, 10.490200, 10.568700, 10.570700, 10.655300, 10.809300, 10.950900, 11.079900, 11.098500, 10.972700, 10.760100, 10.424100, 9.964500, 9.577400, 9.456200, 9.405500, 9.358100, 9.418700, 9.095100, 8.572200, 8.298300, 8.207200, 8.445300, 8.702900, 8.965300, 9.173400, 9.208100, 8.116100, 7.496700, 7.621800, 7.839400, 7.888400, 8.154000, 8.182700, 7.954800, 7.631800, 7.747400, 8.047300, 8.430100, 8.706200, 8.876600, 8.921500, 8.877800, 8.672100, 8.222300, 7.504100, 7.680800, 7.731200, 7.947300, 8.024600, 7.919200, 7.553800, 7.491900, 7.765200, 7.853800, 7.876700, 7.826300, 7.874400, 7.707600, 7.324300, 7.163600, 7.290300, 7.430000, 7.675400, 7.818000, 7.867700, 7.914400, 7.721800, 7.175700, 7.377600, 7.679900, 7.894200, 8.073700, 8.188800, 8.311900, 8.269800, 8.051100, 8.296500, 8.462500, 8.533700, 8.528500, 8.465700, 8.370400, 8.209600, 8.152300, 8.192400, 8.179400, 8.119700, 8.052300, 7.957800, 7.805800, 7.663500, 7.327500, 7.422200, 7.555600, 7.618800, 6.802500, 6.028800, 7.648300, 8.737200, 9.290400, 9.646700, 9.756300, 9.681300, 9.503300, 9.201100, 8.216500, 7.456400, 7.191200, 7.267600, 7.364900, 7.490900, 7.486400, 7.218800, 6.743900, 6.690000, 6.748400, 7.123500, 7.467400, 7.723800, 8.076200, 8.469300, 8.534000, 8.150900, 7.935600, 8.140100, 8.272700, 8.319600, 8.282600, 8.174200, 8.093300, 7.861000, 7.761400, 7.849100, 7.945100, 8.000800, 7.995600, 7.944300, 7.908600, 7.663700, 7.517500, 7.684400, 7.773800, 7.752400, 7.698600, 7.668200, 7.749800, 7.664600, 7.684100, 7.995100, 8.222100, 8.390700, 8.532400, 8.492500, 8.202600, 7.687900, 7.385600, 7.402500, 7.290300, 7.540600, 7.951900, 8.268700, 8.350800, 8.242500, 7.961900, 8.054400, 8.207900, 8.400700, 8.543500, 7.746600, 7.009700, 7.969600, 8.927300, 9.699100, 10.485700, 10.717600, 10.721800, 10.733600, 10.740000, 10.679400, 10.574000, 10.407600, 10.216400, 10.019600, 9.853900, 9.608100, 9.115700, 8.810200, 8.802900, 9.029600, 9.201100, 9.275100, 9.359200, 9.421600, 9.402500, 9.321400, 9.244500, 9.161000, 8.980700, 8.697500, 8.651700, 8.717600, 8.599500, 8.322600, 7.858500, 8.094800, 8.234400, 8.348500, 8.424500, 8.440100, 8.327800, 7.890600, 7.541900, 7.578800, 8.035400, 9.291500, 10.662400, 11.201600, 11.182000, 10.590000, 10.053800, 10.071900, 10.128200, 10.020200, 9.690900, 9.614600, 9.782100, 9.955300, 9.953200, 9.868700, 9.818300, 9.751600, 9.627400, 9.492300, 9.363400, 9.268300, 9.208800, 9.153800, 9.080500, 8.988800, 8.906900, 8.862600, 8.442400, 7.740000, 7.179300, 7.164300, 7.222300, 7.193000, 7.133900, 6.980700, 6.502500, 6.045300, 6.115200, 6.486700, 6.706100, 6.729500, 6.809500, 7.085700, 7.032100, 7.185900, 7.660300, 8.281300, 8.715200, 8.930700, 8.988500, 8.962500, 9.000000, 9.084300, 9.220400, 9.369200, 9.473800, 9.488100, 9.533700, 9.553900, 9.499000, 9.343600, 8.851700, 8.708700, 8.778500, 8.722600, 8.314600, 7.950500, 7.864100, 8.019200, 8.534500, 8.928700, 9.288600, 9.566000, 9.747300, 9.826000, 9.819300, 9.767700, 9.689900, 8.906700, 8.120300, 7.888500, 8.497700, 9.431300, 9.846600, 9.899200, 9.917300, 9.931900, 9.900200, 9.839500, 9.788900, 9.755000, 9.759700, 9.801800, 9.844400, 9.863000, 9.848100, 9.804800, 9.737100, 9.464800, 9.049300, 8.941900, 8.845000, 8.683000, 8.373000, 7.829400, 7.510000, 7.488500, 7.322400, 7.164900, 7.208200, 7.455600, 7.730200, 7.914400, 7.934900, 7.861400, 7.776700, 7.657000, 7.641400, 7.666400, 7.456300, 6.890500, 6.820000, 7.145200, 7.708700, 8.643400, 9.490100, 9.728100, 9.471000, 8.990100, 8.576700, 8.190600, 7.947100, 7.393400, 7.104200, 7.158200, 7.200700, 7.270700, 7.198200, 7.109400, 7.081500, 6.951800, 7.170700, 7.672200, 7.996600, 8.098300, 8.160300, 8.074300, 7.885200, 7.144000, 7.448100, 7.721800, 8.041400, 8.293800, 8.355100, 8.579400, 8.685300, 8.923100, 8.878000, 9.632300, 9.873200, 9.832200, 9.807200, 9.580200, 9.139600, 8.729700, 8.678600, 8.897600, 8.864800, 8.918500, 8.688400, 8.238900, 7.837000, 7.708200, 7.780100, 8.053800, 7.971800, 7.923700, 7.832700, 7.654900, 7.247700, 7.022100, 7.046700, 7.366300, 7.748800, 8.130200, 8.492800, 8.559600, 8.184900, 8.106300, 8.123700, 8.419700, 8.636800, 8.624100, 8.629800, 8.410700, 8.114200, 8.006000, 7.765900, 7.874100, 8.026300, 7.989100, 7.937200, 7.859400, 7.594700, 6.931400, 6.761700, 6.822800, 7.128200, 7.362900, 7.692400, 7.904000, 7.612500, 7.024300, 6.917400, 7.080200, 7.355200, 7.445000, 7.513700, 7.534900, 7.118300, 6.701600, 6.836700, 7.158200, 7.434000, 7.607200, 7.677800, 7.699600, 7.558400, 7.332300, 7.244800, 7.399500, 7.753100, 8.383000, 8.666400, 8.898000, 8.923000, 8.798500, 8.376200, 8.425800, 8.504500, 8.518300, 8.469300, 8.291100, 8.131000, 7.950700, 7.660000, 7.699200, 7.807600, 7.811100, 7.634800, 7.652400, 7.546100, 7.124100, 6.762700, 7.161400, 7.414900, 7.553100, 7.594400, 7.665000, 7.520400, 7.304300, 7.362800, 7.611200, 7.983700, 8.013100, 8.019400, 7.968200, 7.611600, 7.425800, 7.374700, 7.616200, 7.703200, 7.610000, 7.551500, 7.448600, 7.209600, 6.827900, 6.976300, 7.191600, 7.612300, 7.880200, 8.062000, 8.107000, 7.759100, 7.494600, 7.526700, 7.620000, 7.691900, 7.558200, 7.691800, 7.636400, 7.205000, 7.086000, 7.007900, 7.162600, 7.318800, 7.335600, 7.250200, 7.065900, 6.978900, 7.136800, 7.151900, 7.475700, 7.634100, 7.648700, 7.493500, 6.959200, 6.451500, 6.487900, 6.510900, 6.653100, 7.043400, 7.394200, 7.754600, 7.703200, 7.410300, 7.146700, 7.269600, 7.877200, 8.069200, 8.319500, 8.372700, 8.352200, 8.307700, 8.167000, 8.268900, 8.733300, 8.779100, 8.880500, 8.801500, 8.827300, 8.800000, 8.616800, 8.706200, 8.986500, 9.149500, 9.233500, 9.229200, 9.080000, 9.066000, 9.058800, 9.022400, 8.949300, 8.899400, 8.837400, 8.768700, 8.738100, 8.711900, 8.698200, 8.681500, 8.647700, 8.591600, 8.525100, 8.461300, 8.394000, 8.301600, 7.954300, 7.803000, 7.859200, 7.871600, 7.855900, 7.757400, 7.503500, 7.199700, 6.883900, 6.784000, 7.133100, 7.363200, 7.520800, 7.607300, 7.641300, 7.531900, 7.289600, 7.124600, 7.394800, 7.543200, 7.588300, 7.680500, 7.765300, 7.997300, 8.308200, 8.528200, 8.785900, 9.094700, 9.228800, 9.303100, 9.296400, 9.312300, 9.184300, 8.963900, 9.371100, 9.740800, 9.908400, 9.990600, 9.950600, 9.807700, 9.603900, 9.135300, 9.412200, 9.431700, 9.358100, 9.275900, 9.095800, 9.041200, 9.022700, 8.937000, 8.822900, 8.746700, 8.704100, 8.665700, 8.645700, 8.606600, 8.478800, 8.304500, 8.331700, 8.429200, 8.499500, 8.559700, 8.613900, 8.550300, 8.372100, 8.215400, 8.358900, 8.569600, 8.614100, 8.526800, 8.328400, 8.209900, 7.905800, 7.795000, 7.866400, 7.996200, 7.879900, 7.790800, 7.661800, 7.502100, 7.315500, 7.330900, 7.755700, 7.969000, 7.949500, 7.916400, 7.898200, 7.792300, 7.689100, 8.051800, 8.490100, 8.649700, 8.715600, 8.642500, 8.539200, 8.410700, 8.359500, 8.395300, 8.646300, 8.759800, 8.628300, 8.444200, 8.192000, 7.960100, 7.736500, 7.704800, 8.107000, 8.337900, 8.490400, 8.587700, 8.605200, 8.648100, 8.454600, 7.973600, 8.375600, 8.495600, 8.470100, 8.549300, 8.541400, 8.602900, 8.665000, 8.618900, 8.462100, 8.410700, 8.377400, 8.387100, 8.421200, 8.467100, 8.464900, 8.462700, 8.500600, 8.492000, 8.521500, 8.593800, 8.621700, 8.589700, 8.514800, 8.327700, 8.396100, 8.450100, 8.406000, 8.364700, 8.348900, 8.308800, 8.243700, 8.197900, 8.184700, 8.195900, 8.177700, 8.144200, 8.104700, 8.013300, 7.867500, 7.780500, 7.802800, 7.799900, 7.795500, 7.764000, 7.749100, 7.826300, 7.868600, 7.910300, 8.022500, 8.064100, 7.958900, 7.804300, 7.659700, 7.353900, 7.035900, 6.869200, 7.060200, 7.286200, 7.246100, 7.150500, 7.052700, 6.803400, 6.592900, 6.684900, 6.949600, 7.306700, 7.510500, 7.410700, 7.393300, 7.262200, 6.944800, 6.821300, 7.061200, 7.320400, 7.574000, 7.753900, 7.768500, 7.574000, 7.179700, 6.980800, 7.189900, 7.382400, 7.434700, 7.441200, 7.430000, 7.330900, 7.047600, 6.869100, 7.259300, 7.465200, 7.488700, 7.361200, 7.349400, 7.308100, 6.988700, 6.894200, 7.209800, 7.371900, 7.535300, 7.574400, 7.441200, 7.230700, 7.071000, 6.917900, 7.162300, 7.363800, 7.426100, 7.387400, 7.433000, 7.363900, 7.226500, 7.131000, 7.356000, 7.510700, 7.599800, 7.613300, 7.634200, 7.450100, 7.273700, 7.238000, 7.580600, 7.853700, 7.884300, 7.838000, 7.633800, 7.257300, 6.981600, 6.929500, 7.188300, 7.299100, 7.291800, 7.270700, 7.265100, 7.266300, 6.979300, 7.114600, 7.561800, 7.707700, 7.731900, 7.648600, 7.581900, 7.371500, 7.234200, 7.148400, 7.316700, 7.461400, 7.666000, 7.751800, 7.583900, 7.484200, 7.250000, 6.829700, 6.986600, 7.133000, 7.123100, 7.150100, 7.084200, 7.028000, 6.890200, 6.896200, 7.408300, 7.854300, 8.143200, 8.354800, 8.459400, 8.508000, 8.495800, 8.375300, 8.385700, 8.458800, 8.559400, 8.591000, 8.632100, 8.713100, 8.732200, 8.760500, 8.820200, 8.876600, 8.918400, 8.939500, 8.917200, 8.864200, 8.800100, 8.743100, 8.683900, 8.609400, 8.530900, 8.461800, 8.420700, 8.388600, 7.728100, 7.378700, 7.732900, 7.921300, 8.010400, 7.856800, 7.221700, 6.588900, 6.174300, 6.279800, 6.613700, 6.868500, 7.099000, 7.329600, 7.613600, 7.942900, 7.734700, 8.077500, 8.352500, 8.386400, 8.242100, 7.920700, 7.746600, 7.232900, 6.507800, 6.520100, 6.904100, 7.156900, 7.213400, 7.278900, 7.341600, 7.246400, 7.142100, 7.026100, 7.463400, 7.920300, 8.244900, 8.460200, 8.619600, 8.752200, 8.788300, 8.739900, 8.789000, 8.930400, 9.053200, 9.066700, 9.024700, 8.938000, 8.664700, 8.292900, 8.152600, 8.162100, 8.205800, 8.252800, 8.209200, 7.740300, 6.999400, 6.755100, 7.108200, 7.460600, 7.510600, 7.565600, 7.514300, 7.536900, 7.276300, 7.399900, 8.095400, 8.365200, 8.384400, 8.286100, 8.260100, 8.292600, 8.311300, 8.195800, 8.165700, 8.209500, 8.247200, 8.290800, 8.283400, 8.244300, 8.191100, 8.158600, 8.104700, 8.126100, 8.144000, 7.978100, 7.840500, 7.319500, 7.096100, 6.982700, 7.057500, 7.443600, 7.408100, 7.318700, 7.253700, 7.116100, 6.944100, 7.077500, 7.299000, 7.447500, 7.442400, 7.346500, 7.222000, 7.176400, 6.851500, 6.580900, 6.904400, 7.108400, 7.135100, 7.287700, 7.327200, 7.108600, 6.860200, 6.988600, 7.383600, 7.698500, 7.888700, 7.957800, 7.921100, 7.848000, 7.796000, 7.816400, 7.902600, 8.052600, 8.265300, 8.442600, 8.541200, 8.498000, 7.410500, 6.992800, 7.149600, 7.342800, 7.446500, 7.579700, 7.738600, 7.613000, 7.200000, 7.252000, 7.759800, 8.202400, 8.451500, 8.565800, 8.648900, 8.706700, 8.767500, 8.767700, 8.727900, 8.663000, 8.670100, 8.762300, 8.935800, 9.131400, 9.231500, 9.062100, 8.956300, 8.630800, 8.262900, 8.092000, 7.912700, 7.589800, 7.087600, 7.180100, 7.534700, 7.691200, 7.510700, 7.447400, 7.252900, 6.869700, 6.692200, 7.101300, 7.619200, 7.654200, 7.824100, 7.658000, 7.604600, 7.359800, 6.698100, 7.342500, 7.547700, 7.368100, 7.098700, 7.467900, 8.042000, 8.672500, 9.167900, 9.426700, 9.468900, 9.205300, 8.829100, 8.693600, 8.642300, 8.608400, 8.553500, 8.159400, 8.019300, 8.084000, 8.172000, 8.273400, 8.378200, 8.452100, 8.479600, 8.419200, 8.483500, 8.477800, 8.444800, 8.427700, 8.450500, 8.303900, 7.469400, 7.083100, 7.406800, 7.694200, 7.851900, 7.888400, 7.844500, 7.810500, 7.567000, 7.254800, 7.425800, 7.584700, 7.632200, 7.601600, 7.574700, 7.527600, 7.504800, 7.441200, 7.521000, 7.663500, 7.725800, 7.687400, 7.656600, 7.594400, 7.370600, 6.981400, 7.268700, 7.409000, 7.425000, 7.392400, 7.371900, 7.425000, 7.295400, 7.236200, 7.624100, 8.004500, 8.319800, 8.551800, 8.743700, 8.927700, 8.969200, 8.745800, 8.668100, 8.652000, 8.675400, 8.616400, 8.540300, 8.496300, 8.480600, 8.552800, 8.678400, 8.795200, 8.863400, 8.863100, 8.753600, 8.607000, 8.146700, 8.216800, 8.355800, 8.532000, 8.671900, 8.657600, 8.101700, 7.823200, 7.688200, 7.888800, 7.951200, 7.850000, 7.786400, 7.938300, 8.253600, 8.726000, 9.209600, 9.662400, 10.026800, 10.292300, 10.400700, 10.195900, 9.990200, 9.785200, 9.463000, 8.891800, 8.939900, 9.011800, 8.882700, 8.476100, 8.257900, 8.025700, 8.283700, 8.465000, 8.626900, 8.723400, 8.650100, 8.373000, 8.200000, 8.192900, 8.087000, 7.702800, 8.205500, 8.632900, 8.926600, 9.062000, 9.074700, 9.116100, 9.269800, 9.088100, 9.119700, 9.824400, 11.075100, 12.031300, 12.224800, 12.113600, 11.914100, 11.453700, 11.162900, 10.884000, 10.577200, 10.295600, 10.239200, 10.543900, 11.000400, 11.267600, 11.508000, 11.622900, 11.800600, 12.278900, 12.837300, 13.141700, 13.218400, 13.179800, 13.092000, 12.962200, 12.782200, 12.556900, 12.306400, 11.997700, 11.294000, 10.322700, 10.269000, 10.633000, 11.461100, 12.547400, 13.160000, 13.317000, 12.935600, 11.933100, 11.551800, 11.326800, 11.106300, 10.914800, 10.879800, 10.885100, 10.831000, 10.785400, 10.903300, 10.812800, 11.642800, 12.678800, 12.009100, 11.785800, 13.200800, 14.039000, 13.779200, 13.582500, 13.892200, 14.108100, 14.162100, 13.925300, 13.344200, 12.813700, 12.720500, 12.496900, 11.960100, 11.088800, 10.462100, 10.070000, 9.910900, 9.465300, 9.628800, 9.942400, 10.409300, 11.045900, 11.546400, 11.851000, 11.719900, 11.378600, 11.535200, 11.450500, 10.781000, 10.035500, 9.597600, 9.592600, 9.016800, 8.305700, 8.224000, 8.731300, 8.858300, 8.720400, 8.579100, 8.598100, 8.550200, 8.313500, 8.873200, 9.155300, 9.009600, 8.948400, 9.011300, 9.218500, 9.310200, 9.184200, 9.300600, 9.527600, 9.762800, 10.044100, 10.272200, 10.172600, 9.639200, 9.074600, 9.091900, 9.142500, 9.128000, 9.090300, 9.059400, 8.984000, 8.488100, 7.751900, 7.733000, 7.691000, 7.818900, 8.265800, 8.861800, 9.206500, 9.657200, 10.775100, 11.293800, 11.082800, 10.820800, 10.622400, 10.470900, 10.426800, 10.358900, 9.475300, 9.259000, 9.307000, 9.141700, 9.339200, 9.305400, 9.102300, 8.585400, 8.396200, 8.776600, 9.138300, 9.268700, 9.263400, 9.342000, 9.480000, 9.660100, 9.610600, 9.583400, 9.623300, 9.685900, 9.776600, 9.940300, 10.307900, 10.756500, 10.986500, 11.014800, 10.958900, 10.853700, 10.710500, 10.602000, 10.599000, 10.343200, 9.303100, 8.898200, 8.843300, 8.766800, 8.832400, 8.844900, 8.701100, 8.576100, 8.494100, 8.600000, 8.714300, 8.794200, 8.784000, 8.744700, 8.648800, 8.419700, 8.035900, 8.118200, 8.259100, 8.185700, 7.910600, 7.975900, 7.971400, 7.506300, 7.460900, 8.083900, 8.423600, 8.508500, 8.436100, 8.415700, 8.347700, 7.856500, 7.450000, 7.993100, 8.270100, 8.709200, 9.451200, 10.022700, 10.277700, 10.366600, 10.392700, 10.397500, 10.421900, 10.500200, 10.679300, 11.006900, 11.499800, 12.048600, 12.410400, 12.614200, 12.749700, 12.738300, 12.650900, 12.468400, 11.874000, 10.947100, 9.927300, 9.693800, 10.049200, 10.285600, 10.330500, 10.370300, 10.519800, 10.663300, 10.658400, 10.496700, 9.722000, 8.224800, 8.129900, 8.573400, 10.278100, 12.091900, 12.126300, 11.480500, 9.833800, 8.235500, 8.964500, 9.830800, 10.369200, 11.476500, 12.825200, 13.424000, 13.500900, 13.595300, 13.641200, 13.687600, 13.752400, 13.817700, 13.757800, 13.546400, 13.253600, 12.931800, 12.650900, 12.413000, 12.158600, 11.886900, 11.624800, 11.398500, 11.227500, 11.053300, 10.809700, 10.542600, 10.318500, 10.038600, 8.574700, 8.156300, 7.699500, 7.692000, 7.669500, 8.096200, 9.176000, 10.236500, 11.130800, 12.205500, 12.892700, 12.854400, 12.405200, 11.864000, 11.367900, 10.950300, 10.602000, 10.304800, 10.051100, 9.862200, 9.781200, 9.782600, 9.798900, 9.169400, 8.460700, 8.467500, 8.084800, 8.193100, 8.804800, 9.348700, 9.561600, 9.629900, 9.595100, 9.700300, 9.762300, 9.681300, 9.506300, 9.341700, 9.413600, 10.452700, 12.270400, 14.815700, 17.147300, 17.781600, 17.645700, 17.353900, 17.006700, 16.596500, 16.181500, 15.754700, 15.330800, 14.950400, 14.592500, 14.252800, 13.934700, 13.626900, 13.326200, 13.040300, 12.767700, 12.492300, 12.239700, 11.975900, 11.684400, 11.575000, 11.604400, 11.642700, 11.608200, 11.508100, 11.401800, 11.388900, 11.596600, 11.872500, 11.999300, 11.966500, 11.818400, 11.633700, 11.492900, 11.378500, 11.218900, 10.920300, 9.899800, 8.824100, 8.035600, 8.617800, 9.392500, 9.666900, 9.737300, 9.818800, 10.026900, 10.337400, 10.644400, 10.888100, 11.103000, 11.320800, 11.522800, 11.657500, 11.698600, 11.704200, 11.716300, 11.665600, 11.523400, 11.355400, 10.690800, 8.665900, 9.416200, 9.697900, 9.734200, 10.242700, 11.211100, 12.231400, 13.195400, 13.637400, 13.605700, 13.278600, 12.932600, 12.685800, 12.359100, 12.020000, 11.776000, 11.486500, 11.072000, 10.655100, 10.313300, 10.028500, 9.889300, 10.270200, 11.186600, 11.620800, 11.937500, 12.407700, 12.701700, 12.655900, 12.257300, 11.800600, 11.181100, 10.698700, 10.335300, 10.623500, 10.983700, 10.904100, 10.342700, 10.024500, 9.815000, 9.236000, 8.826100, 8.872300, 9.127100, 9.114400, 9.378900, 9.387600, 9.281900, 9.034500, 8.679600, 8.785500, 8.977800, 8.998900, 9.339800, 9.548000, 9.535000, 9.439800, 9.605900, 10.079600, 10.705300, 11.117600, 11.311800, 11.361200, 11.248100, 11.050500, 10.815100, 10.588800, 10.343100, 9.799600, 9.643900, 9.801600, 10.205000, 10.441100, 10.612300, 10.689000, 10.693700, 10.739600, 11.010300, 11.404900, 11.599300, 11.556000, 11.406500, 11.234000, 10.965300, 10.556900, 9.922500, 9.438400, 8.952400, 8.377600, 8.746500, 9.298600, 9.795800, 10.188200, 10.412200, 10.402100, 10.440600, 10.319400, 10.150900, 9.938300, 9.522000, 9.032300, 9.137400, 9.354800, 9.521000, 9.589700, 9.518900, 8.502600, 7.976000, 8.105700, 8.062900, 8.650600, 9.344100, 9.947600, 10.260600, 10.248200, 10.013300, 9.743100, 9.552800, 9.377900, 9.202600, 9.003800, 8.768500, 8.553100, 8.379800, 8.230200, 8.107800, 8.009200, 7.694700, 7.597200, 7.658100, 7.754200, 7.858100, 7.945700, 7.767800, 7.412100, 7.159100, 7.111800, 7.400200, 7.798500, 8.528500, 9.388200, 9.641200, 9.789200, 10.151600, 10.514500, 10.736400, 10.786600, 10.706900, 10.665200, 10.629000, 10.648000, 10.615200, 10.584500, 10.584000, 10.563600, 10.487200, 10.357500, 10.192800, 10.001000, 9.803700, 9.610600, 9.393900, 8.923900, 7.748000, 7.273700, 7.111500, 7.422600, 8.030500, 8.580600, 8.571900, 9.036100, 8.895700, 9.200200, 9.278100, 9.594000, 10.085500, 10.479700, 10.729100, 10.800500, 10.850600, 11.033700, 11.284500, 11.466000, 11.483000, 11.482200, 11.380700, 11.207600, 11.006500, 10.805500, 10.611200, 10.289400, 9.963100, 9.776800, 9.695200, 9.660800, 9.596800, 9.450900, 9.232200, 9.100400, 9.585500, 10.780100, 10.620800, 10.577800, 10.713600, 10.526500, 10.249700, 9.992100, 9.667100, 9.406400, 9.270000, 9.279300, 9.208800, 8.954600, 8.131300, 8.016500, 7.792700, 8.190300, 8.096800, 8.150200, 8.297600, 9.012800, 9.950900, 10.248900, 9.967400, 9.671700, 9.611200, 10.098200, 10.007600, 9.964400, 10.646600, 11.393300, 11.908800, 12.591000, 13.255400, 13.524200, 13.392500, 13.028700, 12.568000, 12.102700, 11.707600, 11.395200, 10.697700, 9.872200, 9.384200, 9.637500, 9.787000, 9.869500, 9.947500, 9.940300, 9.886500, 9.862000, 9.805600, 9.702200, 9.572500, 9.281200, 8.391600, 8.228000, 8.332700, 8.620100, 8.936200, 9.125400, 9.297500, 9.586900, 9.884000, 10.150400, 10.341600, 10.558000, 10.609000, 10.495200, 10.314500, 10.084000, 9.748600, 9.336900, 8.903400, 8.237600, 8.198300, 8.221400, 8.133700, 9.105200, 10.236700, 10.878600, 11.064900, 10.988700, 10.949300, 10.948100, 10.889400, 10.810300, 10.708900, 10.581400, 10.452200, 10.334700, 10.237300, 10.154100, 10.067200, 9.961900, 9.825700, 9.692300, 9.610400, 9.583700, 9.588700, 9.623900, 9.785600, 10.040700, 10.045200, 9.999300, 10.103900, 9.913800, 8.184900, 7.999200, 8.099700, 8.615800, 8.855400, 9.367400, 9.141100, 8.742700, 8.566900, 9.125100, 8.847100, 9.022400, 8.345300, 8.317100, 9.261900, 9.615600, 9.562600, 9.977800, 10.197500, 10.093200, 9.893400, 9.769500, 10.179900, 10.501500, 10.321200, 9.866900, 9.152100, 8.441600, 8.104300, 8.300000, 8.302700, 8.902300, 9.228400, 9.353500, 9.457000, 9.521800, 9.517400, 9.446700, 9.325400, 9.181800, 9.066500, 8.989300, 8.924100, 8.596000, 8.408100, 8.207100, 7.987900, 8.584300, 8.498300, 8.518100, 8.300900, 8.515700, 8.395000, 9.343500, 9.653500, 10.150000, 10.225500, 10.576500, 11.319200, 10.816200, 10.153100, 10.447500, 10.828500, 10.932400, 10.217500, 9.641200, 8.729100, 8.499200, 9.354600, 9.959600, 10.315600, 10.717400, 11.053900, 11.228900, 11.260200, 11.176700, 11.011500, 10.811200, 10.591400, 10.186400, 9.644800, 9.046000, 8.627500, 8.509100, 8.495500, 8.066500, 7.252600, 7.820500, 8.130800, 8.501000, 8.483300, 8.533000, 9.131300, 9.594200, 9.771400, 10.288000, 10.468000, 10.506900, 10.452300, 10.462000, 10.528100, 10.546400, 10.465400, 10.245600, 10.021000, 9.948800, 10.048600, 10.269800, 10.567300, 10.900400],
-			"financial_cost_total": 3.28096e+07,
+			"financial_cost_total": 3.26032e+07,
 			"fixed_charge_rate": 0.108,
 			"loss_additional": 0,
 			"loss_array_spacing": 0,
diff --git a/api/api_autogen/library/defaults/MhkWave_MEwaveSingleOwner.json b/api/api_autogen/library/defaults/MhkWave_MEwaveSingleOwner.json
index 6746679ad9..d0abe907ef 100644
--- a/api/api_autogen/library/defaults/MhkWave_MEwaveSingleOwner.json
+++ b/api/api_autogen/library/defaults/MhkWave_MEwaveSingleOwner.json
@@ -1,11 +1,11 @@
 {
 	"defaults": {
 		"MHKWave": {
-			"balance_of_system_cost_total": 7.91507e+07,
+			"balance_of_system_cost_total": 7.67951e+07,
 			"device_costs_total": 2.95244e+08,
 			"device_rated_power": 286,
 			"energy_period": [9.014900, 9.280300, 8.887900, 8.869400, 9.339900, 9.750500, 10.629600, 12.332300, 13.610500, 13.701300, 13.432600, 13.104500, 12.777200, 12.455900, 12.125500, 11.790900, 11.434900, 11.095400, 10.801300, 10.508500, 10.213000, 9.962600, 9.796400, 9.708500, 9.623300, 9.524800, 9.484100, 9.515300, 9.704800, 9.834900, 9.990300, 9.906900, 9.755800, 9.685300, 9.636800, 9.550000, 9.422400, 9.275200, 9.118800, 8.979300, 8.762600, 8.547800, 8.596600, 8.732100, 9.149600, 9.697200, 10.222800, 10.504600, 10.600600, 10.655500, 10.772800, 11.085700, 11.738200, 12.693600, 13.554900, 14.027200, 14.175700, 13.921500, 13.223400, 12.986700, 13.005900, 12.996800, 12.676200, 12.114400, 11.957200, 11.828100, 11.886700, 12.074900, 12.292300, 12.653600, 13.291700, 13.991800, 14.414400, 14.498100, 14.382700, 14.082100, 13.743300, 13.320100, 12.820700, 12.238300, 11.392600, 10.526300, 10.200800, 10.609200, 11.455700, 11.425800, 11.209500, 10.840800, 10.219900, 10.410600, 10.597100, 10.794800, 12.062400, 13.242800, 13.663400, 14.154200, 14.342000, 14.358900, 12.850700, 13.289700, 13.747000, 13.693500, 13.546500, 13.370700, 13.191200, 13.021300, 12.853000, 12.695300, 12.532100, 12.344100, 12.121800, 11.854000, 11.568700, 11.439900, 11.569400, 11.656800, 11.436000, 10.938500, 10.273500, 10.154600, 10.335500, 10.831200, 11.120000, 10.944800, 10.886100, 10.776500, 10.606200, 10.349200, 9.957100, 10.210500, 10.496400, 10.488200, 10.207300, 9.739600, 9.083000, 9.613800, 11.267400, 12.925500, 13.718000, 14.393300, 14.954200, 14.940700, 14.535000, 14.056200, 12.323100, 11.990700, 14.087800, 15.033900, 13.530900, 13.348000, 13.449000, 13.331000, 13.222500, 14.238100, 14.771900, 14.752900, 14.531100, 13.957400, 13.508600, 13.153800, 12.392000, 11.809200, 12.478100, 12.539800, 12.200000, 12.160300, 12.099100, 12.008300, 11.891000, 11.781600, 11.735200, 11.756700, 11.854300, 12.097400, 12.619400, 13.290100, 13.695200, 13.738600, 13.531100, 13.214300, 12.832300, 12.430400, 12.019200, 11.685300, 11.511000, 11.368400, 11.146700, 10.326500, 8.984500, 8.062300, 8.356200, 8.262400, 8.963800, 9.893600, 10.203600, 10.953600, 13.924200, 15.038000, 14.945800, 14.510200, 13.965100, 13.403600, 12.924400, 12.533200, 12.179100, 11.879800, 11.606000, 11.384000, 11.194300, 10.987500, 10.801100, 10.616800, 10.501200, 10.462500, 10.478400, 10.512000, 10.530200, 10.512700, 10.430800, 10.278600, 10.169100, 10.346500, 10.938600, 11.465400, 11.132100, 11.193800, 11.689100, 12.336800, 12.813300, 12.955200, 12.811400, 12.714300, 12.832400, 12.934900, 12.934000, 12.890000, 12.878800, 12.880000, 12.806800, 12.645300, 12.423200, 12.180300, 11.914100, 11.618100, 11.320600, 11.022300, 10.699400, 10.372600, 10.059200, 9.535500, 8.424900, 7.949900, 7.823700, 8.038600, 8.198700, 8.544500, 8.871000, 9.743400, 10.936300, 11.942700, 12.431400, 12.495200, 12.299800, 11.956400, 11.328200, 10.620100, 10.091600, 9.880300, 9.867000, 9.789500, 9.716500, 9.688800, 9.676900, 9.914600, 10.133200, 9.954800, 9.197500, 8.745800, 8.103400, 7.863100, 8.186400, 9.840100, 10.962000, 11.285600, 11.487600, 11.509900, 11.100400, 10.520400, 9.434400, 9.771600, 10.122500, 10.265400, 11.102700, 11.751200, 12.094800, 12.496900, 12.929600, 13.198500, 13.584200, 13.852900, 13.749100, 13.518800, 13.407800, 13.326300, 13.019600, 12.432600, 11.996700, 11.777700, 11.654200, 11.474800, 11.277500, 11.195000, 11.152200, 11.017900, 10.785100, 10.499300, 10.191000, 9.686700, 9.546600, 9.666500, 9.529100, 9.515900, 9.696100, 9.833000, 9.900800, 9.917500, 9.914000, 9.872900, 9.639200, 9.040900, 9.181900, 9.877800, 10.081200, 10.086100, 9.883500, 9.435300, 9.620700, 11.131100, 12.743500, 13.492800, 13.687400, 13.706300, 13.180800, 12.813900, 12.999900, 13.558900, 14.492300, 15.161500, 15.386400, 15.220700, 14.818700, 14.162800, 13.215400, 13.015800, 13.685800, 14.746800, 15.117600, 14.976000, 14.717000, 14.475000, 14.246400, 14.001400, 13.788000, 13.596000, 13.391400, 13.173600, 12.938600, 12.688000, 12.445800, 12.161800, 11.692700, 11.394900, 11.343700, 11.432100, 11.455600, 11.461300, 11.528600, 11.610400, 11.597400, 11.481200, 11.327300, 11.165900, 10.991300, 10.839500, 10.691900, 10.556100, 10.546000, 10.768500, 11.183500, 11.565400, 11.739200, 11.699500, 11.557800, 11.431200, 11.378000, 11.347000, 11.580600, 12.117400, 12.555200, 12.686400, 12.583900, 12.437500, 12.293900, 12.109900, 11.874600, 11.613200, 11.345400, 11.072700, 10.795200, 10.536000, 10.350400, 10.285300, 10.428700, 10.886200, 11.663200, 12.341200, 12.591700, 12.659300, 12.623200, 12.493200, 12.371800, 12.292700, 12.188600, 11.997700, 11.676200, 11.206600, 10.471700, 10.188800, 10.141000, 10.110600, 10.441700, 9.100100, 10.078800, 10.768600, 12.339500, 13.521400, 13.682400, 13.526000, 13.257900, 12.948200, 12.631100, 12.294100, 11.985200, 11.713400, 11.408700, 11.083700, 10.828600, 10.606000, 9.775000, 8.724600, 8.648600, 7.976600, 8.404400, 8.586200, 8.524800, 8.584600, 8.890700, 9.421300, 10.207600, 10.647600, 11.170600, 12.469700, 13.883800, 14.206600, 13.967500, 13.546700, 13.126100, 12.695100, 12.312400, 11.981200, 11.721500, 11.430800, 11.131300, 10.802100, 10.464100, 10.181400, 10.333500, 11.587200, 12.764800, 12.405200, 12.406800, 12.806300, 13.516000, 14.055000, 14.416000, 15.071200, 15.055100, 14.700700, 14.074000, 13.134600, 11.240900, 11.219400, 11.267500, 11.402600, 11.697700, 12.009300, 12.203300, 12.106900, 11.815200, 11.467900, 11.146800, 10.896300, 10.710400, 10.575700, 10.548100, 10.831000, 11.499000, 12.526300, 13.402300, 13.824000, 13.921000, 13.540700, 13.086300, 12.775900, 12.547500, 12.353100, 12.096800, 11.823500, 11.522400, 11.309000, 11.173800, 11.016700, 10.756200, 10.536600, 10.649900, 11.332400, 11.921400, 12.634500, 13.240100, 13.653300, 13.559800, 12.149500, 11.124400, 11.206700, 11.201400, 11.100200, 10.713300, 9.959900, 10.178400, 10.426800, 10.684400, 10.908700, 11.049700, 11.115400, 11.032700, 9.758800, 11.181800, 12.545400, 13.093200, 13.125800, 13.038400, 12.957800, 12.865800, 12.748900, 12.597300, 12.376100, 12.062900, 11.231600, 10.684000, 10.756600, 11.693300, 13.093300, 13.454100, 13.208000, 12.698700, 12.313400, 12.924100, 12.883000, 12.561100, 12.136300, 11.821600, 11.663400, 11.742900, 11.951800, 12.163600, 12.251400, 12.177300, 11.966100, 11.684000, 11.342300, 10.967600, 10.713000, 10.881900, 11.241000, 11.438800, 11.575900, 11.651000, 11.641200, 11.641300, 11.783500, 12.196600, 12.835100, 13.464200, 13.928300, 14.184400, 14.137800, 13.347900, 12.878100, 12.846900, 12.911400, 13.053900, 13.627800, 13.663100, 13.450900, 13.159900, 12.860300, 12.462900, 11.718300, 10.795400, 10.363700, 10.359500, 10.261900, 10.078200, 9.837600, 9.633400, 9.362500, 8.872800, 8.726100, 8.692800, 8.658700, 8.603000, 8.589600, 8.740600, 9.136800, 9.670000, 10.193800, 10.718000, 11.198200, 11.575800, 11.513400, 10.794200, 9.416600, 9.822800, 9.858600, 9.631800, 9.982900, 10.820900, 11.125700, 11.076000, 10.952500, 10.828900, 10.669300, 10.464400, 10.334200, 10.298600, 9.703700, 9.265800, 8.980400, 8.560600, 8.594800, 9.043300, 9.364300, 9.567100, 9.701700, 9.740600, 9.743000, 9.818100, 10.452000, 11.335400, 12.136300, 12.759900, 13.212400, 13.382400, 12.123600, 10.240200, 10.112100, 10.851900, 11.005400, 10.633000, 10.075600, 9.877500, 10.252100, 10.941200, 11.160300, 11.061800, 10.871700, 10.633700, 10.389400, 10.149700, 9.909300, 9.695700, 9.508900, 9.319700, 9.216800, 9.225400, 9.278600, 9.395900, 9.255700, 8.474600, 9.239200, 10.730200, 11.787300, 12.468900, 12.746000, 12.715200, 12.479800, 12.100900, 11.709500, 11.139700, 10.725200, 10.145200, 10.817100, 11.183500, 11.576900, 11.944200, 11.987500, 12.045200, 12.516700, 12.560800, 13.215300, 13.780000, 14.142600, 14.307600, 14.300300, 14.266400, 14.269500, 14.249800, 14.176000, 14.070600, 13.959200, 13.839100, 13.678100, 13.478700, 13.290200, 13.116300, 12.971800, 12.824600, 12.669300, 12.503800, 12.298500, 12.036900, 11.707600, 10.035900, 8.492800, 8.858800, 9.360900, 10.406200, 11.635300, 12.560700, 13.382200, 13.855400, 14.066000, 14.197500, 14.236100, 14.106500, 13.868000, 13.588800, 13.137600, 11.622000, 10.871800, 10.580600, 11.353700, 11.827500, 12.078800, 12.276000, 12.879000, 13.208200, 13.023700, 12.699800, 12.343400, 11.910300, 11.507300, 11.572200, 11.510600, 11.378700, 11.247600, 11.139100, 11.041100, 10.957000, 10.895300, 10.888100, 10.926800, 11.013000, 11.126300, 11.170300, 11.067600, 10.581200, 10.428700, 10.508000, 10.736700, 10.054600, 8.861800, 9.214500, 9.049800, 8.816000, 8.831300, 8.988800, 9.203800, 9.255000, 9.164000, 9.089600, 8.819200, 8.935800, 9.434400, 10.025700, 10.265700, 10.310000, 10.314600, 10.271100, 9.935100, 8.983200, 9.124100, 10.403100, 11.211300, 11.506900, 11.836200, 11.910300, 12.340400, 12.527800, 12.432600, 12.157600, 11.773000, 11.440600, 11.190200, 11.028900, 10.952200, 10.822400, 10.212900, 9.315000, 9.092600, 9.044700, 9.137100, 9.240200, 9.386900, 9.754100, 10.002600, 10.000100, 10.132500, 10.411400, 10.502800, 10.453000, 10.438200, 10.461500, 10.441700, 10.372900, 10.278700, 10.196600, 10.165800, 10.198100, 10.275000, 10.068600, 10.025400, 10.481100, 11.019200, 11.361500, 11.545700, 11.421500, 10.704600, 9.075400, 9.143300, 9.306600, 9.191800, 9.123200, 9.336800, 9.358400, 9.482300, 9.457300, 9.551800, 9.584800, 9.641800, 9.717100, 9.764200, 9.769600, 9.624400, 9.362000, 9.468400, 9.527700, 9.533700, 9.625000, 9.960300, 9.887800, 8.996400, 8.631300, 9.318800, 10.120200, 10.735100, 11.205100, 11.623400, 12.037500, 12.318300, 11.310500, 10.638700, 10.560400, 10.751500, 10.659800, 10.424900, 10.143800, 9.882900, 9.194500, 9.317300, 9.229000, 9.206100, 8.907900, 8.474800, 8.206700, 7.714300, 7.930700, 8.421200, 9.048700, 9.564700, 10.142200, 10.736900, 10.991300, 10.460600, 10.108400, 10.588300, 11.049200, 11.267800, 10.826600, 9.962900, 9.618500, 10.285100, 11.306400, 11.754400, 11.866600, 11.748400, 11.536100, 11.341600, 11.121900, 10.843600, 10.396500, 10.096700, 9.893000, 9.688700, 9.532400, 9.626500, 9.051200, 9.056800, 9.832300, 10.043100, 9.673800, 10.146100, 9.838400, 9.832200, 9.788700, 9.689100, 9.770000, 9.975400, 10.168500, 10.314400, 10.396100, 10.490200, 10.568700, 10.570700, 10.655300, 10.809300, 10.950900, 11.079900, 11.098500, 10.972700, 10.760100, 10.424100, 9.964500, 9.577400, 9.456200, 9.405500, 9.358100, 9.418700, 9.095100, 8.572200, 8.298300, 8.207200, 8.445300, 8.702900, 8.965300, 9.173400, 9.208100, 8.116100, 7.496700, 7.621800, 7.839400, 7.888400, 8.154000, 8.182700, 7.954800, 7.631800, 7.747400, 8.047300, 8.430100, 8.706200, 8.876600, 8.921500, 8.877800, 8.672100, 8.222300, 7.504100, 7.680800, 7.731200, 7.947300, 8.024600, 7.919200, 7.553800, 7.491900, 7.765200, 7.853800, 7.876700, 7.826300, 7.874400, 7.707600, 7.324300, 7.163600, 7.290300, 7.430000, 7.675400, 7.818000, 7.867700, 7.914400, 7.721800, 7.175700, 7.377600, 7.679900, 7.894200, 8.073700, 8.188800, 8.311900, 8.269800, 8.051100, 8.296500, 8.462500, 8.533700, 8.528500, 8.465700, 8.370400, 8.209600, 8.152300, 8.192400, 8.179400, 8.119700, 8.052300, 7.957800, 7.805800, 7.663500, 7.327500, 7.422200, 7.555600, 7.618800, 6.802500, 6.028800, 7.648300, 8.737200, 9.290400, 9.646700, 9.756300, 9.681300, 9.503300, 9.201100, 8.216500, 7.456400, 7.191200, 7.267600, 7.364900, 7.490900, 7.486400, 7.218800, 6.743900, 6.690000, 6.748400, 7.123500, 7.467400, 7.723800, 8.076200, 8.469300, 8.534000, 8.150900, 7.935600, 8.140100, 8.272700, 8.319600, 8.282600, 8.174200, 8.093300, 7.861000, 7.761400, 7.849100, 7.945100, 8.000800, 7.995600, 7.944300, 7.908600, 7.663700, 7.517500, 7.684400, 7.773800, 7.752400, 7.698600, 7.668200, 7.749800, 7.664600, 7.684100, 7.995100, 8.222100, 8.390700, 8.532400, 8.492500, 8.202600, 7.687900, 7.385600, 7.402500, 7.290300, 7.540600, 7.951900, 8.268700, 8.350800, 8.242500, 7.961900, 8.054400, 8.207900, 8.400700, 8.543500, 7.746600, 7.009700, 7.969600, 8.927300, 9.699100, 10.485700, 10.717600, 10.721800, 10.733600, 10.740000, 10.679400, 10.574000, 10.407600, 10.216400, 10.019600, 9.853900, 9.608100, 9.115700, 8.810200, 8.802900, 9.029600, 9.201100, 9.275100, 9.359200, 9.421600, 9.402500, 9.321400, 9.244500, 9.161000, 8.980700, 8.697500, 8.651700, 8.717600, 8.599500, 8.322600, 7.858500, 8.094800, 8.234400, 8.348500, 8.424500, 8.440100, 8.327800, 7.890600, 7.541900, 7.578800, 8.035400, 9.291500, 10.662400, 11.201600, 11.182000, 10.590000, 10.053800, 10.071900, 10.128200, 10.020200, 9.690900, 9.614600, 9.782100, 9.955300, 9.953200, 9.868700, 9.818300, 9.751600, 9.627400, 9.492300, 9.363400, 9.268300, 9.208800, 9.153800, 9.080500, 8.988800, 8.906900, 8.862600, 8.442400, 7.740000, 7.179300, 7.164300, 7.222300, 7.193000, 7.133900, 6.980700, 6.502500, 6.045300, 6.115200, 6.486700, 6.706100, 6.729500, 6.809500, 7.085700, 7.032100, 7.185900, 7.660300, 8.281300, 8.715200, 8.930700, 8.988500, 8.962500, 9.000000, 9.084300, 9.220400, 9.369200, 9.473800, 9.488100, 9.533700, 9.553900, 9.499000, 9.343600, 8.851700, 8.708700, 8.778500, 8.722600, 8.314600, 7.950500, 7.864100, 8.019200, 8.534500, 8.928700, 9.288600, 9.566000, 9.747300, 9.826000, 9.819300, 9.767700, 9.689900, 8.906700, 8.120300, 7.888500, 8.497700, 9.431300, 9.846600, 9.899200, 9.917300, 9.931900, 9.900200, 9.839500, 9.788900, 9.755000, 9.759700, 9.801800, 9.844400, 9.863000, 9.848100, 9.804800, 9.737100, 9.464800, 9.049300, 8.941900, 8.845000, 8.683000, 8.373000, 7.829400, 7.510000, 7.488500, 7.322400, 7.164900, 7.208200, 7.455600, 7.730200, 7.914400, 7.934900, 7.861400, 7.776700, 7.657000, 7.641400, 7.666400, 7.456300, 6.890500, 6.820000, 7.145200, 7.708700, 8.643400, 9.490100, 9.728100, 9.471000, 8.990100, 8.576700, 8.190600, 7.947100, 7.393400, 7.104200, 7.158200, 7.200700, 7.270700, 7.198200, 7.109400, 7.081500, 6.951800, 7.170700, 7.672200, 7.996600, 8.098300, 8.160300, 8.074300, 7.885200, 7.144000, 7.448100, 7.721800, 8.041400, 8.293800, 8.355100, 8.579400, 8.685300, 8.923100, 8.878000, 9.632300, 9.873200, 9.832200, 9.807200, 9.580200, 9.139600, 8.729700, 8.678600, 8.897600, 8.864800, 8.918500, 8.688400, 8.238900, 7.837000, 7.708200, 7.780100, 8.053800, 7.971800, 7.923700, 7.832700, 7.654900, 7.247700, 7.022100, 7.046700, 7.366300, 7.748800, 8.130200, 8.492800, 8.559600, 8.184900, 8.106300, 8.123700, 8.419700, 8.636800, 8.624100, 8.629800, 8.410700, 8.114200, 8.006000, 7.765900, 7.874100, 8.026300, 7.989100, 7.937200, 7.859400, 7.594700, 6.931400, 6.761700, 6.822800, 7.128200, 7.362900, 7.692400, 7.904000, 7.612500, 7.024300, 6.917400, 7.080200, 7.355200, 7.445000, 7.513700, 7.534900, 7.118300, 6.701600, 6.836700, 7.158200, 7.434000, 7.607200, 7.677800, 7.699600, 7.558400, 7.332300, 7.244800, 7.399500, 7.753100, 8.383000, 8.666400, 8.898000, 8.923000, 8.798500, 8.376200, 8.425800, 8.504500, 8.518300, 8.469300, 8.291100, 8.131000, 7.950700, 7.660000, 7.699200, 7.807600, 7.811100, 7.634800, 7.652400, 7.546100, 7.124100, 6.762700, 7.161400, 7.414900, 7.553100, 7.594400, 7.665000, 7.520400, 7.304300, 7.362800, 7.611200, 7.983700, 8.013100, 8.019400, 7.968200, 7.611600, 7.425800, 7.374700, 7.616200, 7.703200, 7.610000, 7.551500, 7.448600, 7.209600, 6.827900, 6.976300, 7.191600, 7.612300, 7.880200, 8.062000, 8.107000, 7.759100, 7.494600, 7.526700, 7.620000, 7.691900, 7.558200, 7.691800, 7.636400, 7.205000, 7.086000, 7.007900, 7.162600, 7.318800, 7.335600, 7.250200, 7.065900, 6.978900, 7.136800, 7.151900, 7.475700, 7.634100, 7.648700, 7.493500, 6.959200, 6.451500, 6.487900, 6.510900, 6.653100, 7.043400, 7.394200, 7.754600, 7.703200, 7.410300, 7.146700, 7.269600, 7.877200, 8.069200, 8.319500, 8.372700, 8.352200, 8.307700, 8.167000, 8.268900, 8.733300, 8.779100, 8.880500, 8.801500, 8.827300, 8.800000, 8.616800, 8.706200, 8.986500, 9.149500, 9.233500, 9.229200, 9.080000, 9.066000, 9.058800, 9.022400, 8.949300, 8.899400, 8.837400, 8.768700, 8.738100, 8.711900, 8.698200, 8.681500, 8.647700, 8.591600, 8.525100, 8.461300, 8.394000, 8.301600, 7.954300, 7.803000, 7.859200, 7.871600, 7.855900, 7.757400, 7.503500, 7.199700, 6.883900, 6.784000, 7.133100, 7.363200, 7.520800, 7.607300, 7.641300, 7.531900, 7.289600, 7.124600, 7.394800, 7.543200, 7.588300, 7.680500, 7.765300, 7.997300, 8.308200, 8.528200, 8.785900, 9.094700, 9.228800, 9.303100, 9.296400, 9.312300, 9.184300, 8.963900, 9.371100, 9.740800, 9.908400, 9.990600, 9.950600, 9.807700, 9.603900, 9.135300, 9.412200, 9.431700, 9.358100, 9.275900, 9.095800, 9.041200, 9.022700, 8.937000, 8.822900, 8.746700, 8.704100, 8.665700, 8.645700, 8.606600, 8.478800, 8.304500, 8.331700, 8.429200, 8.499500, 8.559700, 8.613900, 8.550300, 8.372100, 8.215400, 8.358900, 8.569600, 8.614100, 8.526800, 8.328400, 8.209900, 7.905800, 7.795000, 7.866400, 7.996200, 7.879900, 7.790800, 7.661800, 7.502100, 7.315500, 7.330900, 7.755700, 7.969000, 7.949500, 7.916400, 7.898200, 7.792300, 7.689100, 8.051800, 8.490100, 8.649700, 8.715600, 8.642500, 8.539200, 8.410700, 8.359500, 8.395300, 8.646300, 8.759800, 8.628300, 8.444200, 8.192000, 7.960100, 7.736500, 7.704800, 8.107000, 8.337900, 8.490400, 8.587700, 8.605200, 8.648100, 8.454600, 7.973600, 8.375600, 8.495600, 8.470100, 8.549300, 8.541400, 8.602900, 8.665000, 8.618900, 8.462100, 8.410700, 8.377400, 8.387100, 8.421200, 8.467100, 8.464900, 8.462700, 8.500600, 8.492000, 8.521500, 8.593800, 8.621700, 8.589700, 8.514800, 8.327700, 8.396100, 8.450100, 8.406000, 8.364700, 8.348900, 8.308800, 8.243700, 8.197900, 8.184700, 8.195900, 8.177700, 8.144200, 8.104700, 8.013300, 7.867500, 7.780500, 7.802800, 7.799900, 7.795500, 7.764000, 7.749100, 7.826300, 7.868600, 7.910300, 8.022500, 8.064100, 7.958900, 7.804300, 7.659700, 7.353900, 7.035900, 6.869200, 7.060200, 7.286200, 7.246100, 7.150500, 7.052700, 6.803400, 6.592900, 6.684900, 6.949600, 7.306700, 7.510500, 7.410700, 7.393300, 7.262200, 6.944800, 6.821300, 7.061200, 7.320400, 7.574000, 7.753900, 7.768500, 7.574000, 7.179700, 6.980800, 7.189900, 7.382400, 7.434700, 7.441200, 7.430000, 7.330900, 7.047600, 6.869100, 7.259300, 7.465200, 7.488700, 7.361200, 7.349400, 7.308100, 6.988700, 6.894200, 7.209800, 7.371900, 7.535300, 7.574400, 7.441200, 7.230700, 7.071000, 6.917900, 7.162300, 7.363800, 7.426100, 7.387400, 7.433000, 7.363900, 7.226500, 7.131000, 7.356000, 7.510700, 7.599800, 7.613300, 7.634200, 7.450100, 7.273700, 7.238000, 7.580600, 7.853700, 7.884300, 7.838000, 7.633800, 7.257300, 6.981600, 6.929500, 7.188300, 7.299100, 7.291800, 7.270700, 7.265100, 7.266300, 6.979300, 7.114600, 7.561800, 7.707700, 7.731900, 7.648600, 7.581900, 7.371500, 7.234200, 7.148400, 7.316700, 7.461400, 7.666000, 7.751800, 7.583900, 7.484200, 7.250000, 6.829700, 6.986600, 7.133000, 7.123100, 7.150100, 7.084200, 7.028000, 6.890200, 6.896200, 7.408300, 7.854300, 8.143200, 8.354800, 8.459400, 8.508000, 8.495800, 8.375300, 8.385700, 8.458800, 8.559400, 8.591000, 8.632100, 8.713100, 8.732200, 8.760500, 8.820200, 8.876600, 8.918400, 8.939500, 8.917200, 8.864200, 8.800100, 8.743100, 8.683900, 8.609400, 8.530900, 8.461800, 8.420700, 8.388600, 7.728100, 7.378700, 7.732900, 7.921300, 8.010400, 7.856800, 7.221700, 6.588900, 6.174300, 6.279800, 6.613700, 6.868500, 7.099000, 7.329600, 7.613600, 7.942900, 7.734700, 8.077500, 8.352500, 8.386400, 8.242100, 7.920700, 7.746600, 7.232900, 6.507800, 6.520100, 6.904100, 7.156900, 7.213400, 7.278900, 7.341600, 7.246400, 7.142100, 7.026100, 7.463400, 7.920300, 8.244900, 8.460200, 8.619600, 8.752200, 8.788300, 8.739900, 8.789000, 8.930400, 9.053200, 9.066700, 9.024700, 8.938000, 8.664700, 8.292900, 8.152600, 8.162100, 8.205800, 8.252800, 8.209200, 7.740300, 6.999400, 6.755100, 7.108200, 7.460600, 7.510600, 7.565600, 7.514300, 7.536900, 7.276300, 7.399900, 8.095400, 8.365200, 8.384400, 8.286100, 8.260100, 8.292600, 8.311300, 8.195800, 8.165700, 8.209500, 8.247200, 8.290800, 8.283400, 8.244300, 8.191100, 8.158600, 8.104700, 8.126100, 8.144000, 7.978100, 7.840500, 7.319500, 7.096100, 6.982700, 7.057500, 7.443600, 7.408100, 7.318700, 7.253700, 7.116100, 6.944100, 7.077500, 7.299000, 7.447500, 7.442400, 7.346500, 7.222000, 7.176400, 6.851500, 6.580900, 6.904400, 7.108400, 7.135100, 7.287700, 7.327200, 7.108600, 6.860200, 6.988600, 7.383600, 7.698500, 7.888700, 7.957800, 7.921100, 7.848000, 7.796000, 7.816400, 7.902600, 8.052600, 8.265300, 8.442600, 8.541200, 8.498000, 7.410500, 6.992800, 7.149600, 7.342800, 7.446500, 7.579700, 7.738600, 7.613000, 7.200000, 7.252000, 7.759800, 8.202400, 8.451500, 8.565800, 8.648900, 8.706700, 8.767500, 8.767700, 8.727900, 8.663000, 8.670100, 8.762300, 8.935800, 9.131400, 9.231500, 9.062100, 8.956300, 8.630800, 8.262900, 8.092000, 7.912700, 7.589800, 7.087600, 7.180100, 7.534700, 7.691200, 7.510700, 7.447400, 7.252900, 6.869700, 6.692200, 7.101300, 7.619200, 7.654200, 7.824100, 7.658000, 7.604600, 7.359800, 6.698100, 7.342500, 7.547700, 7.368100, 7.098700, 7.467900, 8.042000, 8.672500, 9.167900, 9.426700, 9.468900, 9.205300, 8.829100, 8.693600, 8.642300, 8.608400, 8.553500, 8.159400, 8.019300, 8.084000, 8.172000, 8.273400, 8.378200, 8.452100, 8.479600, 8.419200, 8.483500, 8.477800, 8.444800, 8.427700, 8.450500, 8.303900, 7.469400, 7.083100, 7.406800, 7.694200, 7.851900, 7.888400, 7.844500, 7.810500, 7.567000, 7.254800, 7.425800, 7.584700, 7.632200, 7.601600, 7.574700, 7.527600, 7.504800, 7.441200, 7.521000, 7.663500, 7.725800, 7.687400, 7.656600, 7.594400, 7.370600, 6.981400, 7.268700, 7.409000, 7.425000, 7.392400, 7.371900, 7.425000, 7.295400, 7.236200, 7.624100, 8.004500, 8.319800, 8.551800, 8.743700, 8.927700, 8.969200, 8.745800, 8.668100, 8.652000, 8.675400, 8.616400, 8.540300, 8.496300, 8.480600, 8.552800, 8.678400, 8.795200, 8.863400, 8.863100, 8.753600, 8.607000, 8.146700, 8.216800, 8.355800, 8.532000, 8.671900, 8.657600, 8.101700, 7.823200, 7.688200, 7.888800, 7.951200, 7.850000, 7.786400, 7.938300, 8.253600, 8.726000, 9.209600, 9.662400, 10.026800, 10.292300, 10.400700, 10.195900, 9.990200, 9.785200, 9.463000, 8.891800, 8.939900, 9.011800, 8.882700, 8.476100, 8.257900, 8.025700, 8.283700, 8.465000, 8.626900, 8.723400, 8.650100, 8.373000, 8.200000, 8.192900, 8.087000, 7.702800, 8.205500, 8.632900, 8.926600, 9.062000, 9.074700, 9.116100, 9.269800, 9.088100, 9.119700, 9.824400, 11.075100, 12.031300, 12.224800, 12.113600, 11.914100, 11.453700, 11.162900, 10.884000, 10.577200, 10.295600, 10.239200, 10.543900, 11.000400, 11.267600, 11.508000, 11.622900, 11.800600, 12.278900, 12.837300, 13.141700, 13.218400, 13.179800, 13.092000, 12.962200, 12.782200, 12.556900, 12.306400, 11.997700, 11.294000, 10.322700, 10.269000, 10.633000, 11.461100, 12.547400, 13.160000, 13.317000, 12.935600, 11.933100, 11.551800, 11.326800, 11.106300, 10.914800, 10.879800, 10.885100, 10.831000, 10.785400, 10.903300, 10.812800, 11.642800, 12.678800, 12.009100, 11.785800, 13.200800, 14.039000, 13.779200, 13.582500, 13.892200, 14.108100, 14.162100, 13.925300, 13.344200, 12.813700, 12.720500, 12.496900, 11.960100, 11.088800, 10.462100, 10.070000, 9.910900, 9.465300, 9.628800, 9.942400, 10.409300, 11.045900, 11.546400, 11.851000, 11.719900, 11.378600, 11.535200, 11.450500, 10.781000, 10.035500, 9.597600, 9.592600, 9.016800, 8.305700, 8.224000, 8.731300, 8.858300, 8.720400, 8.579100, 8.598100, 8.550200, 8.313500, 8.873200, 9.155300, 9.009600, 8.948400, 9.011300, 9.218500, 9.310200, 9.184200, 9.300600, 9.527600, 9.762800, 10.044100, 10.272200, 10.172600, 9.639200, 9.074600, 9.091900, 9.142500, 9.128000, 9.090300, 9.059400, 8.984000, 8.488100, 7.751900, 7.733000, 7.691000, 7.818900, 8.265800, 8.861800, 9.206500, 9.657200, 10.775100, 11.293800, 11.082800, 10.820800, 10.622400, 10.470900, 10.426800, 10.358900, 9.475300, 9.259000, 9.307000, 9.141700, 9.339200, 9.305400, 9.102300, 8.585400, 8.396200, 8.776600, 9.138300, 9.268700, 9.263400, 9.342000, 9.480000, 9.660100, 9.610600, 9.583400, 9.623300, 9.685900, 9.776600, 9.940300, 10.307900, 10.756500, 10.986500, 11.014800, 10.958900, 10.853700, 10.710500, 10.602000, 10.599000, 10.343200, 9.303100, 8.898200, 8.843300, 8.766800, 8.832400, 8.844900, 8.701100, 8.576100, 8.494100, 8.600000, 8.714300, 8.794200, 8.784000, 8.744700, 8.648800, 8.419700, 8.035900, 8.118200, 8.259100, 8.185700, 7.910600, 7.975900, 7.971400, 7.506300, 7.460900, 8.083900, 8.423600, 8.508500, 8.436100, 8.415700, 8.347700, 7.856500, 7.450000, 7.993100, 8.270100, 8.709200, 9.451200, 10.022700, 10.277700, 10.366600, 10.392700, 10.397500, 10.421900, 10.500200, 10.679300, 11.006900, 11.499800, 12.048600, 12.410400, 12.614200, 12.749700, 12.738300, 12.650900, 12.468400, 11.874000, 10.947100, 9.927300, 9.693800, 10.049200, 10.285600, 10.330500, 10.370300, 10.519800, 10.663300, 10.658400, 10.496700, 9.722000, 8.224800, 8.129900, 8.573400, 10.278100, 12.091900, 12.126300, 11.480500, 9.833800, 8.235500, 8.964500, 9.830800, 10.369200, 11.476500, 12.825200, 13.424000, 13.500900, 13.595300, 13.641200, 13.687600, 13.752400, 13.817700, 13.757800, 13.546400, 13.253600, 12.931800, 12.650900, 12.413000, 12.158600, 11.886900, 11.624800, 11.398500, 11.227500, 11.053300, 10.809700, 10.542600, 10.318500, 10.038600, 8.574700, 8.156300, 7.699500, 7.692000, 7.669500, 8.096200, 9.176000, 10.236500, 11.130800, 12.205500, 12.892700, 12.854400, 12.405200, 11.864000, 11.367900, 10.950300, 10.602000, 10.304800, 10.051100, 9.862200, 9.781200, 9.782600, 9.798900, 9.169400, 8.460700, 8.467500, 8.084800, 8.193100, 8.804800, 9.348700, 9.561600, 9.629900, 9.595100, 9.700300, 9.762300, 9.681300, 9.506300, 9.341700, 9.413600, 10.452700, 12.270400, 14.815700, 17.147300, 17.781600, 17.645700, 17.353900, 17.006700, 16.596500, 16.181500, 15.754700, 15.330800, 14.950400, 14.592500, 14.252800, 13.934700, 13.626900, 13.326200, 13.040300, 12.767700, 12.492300, 12.239700, 11.975900, 11.684400, 11.575000, 11.604400, 11.642700, 11.608200, 11.508100, 11.401800, 11.388900, 11.596600, 11.872500, 11.999300, 11.966500, 11.818400, 11.633700, 11.492900, 11.378500, 11.218900, 10.920300, 9.899800, 8.824100, 8.035600, 8.617800, 9.392500, 9.666900, 9.737300, 9.818800, 10.026900, 10.337400, 10.644400, 10.888100, 11.103000, 11.320800, 11.522800, 11.657500, 11.698600, 11.704200, 11.716300, 11.665600, 11.523400, 11.355400, 10.690800, 8.665900, 9.416200, 9.697900, 9.734200, 10.242700, 11.211100, 12.231400, 13.195400, 13.637400, 13.605700, 13.278600, 12.932600, 12.685800, 12.359100, 12.020000, 11.776000, 11.486500, 11.072000, 10.655100, 10.313300, 10.028500, 9.889300, 10.270200, 11.186600, 11.620800, 11.937500, 12.407700, 12.701700, 12.655900, 12.257300, 11.800600, 11.181100, 10.698700, 10.335300, 10.623500, 10.983700, 10.904100, 10.342700, 10.024500, 9.815000, 9.236000, 8.826100, 8.872300, 9.127100, 9.114400, 9.378900, 9.387600, 9.281900, 9.034500, 8.679600, 8.785500, 8.977800, 8.998900, 9.339800, 9.548000, 9.535000, 9.439800, 9.605900, 10.079600, 10.705300, 11.117600, 11.311800, 11.361200, 11.248100, 11.050500, 10.815100, 10.588800, 10.343100, 9.799600, 9.643900, 9.801600, 10.205000, 10.441100, 10.612300, 10.689000, 10.693700, 10.739600, 11.010300, 11.404900, 11.599300, 11.556000, 11.406500, 11.234000, 10.965300, 10.556900, 9.922500, 9.438400, 8.952400, 8.377600, 8.746500, 9.298600, 9.795800, 10.188200, 10.412200, 10.402100, 10.440600, 10.319400, 10.150900, 9.938300, 9.522000, 9.032300, 9.137400, 9.354800, 9.521000, 9.589700, 9.518900, 8.502600, 7.976000, 8.105700, 8.062900, 8.650600, 9.344100, 9.947600, 10.260600, 10.248200, 10.013300, 9.743100, 9.552800, 9.377900, 9.202600, 9.003800, 8.768500, 8.553100, 8.379800, 8.230200, 8.107800, 8.009200, 7.694700, 7.597200, 7.658100, 7.754200, 7.858100, 7.945700, 7.767800, 7.412100, 7.159100, 7.111800, 7.400200, 7.798500, 8.528500, 9.388200, 9.641200, 9.789200, 10.151600, 10.514500, 10.736400, 10.786600, 10.706900, 10.665200, 10.629000, 10.648000, 10.615200, 10.584500, 10.584000, 10.563600, 10.487200, 10.357500, 10.192800, 10.001000, 9.803700, 9.610600, 9.393900, 8.923900, 7.748000, 7.273700, 7.111500, 7.422600, 8.030500, 8.580600, 8.571900, 9.036100, 8.895700, 9.200200, 9.278100, 9.594000, 10.085500, 10.479700, 10.729100, 10.800500, 10.850600, 11.033700, 11.284500, 11.466000, 11.483000, 11.482200, 11.380700, 11.207600, 11.006500, 10.805500, 10.611200, 10.289400, 9.963100, 9.776800, 9.695200, 9.660800, 9.596800, 9.450900, 9.232200, 9.100400, 9.585500, 10.780100, 10.620800, 10.577800, 10.713600, 10.526500, 10.249700, 9.992100, 9.667100, 9.406400, 9.270000, 9.279300, 9.208800, 8.954600, 8.131300, 8.016500, 7.792700, 8.190300, 8.096800, 8.150200, 8.297600, 9.012800, 9.950900, 10.248900, 9.967400, 9.671700, 9.611200, 10.098200, 10.007600, 9.964400, 10.646600, 11.393300, 11.908800, 12.591000, 13.255400, 13.524200, 13.392500, 13.028700, 12.568000, 12.102700, 11.707600, 11.395200, 10.697700, 9.872200, 9.384200, 9.637500, 9.787000, 9.869500, 9.947500, 9.940300, 9.886500, 9.862000, 9.805600, 9.702200, 9.572500, 9.281200, 8.391600, 8.228000, 8.332700, 8.620100, 8.936200, 9.125400, 9.297500, 9.586900, 9.884000, 10.150400, 10.341600, 10.558000, 10.609000, 10.495200, 10.314500, 10.084000, 9.748600, 9.336900, 8.903400, 8.237600, 8.198300, 8.221400, 8.133700, 9.105200, 10.236700, 10.878600, 11.064900, 10.988700, 10.949300, 10.948100, 10.889400, 10.810300, 10.708900, 10.581400, 10.452200, 10.334700, 10.237300, 10.154100, 10.067200, 9.961900, 9.825700, 9.692300, 9.610400, 9.583700, 9.588700, 9.623900, 9.785600, 10.040700, 10.045200, 9.999300, 10.103900, 9.913800, 8.184900, 7.999200, 8.099700, 8.615800, 8.855400, 9.367400, 9.141100, 8.742700, 8.566900, 9.125100, 8.847100, 9.022400, 8.345300, 8.317100, 9.261900, 9.615600, 9.562600, 9.977800, 10.197500, 10.093200, 9.893400, 9.769500, 10.179900, 10.501500, 10.321200, 9.866900, 9.152100, 8.441600, 8.104300, 8.300000, 8.302700, 8.902300, 9.228400, 9.353500, 9.457000, 9.521800, 9.517400, 9.446700, 9.325400, 9.181800, 9.066500, 8.989300, 8.924100, 8.596000, 8.408100, 8.207100, 7.987900, 8.584300, 8.498300, 8.518100, 8.300900, 8.515700, 8.395000, 9.343500, 9.653500, 10.150000, 10.225500, 10.576500, 11.319200, 10.816200, 10.153100, 10.447500, 10.828500, 10.932400, 10.217500, 9.641200, 8.729100, 8.499200, 9.354600, 9.959600, 10.315600, 10.717400, 11.053900, 11.228900, 11.260200, 11.176700, 11.011500, 10.811200, 10.591400, 10.186400, 9.644800, 9.046000, 8.627500, 8.509100, 8.495500, 8.066500, 7.252600, 7.820500, 8.130800, 8.501000, 8.483300, 8.533000, 9.131300, 9.594200, 9.771400, 10.288000, 10.468000, 10.506900, 10.452300, 10.462000, 10.528100, 10.546400, 10.465400, 10.245600, 10.021000, 9.948800, 10.048600, 10.269800, 10.567300, 10.900400],
-			"financial_cost_total": 3.28096e+07,
+			"financial_cost_total": 3.26032e+07,
 			"loss_additional": 0,
 			"loss_array_spacing": 0,
 			"loss_downtime": 2,
diff --git a/api/api_autogen/library/defaults/Singleowner_MEwaveBatterySingleOwner.json b/api/api_autogen/library/defaults/Singleowner_MEwaveBatterySingleOwner.json
index 9483a54df4..ad6b8b7061 100644
--- a/api/api_autogen/library/defaults/Singleowner_MEwaveBatterySingleOwner.json
+++ b/api/api_autogen/library/defaults/Singleowner_MEwaveBatterySingleOwner.json
@@ -40,7 +40,7 @@
 		},
 		"FinancialParameters": {
 			"analysis_period": 30,
-			"construction_financing_cost": 7.79052e+06,
+			"construction_financing_cost": 7.74248e+06,
 			"cost_debt_closing": 450000,
 			"cost_debt_fee": 2.75,
 			"cost_other_financing": 0,
@@ -88,7 +88,7 @@
 			"om_fixed_escal": 0,
 			"om_production_escal": 0,
 			"om_replacement_cost_escal": 0,
-			"total_installed_cost": 4.15494e+08
+			"total_installed_cost": 4.12932e+08
 		},
 		"LandLease": {
 		},
diff --git a/api/api_autogen/library/defaults/Singleowner_MEwaveSingleOwner.json b/api/api_autogen/library/defaults/Singleowner_MEwaveSingleOwner.json
index 50507f7f93..ff679712b9 100644
--- a/api/api_autogen/library/defaults/Singleowner_MEwaveSingleOwner.json
+++ b/api/api_autogen/library/defaults/Singleowner_MEwaveSingleOwner.json
@@ -40,7 +40,7 @@
 		},
 		"FinancialParameters": {
 			"analysis_period": 30,
-			"construction_financing_cost": 7.63507e+06,
+			"construction_financing_cost": 7.58703e+06,
 			"cost_debt_closing": 450000,
 			"cost_debt_fee": 2.75,
 			"cost_other_financing": 0,
@@ -78,7 +78,7 @@
 		},
 		"SystemCosts": {
 			"om_fixed": [5431320.000000],
-			"total_installed_cost": 4.07204e+08
+			"total_installed_cost": 4.04642e+08
 		},
 		"LandLease": {
 		},
diff --git a/deploy/runtime/defaults/MEtidal_LCOE Calculator.json b/deploy/runtime/defaults/MEtidal_LCOE Calculator.json
index fb217d5fd6..5a5e4ab862 100644
--- a/deploy/runtime/defaults/MEtidal_LCOE Calculator.json	
+++ b/deploy/runtime/defaults/MEtidal_LCOE Calculator.json	
@@ -4,13 +4,16 @@
     "additional_structural_components_cost": 0.0,
     "additional_structural_components_cost_total": 0.0,
     "air_turbine_cost": 0.0,
+    "air_turbine_cost_rvalue": 0.0,
     "air_turbine_cost_total": 0.0,
     "air_turbine_cost_total_check": 0.0,
     "anchors_and_piles_cost": 0.0,
     "ancillary_marine_systems_cost": 0.0,
+    "ancillary_marine_systems_cost_rvalue": 0.0,
     "ancillary_marine_systems_cost_total": 0.0,
     "ancillary_marine_systems_cost_total_check": 0.0,
     "annual_leases_fees_cost": 0.0,
+    "annual_leases_fees_cost_rvalue": 0.0,
     "annual_leases_fees_cost_total": 0.0,
     "annual_leases_fees_cost_total_check": 0.0,
     "array_cable_accessories_and_jointing_cost": 0.0,
@@ -19,6 +22,7 @@
     "array_cable_system_cost_input": 0.0,
     "array_cable_system_cost_method": 0.0,
     "array_cable_system_cost_modeled": 0.0,
+    "array_cable_system_cost_rvalue": 0.0,
     "array_cable_system_cost_total": 0.0,
     "array_cable_system_cost_total_check": 0.0,
     "array_cable_system_transportation_cost": 0.0,
@@ -31,13 +35,14 @@
     "assembly_and_install_cost_input": 0.0,
     "assembly_and_install_cost_method": 2.0,
     "assembly_and_install_cost_modeled": 3014260.0,
+    "assembly_and_install_cost_rvalue": 0.0,
     "assembly_and_install_cost_total": 0.0,
     "assembly_and_install_override": 0.0,
     "assembly_areas_cost": 0.0,
     "balance_of_system_cost_input": 0.0,
     "balance_of_system_cost_override": 0.0,
-    "balance_of_system_cost_total": 9498820.0,
-    "balance_of_system_cost_total_mill": 9.49882,
+    "balance_of_system_cost_total": 9760050.0,
+    "balance_of_system_cost_total_mill": 9.76005,
     "balance_of_system_scheduled_maintenance_cost": 0.0,
     "balance_of_system_unscheduled_maintenance_cost": 0.0,
     "ballast_system_cost": 0.0,
@@ -68,13 +73,15 @@
     "c_nominal_interest_rate": 4.0,
     "c_tax_rate": 28.0,
     "cable_accessories_and_jointing_cost": 0.0,
+    "cable_length_option": 0.0,
     "cable_mattresses_cost": 0.0,
     "cable_protection_cost": 0.0,
+    "cable_protection_cost_rvalue": 0.0,
     "cable_protection_cost_total": 0.0,
     "cable_protection_cost_total_check": 0.0,
     "cable_system_overbuild": 10.0,
-    "capex_check": 13369000.0,
-    "capital_cost": 14933100.0,
+    "capex_check": 13623300.0,
+    "capital_cost": 15217300.0,
     "carrying_cost_during_construction_cost": 0.0,
     "cathodic_protection_system_cost": 0.0,
     "civil_infrastructure_cost": 0.0,
@@ -87,13 +94,16 @@
     "condition_monitoring_operations_cost": 0.0,
     "connecting_hardware_cost": 0.0,
     "construction_management_cost": 0.0,
+    "construction_management_cost_rvalue": 0.0,
     "construction_management_cost_total": 0.0,
     "construction_management_cost_total_check": 0.0,
     "cooling_system_cost": 0.0,
     "cooling_system_gearbox_cost": 0.0,
     "cranage_cost": 0.0,
     "debt_service_reserve_account_cost": 0.0,
+    "debt_service_reserve_account_cost_rvalue": 0.0,
     "decommissioning_reserve_account_cost": 0.0,
+    "decommissioning_reserve_account_cost_rvalue": 0.0,
     "dedicated_om_vessel_cost": 0.0,
     "desired_array_size": 500.0,
     "detailed_cost_choice_air_turbine": 0.0,
@@ -135,7 +145,7 @@
     "detailed_cost_modeled_array_cables": 2.0,
     "detailed_cost_modeled_export_cables": 2.0,
     "detailed_cost_modeled_offshore_substation": 2.0,
-    "detailed_cost_modeled_onshore_substation": 2.0,
+    "detailed_cost_modeled_onshore_substation": 0.0,
     "detailed_cost_modeled_other_elec_infras": 1.0,
     "detailed_design_and_construction_eng_cost": 0.0,
     "detailed_design_and_construction_eng_cost_total": 0.0,
@@ -143,6 +153,7 @@
     "development_cost_input": 0.0,
     "development_cost_method": 2.0,
     "development_cost_modeled": 3372780.0,
+    "development_cost_rvalue": 0.0,
     "development_cost_total": 0.0,
     "development_override": 0.0,
     "development_shown": 0.0,
@@ -167,26 +178,30 @@
     "due_diligence_cost": 0.0,
     "e&m_shown": 0.0,
     "elec_infrac_shown": 0.0,
-    "elec_infras_cost": 1846110.0,
+    "elec_infras_cost": 2100470.0,
     "elec_infras_cost_input": 0.0,
     "elec_infras_cost_method": 2.0,
-    "elec_infras_cost_modeled": 1846110.0,
-    "elec_infras_cost_total": 1846110.0,
+    "elec_infras_cost_modeled": 2100470.0,
+    "elec_infras_cost_rvalue": 0.0,
+    "elec_infras_cost_total": 885871.0,
     "elec_infras_override": 0.0,
     "electrical_conversion_equipment_cost": 0.0,
     "electrical_equipment_onshore_substation_cost": 0.0,
     "electrical_generator_cost": 0.0,
+    "electrical_generator_cost_rvalue": 0.0,
     "electrical_generator_cost_total": 0.0,
     "electrical_generator_cost_total_check": 0.0,
     "eng_and_mgmt_cost": 904710.0,
     "eng_and_mgmt_cost_input": 0.0,
     "eng_and_mgmt_cost_method": 2.0,
     "eng_and_mgmt_cost_modeled": 904710.0,
+    "eng_and_mgmt_cost_rvalue": 0.0,
     "eng_and_mgmt_cost_total": 0.0,
     "eng_and_mgmt_override": 0.0,
     "engineering_certification_cost": 0.0,
     "entrance_exit_fees_cost": 0.0,
     "environmental_health_and_safety_monitoring_cost": 0.0,
+    "environmental_health_and_safety_monitoring_cost_rvalue": 0.0,
     "environmental_health_and_safety_monitoring_cost_total": 0.0,
     "environmental_health_and_safety_monitoring_cost_total_check": 0.0,
     "environmental_monitoring_cost": 0.0,
@@ -200,10 +215,17 @@
     "export_cable_system_cost": 0.0,
     "export_cable_system_cost_input": 0.0,
     "export_cable_system_cost_method": 2.0,
-    "export_cable_system_cost_modeled": 931662.0,
+    "export_cable_system_cost_modeled": 166548.0,
+    "export_cable_system_cost_rvalue": 0.0,
     "export_cable_system_cost_total": 0.0,
-    "export_cable_system_cost_total_check": 931662.0,
+    "export_cable_system_cost_total_check": 166548.0,
     "export_cable_system_transportation_cost": 0.0,
+    "export_cable_type": 0.0,
+    "export_cable_voltage": 7.2,
+    "export_cable_voltage_calculated": 7.2,
+    "export_cable_voltage_choice": 0.0,
+    "export_cable_voltage_option_ac": 0.0,
+    "export_cable_voltage_option_hvdc": 0.0,
     "export_cables_cost": 0.0,
     "external_ballast_chambers_cost": 0.0,
     "fabrication_facilities_cost": 0.0,
@@ -212,11 +234,12 @@
     "feed_cost": 0.0,
     "financial_cost_input": 0.0,
     "financial_cost_override": 0.0,
-    "financial_cost_total": 1203210.0,
-    "financial_cost_total_mill": 1.20321,
+    "financial_cost_total": 1226100.0,
+    "financial_cost_total_mill": 1.2261,
     "financial_itemized_shown": 0.0,
     "financial_override_check": 0.0,
     "financing_and_incentives_cost": 0.0,
+    "financing_and_incentives_cost_rvalue": 0.0,
     "financing_and_incentives_cost_total": 0.0,
     "financing_and_incentives_cost_total_check": 0.0,
     "fixed_charge_rate": 0.108,
@@ -226,6 +249,7 @@
     "foundation_onshore_substation_cost": 0.0,
     "frequency_converter_cost": 0.0,
     "gearbox_cost": 0.0,
+    "gearbox_cost_rvalue": 0.0,
     "gearbox_cost_total": 0.0,
     "gearbox_cost_total_check": 0.0,
     "gears_cost": 0.0,
@@ -233,12 +257,14 @@
     "geological_and_bathymetry_cost": 0.0,
     "health_and_safety_monitoring_cost": 0.0,
     "health_safety_and_environmental_monitoring_cost": 0.0,
+    "health_safety_and_environmental_monitoring_cost_rvalue": 0.0,
     "health_safety_and_environmental_monitoring_cost_total": 0.0,
     "health_safety_and_environmental_monitoring_cost_total_check": 0.0,
     "health_safety_monitoring_cost": 0.0,
     "housing_cost": 0.0,
     "hub_assembly_cost": 0.0,
     "hydraulic_drivetrain_cost": 0.0,
+    "hydraulic_drivetrain_cost_rvalue": 0.0,
     "hydraulic_drivetrain_cost_total": 0.0,
     "hydraulic_drivetrain_cost_total_check": 0.0,
     "hydraulic_fluid_cost": 0.0,
@@ -246,17 +272,23 @@
     "hydraulic_reservoir_cost": 0.0,
     "incentives_cost": 0.0,
     "initial_engineering_cost": 0.0,
+    "initial_engineering_cost_rvalue": 0.0,
     "initial_engineering_cost_total": 0.0,
     "initial_engineering_cost_total_check": 0.0,
-    "insurance_during_construction_cost": 133690.0,
+    "insurance_during_construction_cost": 136233.0,
     "insurance_during_construction_cost_input": 0.0,
-    "insurance_during_construction_cost_modeled_ui": 133690.0,
+    "insurance_during_construction_cost_modeled_ui": 136233.0,
+    "insurance_during_construction_cost_rvalue": 0.0,
     "insurance_during_construction_method": 2.0,
     "insurance_during_construction_modeled": 133690.0,
     "insurance_operations_cost": 0.0,
     "integration_assembly_testing_checkout_cost": 0.0,
     "inter_array_cable_length": 0.0,
+    "inter_array_cable_voltage": 7.2,
+    "inter_array_cable_voltage_calculated": 7.2,
+    "inter_array_cable_voltage_option": 0.0,
     "interconnection_and_power_marketing_cost": 0.0,
+    "interconnection_and_power_marketing_cost_rvalue": 0.0,
     "interconnection_and_power_marketing_cost_total": 0.0,
     "interconnection_and_power_marketing_cost_total_check": 0.0,
     "interconnection_studies_and_fees_cost": 0.0,
@@ -285,7 +317,6 @@
     "legal_support_cost": 0.0,
     "level_check": 0.0,
     "level_eng": 0.0,
-    "level_value": 0.0,
     "lib_tidal_device": "RM1",
     "lib_tidal_power_curve": [
         [
@@ -426,6 +457,8 @@
         ]
     ],
     "library_or_input_tidal": 0.0,
+    "load_grid_voltage": 8.0,
+    "load_grid_voltage_options": 0.0,
     "long_term_service_agreement_cost": 0.0,
     "loss_additional": 0.0,
     "loss_array_spacing": 0.0,
@@ -439,12 +472,15 @@
     "maintenance_cost_input": 0.0,
     "maintenance_cost_method": 2.0,
     "maintenance_cost_modeled": 447954.0,
+    "maintenance_cost_rvalue": 0.0,
     "maintenance_cost_total": 0.0,
     "maintenance_override_check": 0.0,
     "maintenance_reserve_account_cost": 0.0,
+    "maintenance_reserve_account_cost_rvalue": 0.0,
     "maintenance_we_shown": 0.0,
     "marine_coatings_cost": 0.0,
     "marine_energy_converter_device_cost": 0.0,
+    "marine_energy_converter_device_cost_rvalue": 0.0,
     "marine_energy_converter_device_cost_total": 0.0,
     "marine_energy_converter_device_cost_total_check": 0.0,
     "marine_energy_converter_power_consumption_cost": 0.0,
@@ -454,6 +490,7 @@
     "marine_management_cost": 0.0,
     "marine_system_cost_total_check": 0.0,
     "marine_systems_cost": 0.0,
+    "marine_systems_cost_rvalue": 0.0,
     "marine_systems_cost_total": 0.0,
     "messenger_lines_and_buoys_cost": 0.0,
     "method_check": 2.0,
@@ -461,6 +498,7 @@
     "mooring_found_substruc_cost_input": 0.0,
     "mooring_found_substruc_cost_method": 2.0,
     "mooring_found_substruc_cost_modeled": 920874.0,
+    "mooring_found_substruc_cost_rvalue": 0.0,
     "mooring_found_substruc_cost_total": 0.0,
     "mooring_lines_cost": 0.0,
     "mooring_override": 0.0,
@@ -472,18 +510,21 @@
     "offshore_accommodations_platform_cost": 0.0,
     "offshore_accomodations_other_infras_cost": 0.0,
     "offshore_electrical_infrastructure_cost": 0.0,
+    "offshore_electrical_infrastructure_cost_rvalue": 0.0,
     "offshore_electrical_infrastructure_cost_total": 0.0,
     "offshore_electrical_infrastructure_cost_total_check": 0.0,
     "offshore_export_cables_assem_install_cost": 0.0,
     "offshore_logistical_infrastructure_assem_install_cost": 0.0,
     "offshore_logistical_infrastructure_other_infras_cost": 0.0,
     "offshore_substation_assem_install_cost": 0.0,
+    "offshore_substation_choice": 0.0,
     "offshore_substation_cost": 0.0,
     "offshore_substation_cost_input": 0.0,
     "offshore_substation_cost_method": 2.0,
-    "offshore_substation_cost_modeled": 111500.0,
+    "offshore_substation_cost_modeled": 0.0,
+    "offshore_substation_cost_rvalue": 0.0,
     "offshore_substation_cost_total": 0.0,
-    "offshore_substation_cost_total_check": 111500.0,
+    "offshore_substation_cost_total_check": 0.0,
     "offshore_substation_cost_total_display": 0.0,
     "om_cost_input": 0.0,
     "om_cost_override": 0.0,
@@ -493,20 +534,24 @@
     ],
     "onshore_electric_infrastructure_assem_install_cost": 0.0,
     "onshore_electrical_infrastructure_cost": 0.0,
+    "onshore_electrical_infrastructure_cost_rvalue": 0.0,
     "onshore_electrical_infrastructure_cost_total": 0.0,
     "onshore_electrical_infrastructure_cost_total_check": 0.0,
     "onshore_interconnection_rights_cost": 0.0,
     "onshore_land_lease_cost": 0.0,
     "onshore_om_facilities_cost": 0.0,
     "onshore_substation_assem_install_cost": 0.0,
+    "onshore_substation_choice": 0.0,
     "onshore_substation_cost": 0.0,
     "onshore_substation_cost_input": 0.0,
     "onshore_substation_cost_method": 2.0,
-    "onshore_substation_cost_modeled": 83625.0,
+    "onshore_substation_cost_modeled": 1214600.0,
+    "onshore_substation_cost_rvalue": 0.0,
     "onshore_substation_cost_total": 0.0,
-    "onshore_substation_cost_total_check": 83625.0,
+    "onshore_substation_cost_total_check": 0.0,
     "onshore_substations_cost": 0.0,
     "onshore_transmission_infrastructure_cost": 0.0,
+    "onshore_transmission_infrastructure_cost_rvalue": 0.0,
     "onshore_transmission_infrastructure_cost_total": 0.0,
     "onshore_transmission_infrastructure_cost_total_check": 0.0,
     "onshore_transmission_infrastructure_transportation_cost": 0.0,
@@ -517,8 +562,10 @@
     "operations_cost_input": 0.0,
     "operations_cost_method": 2.0,
     "operations_cost_modeled": 914126.0,
+    "operations_cost_rvalue": 0.0,
     "operations_cost_total": 0.0,
     "operations_management_general_administration_cost": 0.0,
+    "operations_management_general_administration_cost_rvalue": 0.0,
     "operations_management_general_administration_cost_total": 0.0,
     "operations_management_general_administration_cost_total_check": 0.0,
     "operations_override_check": 0.0,
@@ -537,6 +584,7 @@
     "other_elec_infra_cost_input": 0.0,
     "other_elec_infra_cost_method": 2.0,
     "other_elec_infra_cost_modeled": 719323.0,
+    "other_elec_infra_cost_rvalue": 0.0,
     "other_elec_infra_cost_total": 719323.0,
     "other_electrical_generator_cost": 0.0,
     "other_eng_cost": 0.0,
@@ -546,6 +594,7 @@
     "other_financial_cost_input": 0.0,
     "other_financial_cost_method": 2.0,
     "other_financial_cost_modeled": 0.0,
+    "other_financial_cost_rvalue": 0.0,
     "other_financing_cost": 0.0,
     "other_gearbox_cost": 0.0,
     "other_gen_admin_cost": 0.0,
@@ -556,6 +605,7 @@
     "other_infrastructure_cost_input": 0.0,
     "other_infrastructure_cost_method": 2.0,
     "other_infrastructure_cost_modeled": 0.0,
+    "other_infrastructure_cost_rvalue": 0.0,
     "other_infrastructure_cost_total": 0.0,
     "other_infrastructure_transportation_other_infras_cost": 0.0,
     "other_initial_engineering_cost": 0.0,
@@ -581,6 +631,7 @@
     "other_pto_cost": 0.0,
     "other_pto_total": 0.0,
     "other_reserve_account_cost": 0.0,
+    "other_reserve_account_cost_rvalue": 0.0,
     "other_scheduled_maintenance_cost": 0.0,
     "other_shortterm_energy_storage_cost": 0.0,
     "other_site_access_cost": 0.0,
@@ -590,6 +641,7 @@
     "other_substructure_cost": 0.0,
     "other_unscheduled_maintenance_cost": 0.0,
     "outfitting_structure_cost": 0.0,
+    "outfitting_structure_cost_rvalue": 0.0,
     "outfitting_structure_cost_total": 0.0,
     "outfitting_structure_cost_total_check": 0.0,
     "overhead_lines_cost": 0.0,
@@ -597,24 +649,28 @@
     "override_check_structural": 0.0,
     "permit_acquisition_activities_cost": 0.0,
     "permitting_and_leasing_cost": 0.0,
+    "permitting_and_leasing_cost_rvalue": 0.0,
     "permitting_and_leasing_cost_total": 0.0,
     "permitting_and_leasing_cost_total_check": 0.0,
     "personnel_access_system_cost": 0.0,
     "personnel_access_system_mooring_cost": 0.0,
     "personnel_facilities_cost": 0.0,
-    "plant_commissioning_cost": 213904.0,
+    "plant_commissioning_cost": 217973.0,
     "plant_commissioning_cost_input": 0.0,
     "plant_commissioning_cost_method": 2.0,
     "plant_commissioning_cost_modeled": 213904.0,
-    "plant_commissioning_cost_modeled_ui": 213904.0,
+    "plant_commissioning_cost_modeled_ui": 217973.0,
+    "plant_commissioning_cost_rvalue": 0.0,
     "plumbing_fittings_cost": 0.0,
     "port_fees_cost": 0.0,
+    "port_fees_cost_rvalue": 0.0,
     "port_fees_cost_total": 0.0,
     "port_fees_cost_total_check": 0.0,
     "port_fees_total": 0.0,
     "port_improvement_cost": 0.0,
     "power_electrical_system_cost": 0.0,
     "power_electronics_cost": 0.0,
+    "power_electronics_cost_rvalue": 0.0,
     "power_electronics_cost_total": 0.0,
     "power_electronics_cost_total_check": 0.0,
     "power_marketing_cost": 0.0,
@@ -626,12 +682,14 @@
     "power_takeoff_system_cost_input_label": 0.0,
     "power_takeoff_system_cost_method": 2.0,
     "power_takeoff_system_cost_modeled": 2208170.0,
+    "power_takeoff_system_cost_rvalue": 0.0,
     "power_takeoff_system_cost_total": 0.0,
     "power_takeoff_system_total_label": 0.0,
     "pre_feed_cost": 0.0,
     "primary_hydraulic_pump_cost": 0.0,
     "primary_struct_assem_cost": 0.0,
     "prime_mover_cost": 0.0,
+    "prime_mover_cost_rvalue": 0.0,
     "prime_mover_cost_total": 0.0,
     "prime_mover_cost_total_check": 0.0,
     "probability_sum": 1.0,
@@ -644,12 +702,14 @@
     "profit_eng_cost": 0.0,
     "project_certification_cost": 0.0,
     "project_certification_cost_total_display": 0.0,
-    "project_contingency_budget_cost": 668449.0,
+    "project_contingency_budget_cost": 681167.0,
+    "project_contingency_budget_cost_rvalue": 0.0,
     "project_contingency_cost_input": 0.0,
     "project_contingency_cost_method": 2.0,
-    "project_contingency_cost_modeled_ui": 668449.0,
+    "project_contingency_cost_modeled_ui": 681167.0,
     "project_contingency_modeled": 668449.0,
     "project_management_during_development_cost": 0.0,
+    "project_management_during_development_cost_rvalue": 0.0,
     "project_management_during_development_cost_total": 0.0,
     "project_management_during_development_cost_total_check": 0.0,
     "protection_control_cost": 0.0,
@@ -659,15 +719,19 @@
     "quayside_docking_fees_cost": 0.0,
     "railings_cost": 0.0,
     "rectifying_circuit_cost": 0.0,
-    "reserve_accounts_cost": 401069.0,
+    "reserve_accounts_cost": 408700.0,
     "reserve_accounts_cost_input": 0.0,
     "reserve_accounts_cost_method": 2.0,
-    "reserve_accounts_cost_modeled_ui": 401069.0,
+    "reserve_accounts_cost_modeled_ui": 408700.0,
+    "reserve_accounts_cost_rvalue": 0.0,
     "reserve_accounts_cost_total": 0.0,
     "reserve_accounts_modeled": 401069.0,
     "resource_and_metocean_assessment_cost": 0.0,
     "resource_assessment_cost": 0.0,
     "riser_cable_length": 0.0,
+    "riser_cable_voltage": 7.2,
+    "riser_cable_voltage_calculated": 7.2,
+    "riser_cable_voltage_option": 0.0,
     "rotors_cost": 0.0,
     "row_spacing": 600.0,
     "salaries_cost": 0.0,
@@ -677,6 +741,7 @@
     "sales_general_and_administrative_operations_cost": 0.0,
     "scada_cost": 0.0,
     "scheduled_maintenance_cost": 0.0,
+    "scheduled_maintenance_cost_rvalue": 0.0,
     "scheduled_maintenance_cost_total": 0.0,
     "scheduled_maintenance_cost_total_check": 0.0,
     "scour_protection_assem_install_cost": 0.0,
@@ -690,20 +755,24 @@
     "shortterm_energy_storage_cost": 0.0,
     "shortterm_energy_storage_cost_total": 0.0,
     "site_access_override": 0.0,
-    "site_access_port_staging_cost": 147059.0,
+    "site_access_port_staging_cost": 149857.0,
     "site_access_port_staging_cost_input": 0.0,
     "site_access_port_staging_cost_method": 2.0,
     "site_access_port_staging_cost_modeled": 147059.0,
-    "site_access_port_staging_cost_modeled_ui": 147059.0,
+    "site_access_port_staging_cost_modeled_ui": 149857.0,
+    "site_access_port_staging_cost_rvalue": 0.0,
     "site_access_port_staging_cost_total": 0.0,
     "site_access_shown": 0.0,
     "site_characterization_cost": 0.0,
+    "site_characterization_cost_rvalue": 0.0,
     "site_characterization_cost_total": 0.0,
     "site_characterization_cost_total_check": 0.0,
     "site_selection_cost": 0.0,
+    "site_selection_cost_rvalue": 0.0,
     "site_selection_cost_total": 0.0,
     "site_selection_cost_total_check": 0.0,
     "staging_port_cost": 0.0,
+    "staging_port_cost_rvalue": 0.0,
     "staging_port_cost_total": 0.0,
     "staging_port_cost_total_check": 0.0,
     "stakeholder_outreach_cost": 0.0,
@@ -718,6 +787,7 @@
     "structural_assembly_cost_method": 2.0,
     "structural_assembly_cost_modeled": 1102070.0,
     "structural_assembly_cost_modeled_formatted": 1102070.0,
+    "structural_assembly_cost_rvalue": 0.0,
     "structural_assembly_cost_total": 0.0,
     "structure_foundations_cost": 0.0,
     "stuctural_assem_shown": 0.0,
@@ -728,8 +798,13 @@
     "substructure_assem_install_cost_total": 0.0,
     "substructure_assem_install_cost_total_check": 0.0,
     "substructures_and_foundations_cost": 0.0,
+    "substructures_and_foundations_cost_rvalue": 0.0,
     "system_capacity": 1115.0,
     "test_num": 0.0,
+    "tidal.turbine.elevation": 0.0,
+    "tidal.turbine.max_tip_speed": 0.0,
+    "tidal.turbine.max_tspeed_ratio": 0.0,
+    "tidal_design_excl": 0.0,
     "tidal_power_curve": [
         [
             0.0,
@@ -1006,6 +1081,95 @@
             0.0
         ]
     ],
+    "tidal_resource_shear": 0.0,
+    "tidal_turbine_cut_out": 3.3,
+    "tidal_turbine_cutin": 0.0,
+    "tidal_turbine_hub_ht": 0.0,
+    "tidal_turbine_kw_rating": 0.0,
+    "tidal_turbine_kw_rating_input": 210.0,
+    "tidal_turbine_max_cp": [
+        0.42
+    ],
+    "tidal_turbine_number_rotors": 2.0,
+    "tidal_turbine_powercurve_powerout": [
+        0.0,
+        0.803021,
+        6.42416,
+        21.6816,
+        51.3933,
+        100.378,
+        173.452,
+        210.0,
+        210.0,
+        210.0,
+        210.0,
+        210.0,
+        210.0,
+        210.0,
+        210.0,
+        210.0,
+        210.0,
+        210.0,
+        210.0,
+        210.0,
+        210.0,
+        210.0,
+        210.0,
+        210.0,
+        210.0,
+        210.0,
+        210.0,
+        210.0,
+        210.0,
+        210.0,
+        210.0,
+        210.0,
+        210.0,
+        210.0
+    ],
+    "tidal_turbine_powercurve_tidalspeeds": [
+        0.0,
+        0.1,
+        0.2,
+        0.3,
+        0.4,
+        0.5,
+        0.6,
+        0.7,
+        0.8,
+        0.9,
+        1.0,
+        1.1,
+        1.2,
+        1.3,
+        1.4,
+        1.5,
+        1.6,
+        1.7,
+        1.8,
+        1.9,
+        2.0,
+        2.1,
+        2.2,
+        2.3,
+        2.4,
+        2.5,
+        2.6,
+        2.7,
+        2.8,
+        2.9,
+        3.0,
+        3.1,
+        3.2,
+        3.3
+    ],
+    "tidal_turbine_pto_eff": [
+        95.0
+    ],
+    "tidal_turbine_rotor_diameter": 0.0,
+    "tidal_turbine_rotor_diameter_input": 50.0,
+    "tidal_turbine_site_depth": 50.0,
+    "tidal_velocity_power_law_fit": 0.0,
     "topside_cost": 0.0,
     "total_bos_cost_lcoe": 26.2705,
     "total_bos_cost_per_kwh": 2.71336,
@@ -1014,16 +1178,16 @@
     "total_device_cost_per_kwh": 4.24697,
     "total_financial_cost_lcoe": 5.90559,
     "total_financial_cost_per_kwh": 0.60996,
-    "total_installed_cost": 14933100.0,
+    "total_installed_cost": 15217300.0,
     "total_installed_cost_lcoe": 73.2949,
-    "total_installed_cost_mill": 14.9331,
+    "total_installed_cost_mill": 15.2173,
     "total_installed_cost_structural": 1102070.0,
     "total_operating_cost": 1362080.0,
     "total_operating_cost_mill": 1.36208,
     "total_operations_cost_lcoe": 26.7051,
     "total_operations_cost_per_kwh": 0.29789,
     "total_rated_capacity": 1115.0,
-    "total_test": 14933100.0,
+    "total_test": 15217300.0,
     "transmission_charges_rights_cost": 0.0,
     "transmission_towers_cost": 0.0,
     "transport_power_conversion_chain_cost": 0.0,
@@ -1033,7 +1197,7 @@
     "transportation_cost": 0.0,
     "turbine_bearings_cost": 0.0,
     "ui_capital_cost_capacity": 0.0,
-    "ui_capital_cost_reference": 14933100.0,
+    "ui_capital_cost_reference": 15217300.0,
     "ui_cfin": 0.0,
     "ui_crf": "inf",
     "ui_fcr_input_option": 0.0,
@@ -1050,11 +1214,17 @@
     "underground_cable_system_onshore_electrical_infrastructure_cost": 0.0,
     "unscheduled_maintenance_contingency_cost": 0.0,
     "unscheduled_maintenance_cost": 0.0,
+    "unscheduled_maintenance_cost_rvalue": 0.0,
     "unscheduled_maintenance_cost_total": 0.0,
     "unscheduled_maintenance_cost_total_check": 0.0,
+    "use_offshore_substation_calc": 0.0,
+    "use_onshore_substation": 0.0,
     "use_wavefile_spacing": 0.0,
+    "user_export_cable_length": 0.0,
     "user_input_devices_per_row": 10.0,
     "user_input_number_rows": 10.0,
+    "user_inter_array_cable_length": 0.0,
+    "user_riser_cable_length": 0.0,
     "user_tidal_power_curve": [
         [
             0.0,
diff --git a/deploy/runtime/defaults/MEtidal_None.json b/deploy/runtime/defaults/MEtidal_None.json
index 464d6915a1..bcb4e236a8 100644
--- a/deploy/runtime/defaults/MEtidal_None.json
+++ b/deploy/runtime/defaults/MEtidal_None.json
@@ -1,5 +1,6 @@
 {
     "array_sizing_mode": 0.0,
+    "cable_length_option": 0.0,
     "cable_system_overbuild": 10.0,
     "desired_array_size": 0.0,
     "device_foundation": "Bottom Fixed: Pile Foundation",
@@ -16,8 +17,17 @@
     "distance_to_shore_input": 5000.0,
     "export_cable_length": 5555.0,
     "export_cable_redundancy": 0.0,
+    "export_cable_type": 0.0,
+    "export_cable_voltage": 7.2,
+    "export_cable_voltage_calculated": 7.2,
+    "export_cable_voltage_choice": 0.0,
+    "export_cable_voltage_option_ac": 0.0,
+    "export_cable_voltage_option_hvdc": 0.0,
     "floating_array": 1.0,
     "inter_array_cable_length": 0.0,
+    "inter_array_cable_voltage": 7.2,
+    "inter_array_cable_voltage_calculated": 7.2,
+    "inter_array_cable_voltage_option": 0.0,
     "lib_tidal_device": "RM1",
     "lib_tidal_power_curve": [
         [
@@ -158,6 +168,8 @@
         ]
     ],
     "library_or_input_tidal": 0.0,
+    "load_grid_voltage": 8.0,
+    "load_grid_voltage_options": 0.0,
     "loss_additional": 0.0,
     "loss_array_spacing": 0.0,
     "loss_downtime": 2.0,
@@ -166,10 +178,19 @@
     "loss_transmission": 5.0,
     "number_devices": 1.0,
     "number_rows": 1.0,
+    "offshore_substation_choice": 0.0,
+    "onshore_substation_choice": 0.0,
     "probability_sum": 1.0,
     "riser_cable_length": 82.5,
+    "riser_cable_voltage": 7.2,
+    "riser_cable_voltage_calculated": 7.2,
+    "riser_cable_voltage_option": 0.0,
     "row_spacing": 600.0,
     "system_capacity": 1115.0,
+    "tidal.turbine.elevation": 0.0,
+    "tidal.turbine.max_tip_speed": 0.0,
+    "tidal.turbine.max_tspeed_ratio": 0.0,
+    "tidal_design_excl": 0.0,
     "tidal_power_curve": [
         [
             0.0,
@@ -446,12 +467,239 @@
             0.0
         ]
     ],
+    "tidal_resource_shear": 0.0,
+    "tidal_turbine_cut_out": 3.3,
+    "tidal_turbine_cutin": 0.0,
+    "tidal_turbine_hub_ht": 0.0,
+    "tidal_turbine_kw_rating": 0.0,
+    "tidal_turbine_kw_rating_input": 210.0,
+    "tidal_turbine_max_cp": [
+        0.42
+    ],
+    "tidal_turbine_number_rotors": 2.0,
+    "tidal_turbine_powercurve_powerout": [
+        0.0,
+        0.200755,
+        1.60604,
+        5.42039,
+        12.8483,
+        25.0944,
+        43.3631,
+        68.859,
+        102.787,
+        146.35,
+        200.755,
+        210.0,
+        210.0,
+        210.0,
+        210.0,
+        210.0,
+        210.0,
+        210.0,
+        210.0,
+        210.0,
+        210.0,
+        210.0,
+        210.0,
+        210.0,
+        210.0,
+        210.0,
+        210.0,
+        210.0,
+        210.0,
+        210.0,
+        210.0,
+        210.0,
+        210.0,
+        210.0
+    ],
+    "tidal_turbine_powercurve_tidalspeeds": [
+        0.0,
+        0.1,
+        0.2,
+        0.3,
+        0.4,
+        0.5,
+        0.6,
+        0.7,
+        0.8,
+        0.9,
+        1.0,
+        1.1,
+        1.2,
+        1.3,
+        1.4,
+        1.5,
+        1.6,
+        1.7,
+        1.8,
+        1.9,
+        2.0,
+        2.1,
+        2.2,
+        2.3,
+        2.4,
+        2.5,
+        2.6,
+        2.7,
+        2.8,
+        2.9,
+        3.0,
+        3.1,
+        3.2,
+        3.3
+    ],
+    "tidal_turbine_pto_eff": [
+        95.0
+    ],
+    "tidal_turbine_rotor_diameter": 0.0,
+    "tidal_turbine_rotor_diameter_input": 25.0,
+    "tidal_turbine_site_depth": 50.0,
+    "tidal_velocity_power_law_fit": 0.0,
+    "use_offshore_substation_calc": 0.0,
+    "use_onshore_substation": 0.0,
     "use_wavefile_spacing": 0.0,
+    "user_export_cable_length": 0.0,
     "user_input_devices_per_row": 10.0,
     "user_input_number_rows": 3.0,
+    "user_inter_array_cable_length": 0.0,
+    "user_riser_cable_length": 0.0,
     "user_tidal_power_curve": [
         [
+            0.0,
+            0.0
+        ],
+        [
+            0.1,
+            0.0
+        ],
+        [
+            0.2,
             0.0
+        ],
+        [
+            0.3,
+            0.0
+        ],
+        [
+            0.4,
+            0.0
+        ],
+        [
+            0.5,
+            0.0
+        ],
+        [
+            0.6,
+            10.4211
+        ],
+        [
+            0.7,
+            20.8423
+        ],
+        [
+            0.8,
+            39.9689
+        ],
+        [
+            0.9,
+            59.0956
+        ],
+        [
+            1.0,
+            89.2016
+        ],
+        [
+            1.1,
+            119.308
+        ],
+        [
+            1.2,
+            160.886
+        ],
+        [
+            1.3,
+            202.464
+        ],
+        [
+            1.4,
+            259.292
+        ],
+        [
+            1.5,
+            316.12
+        ],
+        [
+            1.6,
+            392.673
+        ],
+        [
+            1.7,
+            469.226
+        ],
+        [
+            1.8,
+            570.306
+        ],
+        [
+            1.9,
+            671.386
+        ],
+        [
+            2.0,
+            802.908
+        ],
+        [
+            2.1,
+            934.43
+        ],
+        [
+            2.2,
+            1024.71
+        ],
+        [
+            2.3,
+            1115.0
+        ],
+        [
+            2.4,
+            1115.0
+        ],
+        [
+            2.5,
+            1115.0
+        ],
+        [
+            2.6,
+            1115.0
+        ],
+        [
+            2.7,
+            1115.0
+        ],
+        [
+            2.8,
+            1115.0
+        ],
+        [
+            2.9,
+            1115.0
+        ],
+        [
+            3.0,
+            1115.0
+        ],
+        [
+            3.1,
+            1115.0
+        ],
+        [
+            3.2,
+            1085.37
+        ],
+        [
+            3.3,
+            1055.73
         ]
     ],
     "water_depth": 50.0,
diff --git a/deploy/runtime/defaults/MEwave Battery_Single Owner.json b/deploy/runtime/defaults/MEwave Battery_Single Owner.json
index 5f715f0741..b6a89f506b 100644
--- a/deploy/runtime/defaults/MEwave Battery_Single Owner.json	
+++ b/deploy/runtime/defaults/MEwave Battery_Single Owner.json	
@@ -12,15 +12,18 @@
     "additional_structural_components_cost": 0.0,
     "additional_structural_components_cost_total": 0.0,
     "air_turbine_cost": 0.0,
+    "air_turbine_cost_rvalue": 0.0,
     "air_turbine_cost_total": 0.0,
     "air_turbine_cost_total_check": 0.0,
     "analysis_period": 30.0,
     "analysis_period_warning": "",
     "anchors_and_piles_cost": 0.0,
     "ancillary_marine_systems_cost": 0.0,
+    "ancillary_marine_systems_cost_rvalue": 0.0,
     "ancillary_marine_systems_cost_total": 0.0,
     "ancillary_marine_systems_cost_total_check": 0.0,
     "annual_leases_fees_cost": 0.0,
+    "annual_leases_fees_cost_rvalue": 0.0,
     "annual_leases_fees_cost_total": 0.0,
     "annual_leases_fees_cost_total_check": 0.0,
     "array_cable_accessories_and_jointing_cost": 0.0,
@@ -28,7 +31,8 @@
     "array_cable_system_cost": 0.0,
     "array_cable_system_cost_input": 0.0,
     "array_cable_system_cost_method": 0.0,
-    "array_cable_system_cost_modeled": 12813800.0,
+    "array_cable_system_cost_modeled": 5107980.0,
+    "array_cable_system_cost_rvalue": 0.0,
     "array_cable_system_cost_total": 0.0,
     "array_cable_system_cost_total_check": 0.0,
     "array_cable_system_transportation_cost": 0.0,
@@ -41,13 +45,14 @@
     "assembly_and_install_cost_input": 0.0,
     "assembly_and_install_cost_method": 2.0,
     "assembly_and_install_cost_modeled": 25655500.0,
+    "assembly_and_install_cost_rvalue": 0.0,
     "assembly_and_install_cost_total": 0.0,
     "assembly_and_install_override": 0.0,
     "assembly_areas_cost": 0.0,
     "balance_of_system_cost_input": 0.0,
     "balance_of_system_cost_override": 0.0,
-    "balance_of_system_cost_total": 79150700.0,
-    "balance_of_system_cost_total_mill": 79.1507,
+    "balance_of_system_cost_total": 76795100.0,
+    "balance_of_system_cost_total_mill": 76.7951,
     "balance_of_system_scheduled_maintenance_cost": 0.0,
     "balance_of_system_unscheduled_maintenance_cost": 0.0,
     "ballast_system_cost": 0.0,
@@ -9232,8 +9237,10 @@
     "building_facilities_cost": 0.0,
     "buoyancy_chamber_cost": 0.0,
     "cable_accessories_and_jointing_cost": 0.0,
+    "cable_length_option": 0.0,
     "cable_mattresses_cost": 0.0,
     "cable_protection_cost": 0.0,
+    "cable_protection_cost_rvalue": 0.0,
     "cable_protection_cost_total": 0.0,
     "cable_protection_cost_total_check": 0.0,
     "cable_system_overbuild": 10.0,
@@ -9255,7 +9262,7 @@
             105.4
         ]
     ],
-    "capex_check": 364551000.0,
+    "capex_check": 362258000.0,
     "carrying_cost_during_construction_cost": 0.0,
     "cathodic_protection_system_cost": 0.0,
     "cbi_fed_amount": 0.0,
@@ -9293,7 +9300,7 @@
     "condition_monitoring_cost": 0.0,
     "condition_monitoring_operations_cost": 0.0,
     "connecting_hardware_cost": 0.0,
-    "const_per_interest1": 3635580.0,
+    "const_per_interest1": 3613160.0,
     "const_per_interest2": 0.0,
     "const_per_interest3": 0.0,
     "const_per_interest4": 0.0,
@@ -9303,7 +9310,7 @@
     "const_per_interest_rate3": 0.0,
     "const_per_interest_rate4": 0.0,
     "const_per_interest_rate5": 0.0,
-    "const_per_interest_total": 3635580.0,
+    "const_per_interest_total": 3613160.0,
     "const_per_months1": 6.0,
     "const_per_months2": 0.0,
     "const_per_months3": 0.0,
@@ -9320,13 +9327,13 @@
     "const_per_percent4": 0.0,
     "const_per_percent5": 0.0,
     "const_per_percent_total": 100.0,
-    "const_per_principal1": 415494000.0,
+    "const_per_principal1": 412932000.0,
     "const_per_principal2": 0.0,
     "const_per_principal3": 0.0,
     "const_per_principal4": 0.0,
     "const_per_principal5": 0.0,
-    "const_per_principal_total": 415494000.0,
-    "const_per_total1": 7790520.0,
+    "const_per_principal_total": 412932000.0,
+    "const_per_total1": 7742480.0,
     "const_per_total2": 0.0,
     "const_per_total3": 0.0,
     "const_per_total4": 0.0,
@@ -9336,8 +9343,9 @@
     "const_per_upfront_rate3": 0.0,
     "const_per_upfront_rate4": 0.0,
     "const_per_upfront_rate5": 0.0,
-    "construction_financing_cost": 7790520.0,
+    "construction_financing_cost": 7742480.0,
     "construction_management_cost": 0.0,
+    "construction_management_cost_rvalue": 0.0,
     "construction_management_cost_total": 0.0,
     "construction_management_cost_total_check": 0.0,
     "cooling_system_cost": 0.0,
@@ -9361,7 +9369,9 @@
     "debt_option": 1.0,
     "debt_percent": 50.0,
     "debt_service_reserve_account_cost": 0.0,
+    "debt_service_reserve_account_cost_rvalue": 0.0,
     "decommissioning_reserve_account_cost": 0.0,
+    "decommissioning_reserve_account_cost_rvalue": 0.0,
     "dedicated_om_vessel_cost": 0.0,
     "degradation": [
         0.0
@@ -9457,6 +9467,7 @@
     "development_cost_input": 0.0,
     "development_cost_method": 2.0,
     "development_cost_modeled": 16536500.0,
+    "development_cost_rvalue": 0.0,
     "development_cost_total": 0.0,
     "development_override": 0.0,
     "development_shown": 0.0,
@@ -18944,15 +18955,17 @@
     "due_diligence_cost": 0.0,
     "e&m_shown": 0.0,
     "elec_infrac_shown": 0.0,
-    "elec_infras_cost": 21459900.0,
+    "elec_infras_cost": 19166200.0,
     "elec_infras_cost_input": 0.0,
     "elec_infras_cost_method": 2.0,
-    "elec_infras_cost_modeled": 21459900.0,
+    "elec_infras_cost_modeled": 19166200.0,
+    "elec_infras_cost_rvalue": 0.0,
     "elec_infras_cost_total": 0.0,
     "elec_infras_override": 0.0,
     "electrical_conversion_equipment_cost": 0.0,
     "electrical_equipment_onshore_substation_cost": 0.0,
     "electrical_generator_cost": 0.0,
+    "electrical_generator_cost_rvalue": 0.0,
     "electrical_generator_cost_total": 0.0,
     "electrical_generator_cost_total_check": 0.0,
     "en_batt": 1.0,
@@ -21886,11 +21899,13 @@
     "eng_and_mgmt_cost_input": 0.0,
     "eng_and_mgmt_cost_method": 2.0,
     "eng_and_mgmt_cost_modeled": 5655880.0,
+    "eng_and_mgmt_cost_rvalue": 0.0,
     "eng_and_mgmt_cost_total": 0.0,
     "eng_and_mgmt_override": 0.0,
     "engineering_certification_cost": 0.0,
     "entrance_exit_fees_cost": 0.0,
     "environmental_health_and_safety_monitoring_cost": 0.0,
+    "environmental_health_and_safety_monitoring_cost_rvalue": 0.0,
     "environmental_health_and_safety_monitoring_cost_total": 0.0,
     "environmental_health_and_safety_monitoring_cost_total_check": 0.0,
     "environmental_monitoring_cost": 0.0,
@@ -21912,10 +21927,17 @@
     "export_cable_system_cost": 0.0,
     "export_cable_system_cost_input": 0.0,
     "export_cable_system_cost_method": 0.0,
-    "export_cable_system_cost_modeled": 1603450.0,
+    "export_cable_system_cost_modeled": 813437.0,
+    "export_cable_system_cost_rvalue": 0.0,
     "export_cable_system_cost_total": 0.0,
     "export_cable_system_cost_total_check": 0.0,
     "export_cable_system_transportation_cost": 0.0,
+    "export_cable_type": 0.0,
+    "export_cable_voltage": 36.0,
+    "export_cable_voltage_calculated": 36.0,
+    "export_cable_voltage_choice": 0.0,
+    "export_cable_voltage_option_ac": 0.0,
+    "export_cable_voltage_option_hvdc": 0.0,
     "export_cables_cost": 0.0,
     "external_ballast_chambers_cost": 0.0,
     "fabrication_facilities_cost": 0.0,
@@ -21927,11 +21949,12 @@
     "feed_cost": 0.0,
     "financial_cost_input": 0.0,
     "financial_cost_override": 0.0,
-    "financial_cost_total": 32809600.0,
-    "financial_cost_total_mill": 32.8096,
+    "financial_cost_total": 32603200.0,
+    "financial_cost_total_mill": 32.6032,
     "financial_itemized_shown": 0.0,
     "financial_override_check": 0.0,
     "financing_and_incentives_cost": 0.0,
+    "financing_and_incentives_cost_rvalue": 0.0,
     "financing_and_incentives_cost_total": 0.0,
     "financing_and_incentives_cost_total_check": 0.0,
     "flip_target_percent": 10.0,
@@ -21941,6 +21964,7 @@
     "foundation_onshore_substation_cost": 0.0,
     "frequency_converter_cost": 0.0,
     "gearbox_cost": 0.0,
+    "gearbox_cost_rvalue": 0.0,
     "gearbox_cost_total": 0.0,
     "gearbox_cost_total_check": 0.0,
     "gears_cost": 0.0,
@@ -30732,12 +30756,14 @@
     "grid_interconnection_limit_kwac": 100000.0,
     "health_and_safety_monitoring_cost": 0.0,
     "health_safety_and_environmental_monitoring_cost": 0.0,
+    "health_safety_and_environmental_monitoring_cost_rvalue": 0.0,
     "health_safety_and_environmental_monitoring_cost_total": 0.0,
     "health_safety_and_environmental_monitoring_cost_total_check": 0.0,
     "health_safety_monitoring_cost": 0.0,
     "housing_cost": 0.0,
     "hub_assembly_cost": 0.0,
     "hydraulic_drivetrain_cost": 0.0,
+    "hydraulic_drivetrain_cost_rvalue": 0.0,
     "hydraulic_drivetrain_cost_total": 0.0,
     "hydraulic_drivetrain_cost_total_check": 0.0,
     "hydraulic_fluid_cost": 0.0,
@@ -30790,18 +30816,24 @@
     "incentives_cost": 0.0,
     "inflation_rate": 2.5,
     "initial_engineering_cost": 0.0,
+    "initial_engineering_cost_rvalue": 0.0,
     "initial_engineering_cost_total": 0.0,
     "initial_engineering_cost_total_check": 0.0,
-    "insurance_during_construction_cost": 3645510.0,
+    "insurance_during_construction_cost": 3622580.0,
     "insurance_during_construction_cost_input": 0.0,
-    "insurance_during_construction_cost_modeled_ui": 3645510.0,
+    "insurance_during_construction_cost_modeled_ui": 3622580.0,
+    "insurance_during_construction_cost_rvalue": 0.0,
     "insurance_during_construction_method": 2.0,
     "insurance_during_construction_modeled": 3430910.0,
     "insurance_operations_cost": 0.0,
     "insurance_rate": 0.0,
     "integration_assembly_testing_checkout_cost": 0.0,
     "inter_array_cable_length": 65340.0,
+    "inter_array_cable_voltage": 7.2,
+    "inter_array_cable_voltage_calculated": 7.2,
+    "inter_array_cable_voltage_option": 0.0,
     "interconnection_and_power_marketing_cost": 0.0,
+    "interconnection_and_power_marketing_cost_rvalue": 0.0,
     "interconnection_and_power_marketing_cost_total": 0.0,
     "interconnection_and_power_marketing_cost_total_check": 0.0,
     "interconnection_studies_and_fees_cost": 0.0,
@@ -30858,7 +30890,6 @@
     "legal_support_cost": 0.0,
     "level_check": 0.0,
     "level_eng": 0.0,
-    "level_value": 0.0,
     "lib_dispatch_factor1": 1.0,
     "lib_dispatch_factor2": 1.0,
     "lib_dispatch_factor3": 1.0,
@@ -32005,6 +32036,8 @@
     ],
     "library_folder_list": "x",
     "library_or_input_wec": 0.0,
+    "load_grid_voltage": 8.0,
+    "load_grid_voltage_options": 0.0,
     "loan_moratorium": 0.0,
     "location_id": 596791.0,
     "location_ts": "lat40.84_lon-124.25__2010",
@@ -32022,12 +32055,15 @@
     "maintenance_cost_input": 0.0,
     "maintenance_cost_method": 2.0,
     "maintenance_cost_modeled": 3658280.0,
+    "maintenance_cost_rvalue": 0.0,
     "maintenance_cost_total": 0.0,
     "maintenance_override_check": 0.0,
     "maintenance_reserve_account_cost": 0.0,
+    "maintenance_reserve_account_cost_rvalue": 0.0,
     "maintenance_we_shown": 0.0,
     "marine_coatings_cost": 0.0,
     "marine_energy_converter_device_cost": 0.0,
+    "marine_energy_converter_device_cost_rvalue": 0.0,
     "marine_energy_converter_device_cost_total": 0.0,
     "marine_energy_converter_device_cost_total_check": 0.0,
     "marine_energy_converter_power_consumption_cost": 0.0,
@@ -32037,6 +32073,7 @@
     "marine_management_cost": 0.0,
     "marine_system_cost_total_check": 0.0,
     "marine_systems_cost": 0.0,
+    "marine_systems_cost_rvalue": 0.0,
     "marine_systems_cost_total": 0.0,
     "mera_cost1": 0.0,
     "mera_cost2": 0.0,
@@ -32052,6 +32089,7 @@
     "mooring_found_substruc_cost_input": 0.0,
     "mooring_found_substruc_cost_method": 2.0,
     "mooring_found_substruc_cost_modeled": 52549700.0,
+    "mooring_found_substruc_cost_rvalue": 0.0,
     "mooring_found_substruc_cost_total": 0.0,
     "mooring_lines_cost": 0.0,
     "mooring_override": 0.0,
@@ -32068,16 +32106,19 @@
     "offshore_accommodations_platform_cost": 0.0,
     "offshore_accomodations_other_infras_cost": 0.0,
     "offshore_electrical_infrastructure_cost": 0.0,
+    "offshore_electrical_infrastructure_cost_rvalue": 0.0,
     "offshore_electrical_infrastructure_cost_total": 0.0,
     "offshore_electrical_infrastructure_cost_total_check": 0.0,
     "offshore_export_cables_assem_install_cost": 0.0,
     "offshore_logistical_infrastructure_assem_install_cost": 0.0,
     "offshore_logistical_infrastructure_other_infras_cost": 0.0,
     "offshore_substation_assem_install_cost": 0.0,
+    "offshore_substation_choice": 0.0,
     "offshore_substation_cost": 0.0,
     "offshore_substation_cost_input": 0.0,
     "offshore_substation_cost_method": 0.0,
-    "offshore_substation_cost_modeled": 2860000.0,
+    "offshore_substation_cost_modeled": 9709920.0,
+    "offshore_substation_cost_rvalue": 0.0,
     "offshore_substation_cost_total": 0.0,
     "offshore_substation_cost_total_check": 0.0,
     "offshore_substation_cost_total_display": 0.0,
@@ -32106,20 +32147,24 @@
     "om_replacement_cost_escal": 0.0,
     "onshore_electric_infrastructure_assem_install_cost": 0.0,
     "onshore_electrical_infrastructure_cost": 0.0,
+    "onshore_electrical_infrastructure_cost_rvalue": 0.0,
     "onshore_electrical_infrastructure_cost_total": 0.0,
     "onshore_electrical_infrastructure_cost_total_check": 0.0,
     "onshore_interconnection_rights_cost": 0.0,
     "onshore_land_lease_cost": 0.0,
     "onshore_om_facilities_cost": 0.0,
     "onshore_substation_assem_install_cost": 0.0,
+    "onshore_substation_choice": 0.0,
     "onshore_substation_cost": 0.0,
     "onshore_substation_cost_input": 0.0,
     "onshore_substation_cost_method": 0.0,
-    "onshore_substation_cost_modeled": 2145000.0,
+    "onshore_substation_cost_modeled": 1497220.0,
+    "onshore_substation_cost_rvalue": 0.0,
     "onshore_substation_cost_total": 0.0,
     "onshore_substation_cost_total_check": 0.0,
     "onshore_substations_cost": 0.0,
     "onshore_transmission_infrastructure_cost": 0.0,
+    "onshore_transmission_infrastructure_cost_rvalue": 0.0,
     "onshore_transmission_infrastructure_cost_total": 0.0,
     "onshore_transmission_infrastructure_cost_total_check": 0.0,
     "onshore_transmission_infrastructure_transportation_cost": 0.0,
@@ -32130,8 +32175,10 @@
     "operations_cost_input": 0.0,
     "operations_cost_method": 2.0,
     "operations_cost_modeled": 1773030.0,
+    "operations_cost_rvalue": 0.0,
     "operations_cost_total": 0.0,
     "operations_management_general_administration_cost": 0.0,
+    "operations_management_general_administration_cost_rvalue": 0.0,
     "operations_management_general_administration_cost_total": 0.0,
     "operations_management_general_administration_cost_total_check": 0.0,
     "operations_override_check": 0.0,
@@ -32150,6 +32197,7 @@
     "other_elec_infra_cost_input": 0.0,
     "other_elec_infra_cost_method": 0.0,
     "other_elec_infra_cost_modeled": 2037670.0,
+    "other_elec_infra_cost_rvalue": 0.0,
     "other_elec_infra_cost_total": 0.0,
     "other_electrical_generator_cost": 0.0,
     "other_eng_cost": 0.0,
@@ -32159,6 +32207,7 @@
     "other_financial_cost_input": 0.0,
     "other_financial_cost_method": 2.0,
     "other_financial_cost_modeled": 0.0,
+    "other_financial_cost_rvalue": 0.0,
     "other_financing_cost": 0.0,
     "other_gearbox_cost": 0.0,
     "other_gen_admin_cost": 0.0,
@@ -32169,6 +32218,7 @@
     "other_infrastructure_cost_input": 0.0,
     "other_infrastructure_cost_method": 2.0,
     "other_infrastructure_cost_modeled": 0.0,
+    "other_infrastructure_cost_rvalue": 0.0,
     "other_infrastructure_cost_total": 0.0,
     "other_infrastructure_transportation_other_infras_cost": 0.0,
     "other_initial_engineering_cost": 0.0,
@@ -32194,6 +32244,7 @@
     "other_pto_cost": 0.0,
     "other_pto_total": 0.0,
     "other_reserve_account_cost": 0.0,
+    "other_reserve_account_cost_rvalue": 0.0,
     "other_scheduled_maintenance_cost": 0.0,
     "other_shortterm_energy_storage_cost": 0.0,
     "other_site_access_cost": 0.0,
@@ -32203,6 +32254,7 @@
     "other_substructure_cost": 0.0,
     "other_unscheduled_maintenance_cost": 0.0,
     "outfitting_structure_cost": 0.0,
+    "outfitting_structure_cost_rvalue": 0.0,
     "outfitting_structure_cost_total": 0.0,
     "outfitting_structure_cost_total_check": 0.0,
     "overhead_lines_cost": 0.0,
@@ -32243,24 +32295,28 @@
     "pbi_uti_term": 10.0,
     "permit_acquisition_activities_cost": 0.0,
     "permitting_and_leasing_cost": 0.0,
+    "permitting_and_leasing_cost_rvalue": 0.0,
     "permitting_and_leasing_cost_total": 0.0,
     "permitting_and_leasing_cost_total_check": 0.0,
     "personnel_access_system_cost": 0.0,
     "personnel_access_system_mooring_cost": 0.0,
     "personnel_facilities_cost": 0.0,
-    "plant_commissioning_cost": 5832820.0,
+    "plant_commissioning_cost": 5796120.0,
     "plant_commissioning_cost_input": 0.0,
     "plant_commissioning_cost_method": 2.0,
     "plant_commissioning_cost_modeled": 5489460.0,
-    "plant_commissioning_cost_modeled_ui": 5832820.0,
+    "plant_commissioning_cost_modeled_ui": 5796120.0,
+    "plant_commissioning_cost_rvalue": 0.0,
     "plumbing_fittings_cost": 0.0,
     "port_fees_cost": 0.0,
+    "port_fees_cost_rvalue": 0.0,
     "port_fees_cost_total": 0.0,
     "port_fees_cost_total_check": 0.0,
     "port_fees_total": 0.0,
     "port_improvement_cost": 0.0,
     "power_electrical_system_cost": 0.0,
     "power_electronics_cost": 0.0,
+    "power_electronics_cost_rvalue": 0.0,
     "power_electronics_cost_total": 0.0,
     "power_electronics_cost_total_check": 0.0,
     "power_marketing_cost": 0.0,
@@ -32272,6 +32328,7 @@
     "power_takeoff_system_cost_input_label": 0.0,
     "power_takeoff_system_cost_method": 2.0,
     "power_takeoff_system_cost_modeled": 44014100.0,
+    "power_takeoff_system_cost_rvalue": 0.0,
     "power_takeoff_system_cost_total": 0.0,
     "power_takeoff_system_total_label": 0.0,
     "ppa_escalation": 1.0,
@@ -32284,6 +32341,7 @@
     "primary_hydraulic_pump_cost": 0.0,
     "primary_struct_assem_cost": 0.0,
     "prime_mover_cost": 0.0,
+    "prime_mover_cost_rvalue": 0.0,
     "prime_mover_cost_total": 0.0,
     "prime_mover_cost_total_check": 0.0,
     "procurement_cost": 0.0,
@@ -32295,17 +32353,19 @@
     "profit_eng_cost": 0.0,
     "project_certification_cost": 0.0,
     "project_certification_cost_total_display": 0.0,
-    "project_contingency_budget_cost": 18227600.0,
+    "project_contingency_budget_cost": 18112900.0,
+    "project_contingency_budget_cost_rvalue": 0.0,
     "project_contingency_cost_input": 0.0,
     "project_contingency_cost_method": 2.0,
-    "project_contingency_cost_modeled_ui": 18227600.0,
+    "project_contingency_cost_modeled_ui": 18112900.0,
     "project_contingency_modeled": 17154600.0,
     "project_management_during_development_cost": 0.0,
+    "project_management_during_development_cost_rvalue": 0.0,
     "project_management_during_development_cost_total": 0.0,
     "project_management_during_development_cost_total_check": 0.0,
     "prop_tax_assessed_decline": 0.0,
     "prop_tax_cost_assessed_percent": 100.0,
-    "property_assessed_value": 415494000.0,
+    "property_assessed_value": 412932000.0,
     "property_tax_rate": 0.0,
     "protection_control_cost": 0.0,
     "ptc_fed_amount": [
@@ -32352,10 +32412,11 @@
     ],
     "real_discount_rate": 5.5,
     "rectifying_circuit_cost": 0.0,
-    "reserve_accounts_cost": 10936500.0,
+    "reserve_accounts_cost": 10867700.0,
     "reserve_accounts_cost_input": 0.0,
     "reserve_accounts_cost_method": 2.0,
-    "reserve_accounts_cost_modeled_ui": 10936500.0,
+    "reserve_accounts_cost_modeled_ui": 10867700.0,
+    "reserve_accounts_cost_rvalue": 0.0,
     "reserve_accounts_cost_total": 0.0,
     "reserve_accounts_modeled": 10292700.0,
     "reserves_interest": 1.75,
@@ -32365,6 +32426,9 @@
     "revenue_capacity_payments_is_shown": 0.0,
     "revenue_curtailment_is_shown": 0.0,
     "riser_cable_length": 8250.0,
+    "riser_cable_voltage": 7.2,
+    "riser_cable_voltage_calculated": 7.2,
+    "riser_cable_voltage_option": 0.0,
     "rotors_cost": 0.0,
     "row_spacing": 600.0,
     "salaries_cost": 0.0,
@@ -32377,6 +32441,7 @@
     "salvage_value": 0.0,
     "scada_cost": 0.0,
     "scheduled_maintenance_cost": 0.0,
+    "scheduled_maintenance_cost_rvalue": 0.0,
     "scheduled_maintenance_cost_total": 0.0,
     "scheduled_maintenance_cost_total_check": 0.0,
     "scour_protection_assem_install_cost": 0.0,
@@ -35316,21 +35381,25 @@
         2.27728
     ],
     "site_access_override": 0.0,
-    "site_access_port_staging_cost": 4010060.0,
+    "site_access_port_staging_cost": 3984830.0,
     "site_access_port_staging_cost_input": 0.0,
     "site_access_port_staging_cost_method": 2.0,
     "site_access_port_staging_cost_modeled": 3774010.0,
-    "site_access_port_staging_cost_modeled_ui": 4010060.0,
+    "site_access_port_staging_cost_modeled_ui": 3984830.0,
+    "site_access_port_staging_cost_rvalue": 0.0,
     "site_access_port_staging_cost_total": 0.0,
     "site_access_shown": 0.0,
     "site_characterization_cost": 0.0,
+    "site_characterization_cost_rvalue": 0.0,
     "site_characterization_cost_total": 0.0,
     "site_characterization_cost_total_check": 0.0,
     "site_selection_cost": 0.0,
+    "site_selection_cost_rvalue": 0.0,
     "site_selection_cost_total": 0.0,
     "site_selection_cost_total_check": 0.0,
     "solution_mode_message": "",
     "staging_port_cost": 0.0,
+    "staging_port_cost_rvalue": 0.0,
     "staging_port_cost_total": 0.0,
     "staging_port_cost_total_check": 0.0,
     "stakeholder_outreach_cost": 0.0,
@@ -35348,6 +35417,7 @@
     "structural_assembly_cost_method": 2.0,
     "structural_assembly_cost_modeled": 198680000.0,
     "structural_assembly_cost_modeled_formatted": 198680000.0,
+    "structural_assembly_cost_rvalue": 0.0,
     "structural_assembly_cost_total": 0.0,
     "structure_foundations_cost": 0.0,
     "stuctural_assem_shown": 0.0,
@@ -35358,6 +35428,7 @@
     "substructure_assem_install_cost_total": 0.0,
     "substructure_assem_install_cost_total_check": 0.0,
     "substructures_and_foundations_cost": 0.0,
+    "substructures_and_foundations_cost_rvalue": 0.0,
     "system_capacity": 28600.0,
     "system_use_lifetime_output": 1.0,
     "term_int_rate": 4.0,
@@ -35375,16 +35446,16 @@
     "total_financial_cost_per_kwh": 0.0,
     "total_indirect_battery_cost": 0.0,
     "total_installed_battery_cost": 8290560.0,
-    "total_installed_cost": 415494000.0,
+    "total_installed_cost": 412932000.0,
     "total_installed_cost_lcoe": 0.0,
-    "total_installed_cost_mill": 415.494,
+    "total_installed_cost_mill": 412.932,
     "total_installed_cost_structural": 198680000.0,
     "total_operating_cost": 5431320.0,
     "total_operating_cost_mill": 5.43132,
     "total_operations_cost_lcoe": 0.0,
     "total_operations_cost_per_kwh": 0.0,
     "total_rated_capacity": 28600.0,
-    "total_test": 407204000.0,
+    "total_test": 404642000.0,
     "transmission_charges_rights_cost": 0.0,
     "transmission_towers_cost": 0.0,
     "transport_power_conversion_chain_cost": 0.0,
@@ -35409,6 +35480,7 @@
     "underground_cable_system_onshore_electrical_infrastructure_cost": 0.0,
     "unscheduled_maintenance_contingency_cost": 0.0,
     "unscheduled_maintenance_cost": 0.0,
+    "unscheduled_maintenance_cost_rvalue": 0.0,
     "unscheduled_maintenance_cost_total": 0.0,
     "unscheduled_maintenance_cost_total_check": 0.0,
     "ur_annual_min_charge": 0.0,
@@ -36963,9 +37035,14 @@
     "ur_yearzero_usage_peaks": [
         0.0
     ],
+    "use_offshore_substation_calc": 0.0,
+    "use_onshore_substation": 0.0,
     "use_wavefile_spacing": 0.0,
+    "user_export_cable_length": 0.0,
     "user_input_devices_per_row": 10.0,
     "user_input_number_rows": 10.0,
+    "user_inter_array_cable_length": 0.0,
+    "user_riser_cable_length": 0.0,
     "user_wave_power_matrix": [
         [
             0.0,
diff --git a/deploy/runtime/defaults/MEwave_LCOE Calculator.json b/deploy/runtime/defaults/MEwave_LCOE Calculator.json
index 4b25c29930..ccb96fcc20 100644
--- a/deploy/runtime/defaults/MEwave_LCOE Calculator.json	
+++ b/deploy/runtime/defaults/MEwave_LCOE Calculator.json	
@@ -4,13 +4,16 @@
     "additional_structural_components_cost": 0.0,
     "additional_structural_components_cost_total": 0.0,
     "air_turbine_cost": 0.0,
+    "air_turbine_cost_rvalue": 0.0,
     "air_turbine_cost_total": 0.0,
     "air_turbine_cost_total_check": 0.0,
     "anchors_and_piles_cost": 0.0,
     "ancillary_marine_systems_cost": 0.0,
+    "ancillary_marine_systems_cost_rvalue": 0.0,
     "ancillary_marine_systems_cost_total": 0.0,
     "ancillary_marine_systems_cost_total_check": 0.0,
     "annual_leases_fees_cost": 0.0,
+    "annual_leases_fees_cost_rvalue": 0.0,
     "annual_leases_fees_cost_total": 0.0,
     "annual_leases_fees_cost_total_check": 0.0,
     "array_cable_accessories_and_jointing_cost": 0.0,
@@ -18,9 +21,10 @@
     "array_cable_system_cost": 12813800.0,
     "array_cable_system_cost_input": 0.0,
     "array_cable_system_cost_method": 2.0,
-    "array_cable_system_cost_modeled": 12813800.0,
+    "array_cable_system_cost_modeled": 5107980.0,
+    "array_cable_system_cost_rvalue": 0.0,
     "array_cable_system_cost_total": 0.0,
-    "array_cable_system_cost_total_check": 12813800.0,
+    "array_cable_system_cost_total_check": 5107980.0,
     "array_cable_system_transportation_cost": 0.0,
     "array_cables_assem_install_cost": 0.0,
     "array_cables_cost": 0.0,
@@ -31,14 +35,15 @@
     "assembly_and_install_cost_input": 0.0,
     "assembly_and_install_cost_method": 2.0,
     "assembly_and_install_cost_modeled": 25655500.0,
+    "assembly_and_install_cost_rvalue": 0.0,
     "assembly_and_install_cost_total": 0.0,
     "assembly_and_install_override": 0.0,
     "assembly_areas_cost": 0.0,
     "average_power_flux": 32.2,
     "balance_of_system_cost_input": 0.0,
     "balance_of_system_cost_override": 0.0,
-    "balance_of_system_cost_total": 79150700.0,
-    "balance_of_system_cost_total_mill": 79.1507,
+    "balance_of_system_cost_total": 76795100.0,
+    "balance_of_system_cost_total_mill": 76.7951,
     "balance_of_system_scheduled_maintenance_cost": 0.0,
     "balance_of_system_unscheduled_maintenance_cost": 0.0,
     "ballast_system_cost": 0.0,
@@ -72,13 +77,15 @@
     "c_nominal_interest_rate": 4.0,
     "c_tax_rate": 28.0,
     "cable_accessories_and_jointing_cost": 0.0,
+    "cable_length_option": 0.0,
     "cable_mattresses_cost": 0.0,
     "cable_protection_cost": 0.0,
+    "cable_protection_cost_rvalue": 0.0,
     "cable_protection_cost_total": 0.0,
     "cable_protection_cost_total_check": 0.0,
     "cable_system_overbuild": 10.0,
-    "capex_check": 364551000.0,
-    "capital_cost": 407204000.0,
+    "capex_check": 362258000.0,
+    "capital_cost": 404642000.0,
     "carrying_cost_during_construction_cost": 0.0,
     "cathodic_protection_system_cost": 0.0,
     "city": "Eureka",
@@ -92,6 +99,7 @@
     "condition_monitoring_operations_cost": 0.0,
     "connecting_hardware_cost": 0.0,
     "construction_management_cost": 0.0,
+    "construction_management_cost_rvalue": 0.0,
     "construction_management_cost_total": 0.0,
     "construction_management_cost_total_check": 0.0,
     "cooling_system_cost": 0.0,
@@ -100,7 +108,9 @@
     "cranage_cost": 0.0,
     "data_source": "DOE-WPTO US Wave dataset",
     "debt_service_reserve_account_cost": 0.0,
+    "debt_service_reserve_account_cost_rvalue": 0.0,
     "decommissioning_reserve_account_cost": 0.0,
+    "decommissioning_reserve_account_cost_rvalue": 0.0,
     "dedicated_om_vessel_cost": 0.0,
     "desired_array_size": 500.0,
     "detailed_cost_choice_air_turbine": 0.0,
@@ -141,8 +151,8 @@
     "detailed_cost_choice_unscheduled_maintenance": 0.0,
     "detailed_cost_modeled_array_cables": 2.0,
     "detailed_cost_modeled_export_cables": 2.0,
-    "detailed_cost_modeled_offshore_substation": 2.0,
-    "detailed_cost_modeled_onshore_substation": 2.0,
+    "detailed_cost_modeled_offshore_substation": 0.0,
+    "detailed_cost_modeled_onshore_substation": 0.0,
     "detailed_cost_modeled_other_elec_infras": 1.0,
     "detailed_design_and_construction_eng_cost": 0.0,
     "detailed_design_and_construction_eng_cost_total": 0.0,
@@ -150,6 +160,7 @@
     "development_cost_input": 0.0,
     "development_cost_method": 2.0,
     "development_cost_modeled": 16536500.0,
+    "development_cost_rvalue": 0.0,
     "development_cost_total": 0.0,
     "development_override": 0.0,
     "development_shown": 0.0,
@@ -175,15 +186,17 @@
     "due_diligence_cost": 0.0,
     "e&m_shown": 0.0,
     "elec_infrac_shown": 0.0,
-    "elec_infras_cost": 21459900.0,
+    "elec_infras_cost": 19166200.0,
     "elec_infras_cost_input": 0.0,
     "elec_infras_cost_method": 2.0,
-    "elec_infras_cost_modeled": 21459900.0,
-    "elec_infras_cost_total": 21459900.0,
+    "elec_infras_cost_modeled": 19166200.0,
+    "elec_infras_cost_rvalue": 0.0,
+    "elec_infras_cost_total": 10819100.0,
     "elec_infras_override": 0.0,
     "electrical_conversion_equipment_cost": 0.0,
     "electrical_equipment_onshore_substation_cost": 0.0,
     "electrical_generator_cost": 0.0,
+    "electrical_generator_cost_rvalue": 0.0,
     "electrical_generator_cost_total": 0.0,
     "electrical_generator_cost_total_check": 0.0,
     "energy_period": [
@@ -3112,11 +3125,13 @@
     "eng_and_mgmt_cost_input": 0.0,
     "eng_and_mgmt_cost_method": 2.0,
     "eng_and_mgmt_cost_modeled": 5655880.0,
+    "eng_and_mgmt_cost_rvalue": 0.0,
     "eng_and_mgmt_cost_total": 0.0,
     "eng_and_mgmt_override": 0.0,
     "engineering_certification_cost": 0.0,
     "entrance_exit_fees_cost": 0.0,
     "environmental_health_and_safety_monitoring_cost": 0.0,
+    "environmental_health_and_safety_monitoring_cost_rvalue": 0.0,
     "environmental_health_and_safety_monitoring_cost_total": 0.0,
     "environmental_health_and_safety_monitoring_cost_total_check": 0.0,
     "environmental_monitoring_cost": 0.0,
@@ -3130,10 +3145,17 @@
     "export_cable_system_cost": 1603450.0,
     "export_cable_system_cost_input": 0.0,
     "export_cable_system_cost_method": 2.0,
-    "export_cable_system_cost_modeled": 1603450.0,
+    "export_cable_system_cost_modeled": 813437.0,
+    "export_cable_system_cost_rvalue": 0.0,
     "export_cable_system_cost_total": 0.0,
-    "export_cable_system_cost_total_check": 1603450.0,
+    "export_cable_system_cost_total_check": 813437.0,
     "export_cable_system_transportation_cost": 0.0,
+    "export_cable_type": 0.0,
+    "export_cable_voltage": 36.0,
+    "export_cable_voltage_calculated": 36.0,
+    "export_cable_voltage_choice": 0.0,
+    "export_cable_voltage_option_ac": 0.0,
+    "export_cable_voltage_option_hvdc": 0.0,
     "export_cables_cost": 0.0,
     "external_ballast_chambers_cost": 0.0,
     "fabrication_facilities_cost": 0.0,
@@ -3142,11 +3164,12 @@
     "feed_cost": 0.0,
     "financial_cost_input": 0.0,
     "financial_cost_override": 0.0,
-    "financial_cost_total": 32809600.0,
-    "financial_cost_total_mill": 32.8096,
+    "financial_cost_total": 32603200.0,
+    "financial_cost_total_mill": 32.6032,
     "financial_itemized_shown": 0.0,
     "financial_override_check": 0.0,
     "financing_and_incentives_cost": 0.0,
+    "financing_and_incentives_cost_rvalue": 0.0,
     "financing_and_incentives_cost_total": 0.0,
     "financing_and_incentives_cost_total_check": 0.0,
     "fixed_charge_rate": 0.108,
@@ -3157,6 +3180,7 @@
     "frequency_converter_cost": 0.0,
     "frequency_sum": 99.89,
     "gearbox_cost": 0.0,
+    "gearbox_cost_rvalue": 0.0,
     "gearbox_cost_total": 0.0,
     "gearbox_cost_total_check": 0.0,
     "gears_cost": 0.0,
@@ -3164,12 +3188,14 @@
     "geological_and_bathymetry_cost": 0.0,
     "health_and_safety_monitoring_cost": 0.0,
     "health_safety_and_environmental_monitoring_cost": 0.0,
+    "health_safety_and_environmental_monitoring_cost_rvalue": 0.0,
     "health_safety_and_environmental_monitoring_cost_total": 0.0,
     "health_safety_and_environmental_monitoring_cost_total_check": 0.0,
     "health_safety_monitoring_cost": 0.0,
     "housing_cost": 0.0,
     "hub_assembly_cost": 0.0,
     "hydraulic_drivetrain_cost": 0.0,
+    "hydraulic_drivetrain_cost_rvalue": 0.0,
     "hydraulic_drivetrain_cost_total": 0.0,
     "hydraulic_drivetrain_cost_total_check": 0.0,
     "hydraulic_fluid_cost": 0.0,
@@ -3177,17 +3203,23 @@
     "hydraulic_reservoir_cost": 0.0,
     "incentives_cost": 0.0,
     "initial_engineering_cost": 0.0,
+    "initial_engineering_cost_rvalue": 0.0,
     "initial_engineering_cost_total": 0.0,
     "initial_engineering_cost_total_check": 0.0,
-    "insurance_during_construction_cost": 3645510.0,
+    "insurance_during_construction_cost": 3622580.0,
     "insurance_during_construction_cost_input": 0.0,
-    "insurance_during_construction_cost_modeled_ui": 3645510.0,
+    "insurance_during_construction_cost_modeled_ui": 3622580.0,
+    "insurance_during_construction_cost_rvalue": 0.0,
     "insurance_during_construction_method": 2.0,
     "insurance_during_construction_modeled": 3645510.0,
     "insurance_operations_cost": 0.0,
     "integration_assembly_testing_checkout_cost": 0.0,
     "inter_array_cable_length": 65340.0,
+    "inter_array_cable_voltage": 7.2,
+    "inter_array_cable_voltage_calculated": 7.2,
+    "inter_array_cable_voltage_option": 0.0,
     "interconnection_and_power_marketing_cost": 0.0,
+    "interconnection_and_power_marketing_cost_rvalue": 0.0,
     "interconnection_and_power_marketing_cost_total": 0.0,
     "interconnection_and_power_marketing_cost_total_check": 0.0,
     "interconnection_studies_and_fees_cost": 0.0,
@@ -3217,7 +3249,6 @@
     "legal_support_cost": 0.0,
     "level_check": 0.0,
     "level_eng": 0.0,
-    "level_value": 0.0,
     "lib_wave_device": "RM3",
     "lib_wave_power_matrix": [
         [
@@ -3727,6 +3758,8 @@
     ],
     "library_folder_list": "x",
     "library_or_input_wec": 0.0,
+    "load_grid_voltage": 8.0,
+    "load_grid_voltage_options": 0.0,
     "location": "Humboldt Bay - DOE Reference",
     "location_id": 596791.0,
     "location_ts": "lat40.84_lon-124.25__2010",
@@ -3744,12 +3777,15 @@
     "maintenance_cost_input": 0.0,
     "maintenance_cost_method": 2.0,
     "maintenance_cost_modeled": 3658280.0,
+    "maintenance_cost_rvalue": 0.0,
     "maintenance_cost_total": 0.0,
     "maintenance_override_check": 0.0,
     "maintenance_reserve_account_cost": 0.0,
+    "maintenance_reserve_account_cost_rvalue": 0.0,
     "maintenance_we_shown": 0.0,
     "marine_coatings_cost": 0.0,
     "marine_energy_converter_device_cost": 0.0,
+    "marine_energy_converter_device_cost_rvalue": 0.0,
     "marine_energy_converter_device_cost_total": 0.0,
     "marine_energy_converter_device_cost_total_check": 0.0,
     "marine_energy_converter_power_consumption_cost": 0.0,
@@ -3759,6 +3795,7 @@
     "marine_management_cost": 0.0,
     "marine_system_cost_total_check": 0.0,
     "marine_systems_cost": 0.0,
+    "marine_systems_cost_rvalue": 0.0,
     "marine_systems_cost_total": 0.0,
     "max_frequency": 5.56,
     "max_frequency_Hs": 1.25,
@@ -3769,6 +3806,7 @@
     "mooring_found_substruc_cost_input": 0.0,
     "mooring_found_substruc_cost_method": 2.0,
     "mooring_found_substruc_cost_modeled": 52549700.0,
+    "mooring_found_substruc_cost_rvalue": 0.0,
     "mooring_found_substruc_cost_total": 0.0,
     "mooring_lines_cost": 0.0,
     "mooring_override": 0.0,
@@ -3785,16 +3823,19 @@
     "offshore_accommodations_platform_cost": 0.0,
     "offshore_accomodations_other_infras_cost": 0.0,
     "offshore_electrical_infrastructure_cost": 0.0,
+    "offshore_electrical_infrastructure_cost_rvalue": 0.0,
     "offshore_electrical_infrastructure_cost_total": 0.0,
     "offshore_electrical_infrastructure_cost_total_check": 0.0,
     "offshore_export_cables_assem_install_cost": 0.0,
     "offshore_logistical_infrastructure_assem_install_cost": 0.0,
     "offshore_logistical_infrastructure_other_infras_cost": 0.0,
     "offshore_substation_assem_install_cost": 0.0,
+    "offshore_substation_choice": 0.0,
     "offshore_substation_cost": 2860000.0,
     "offshore_substation_cost_input": 0.0,
     "offshore_substation_cost_method": 2.0,
-    "offshore_substation_cost_modeled": 2860000.0,
+    "offshore_substation_cost_modeled": 9709920.0,
+    "offshore_substation_cost_rvalue": 0.0,
     "offshore_substation_cost_total": 0.0,
     "offshore_substation_cost_total_check": 2860000.0,
     "offshore_substation_cost_total_display": 0.0,
@@ -3806,20 +3847,24 @@
     ],
     "onshore_electric_infrastructure_assem_install_cost": 0.0,
     "onshore_electrical_infrastructure_cost": 0.0,
+    "onshore_electrical_infrastructure_cost_rvalue": 0.0,
     "onshore_electrical_infrastructure_cost_total": 0.0,
     "onshore_electrical_infrastructure_cost_total_check": 0.0,
     "onshore_interconnection_rights_cost": 0.0,
     "onshore_land_lease_cost": 0.0,
     "onshore_om_facilities_cost": 0.0,
     "onshore_substation_assem_install_cost": 0.0,
+    "onshore_substation_choice": 0.0,
     "onshore_substation_cost": 0.0,
     "onshore_substation_cost_input": 0.0,
     "onshore_substation_cost_method": 2.0,
-    "onshore_substation_cost_modeled": 2145000.0,
+    "onshore_substation_cost_modeled": 1497220.0,
+    "onshore_substation_cost_rvalue": 0.0,
     "onshore_substation_cost_total": 0.0,
-    "onshore_substation_cost_total_check": 2145000.0,
+    "onshore_substation_cost_total_check": 0.0,
     "onshore_substations_cost": 0.0,
     "onshore_transmission_infrastructure_cost": 0.0,
+    "onshore_transmission_infrastructure_cost_rvalue": 4.881280364167879e252,
     "onshore_transmission_infrastructure_cost_total": 0.0,
     "onshore_transmission_infrastructure_cost_total_check": 0.0,
     "onshore_transmission_infrastructure_transportation_cost": 0.0,
@@ -3830,8 +3875,10 @@
     "operations_cost_input": 0.0,
     "operations_cost_method": 2.0,
     "operations_cost_modeled": 1773030.0,
+    "operations_cost_rvalue": 0.0,
     "operations_cost_total": 0.0,
     "operations_management_general_administration_cost": 0.0,
+    "operations_management_general_administration_cost_rvalue": 0.0,
     "operations_management_general_administration_cost_total": 0.0,
     "operations_management_general_administration_cost_total_check": 0.0,
     "operations_override_check": 0.0,
@@ -3850,6 +3897,7 @@
     "other_elec_infra_cost_input": 0.0,
     "other_elec_infra_cost_method": 2.0,
     "other_elec_infra_cost_modeled": 2037670.0,
+    "other_elec_infra_cost_rvalue": 0.0,
     "other_elec_infra_cost_total": 2037670.0,
     "other_electrical_generator_cost": 0.0,
     "other_eng_cost": 0.0,
@@ -3859,6 +3907,7 @@
     "other_financial_cost_input": 0.0,
     "other_financial_cost_method": 2.0,
     "other_financial_cost_modeled": 0.0,
+    "other_financial_cost_rvalue": 0.0,
     "other_financing_cost": 0.0,
     "other_gearbox_cost": 0.0,
     "other_gen_admin_cost": 0.0,
@@ -3869,6 +3918,7 @@
     "other_infrastructure_cost_input": 0.0,
     "other_infrastructure_cost_method": 2.0,
     "other_infrastructure_cost_modeled": 0.0,
+    "other_infrastructure_cost_rvalue": 0.0,
     "other_infrastructure_cost_total": 0.0,
     "other_infrastructure_transportation_other_infras_cost": 0.0,
     "other_initial_engineering_cost": 0.0,
@@ -3894,6 +3944,7 @@
     "other_pto_cost": 0.0,
     "other_pto_total": 0.0,
     "other_reserve_account_cost": 0.0,
+    "other_reserve_account_cost_rvalue": 0.0,
     "other_scheduled_maintenance_cost": 0.0,
     "other_shortterm_energy_storage_cost": 0.0,
     "other_site_access_cost": 0.0,
@@ -3903,6 +3954,7 @@
     "other_substructure_cost": 0.0,
     "other_unscheduled_maintenance_cost": 0.0,
     "outfitting_structure_cost": 0.0,
+    "outfitting_structure_cost_rvalue": 0.0,
     "outfitting_structure_cost_total": 0.0,
     "outfitting_structure_cost_total_check": 0.0,
     "overhead_lines_cost": 0.0,
@@ -3910,24 +3962,28 @@
     "override_check_structural": 0.0,
     "permit_acquisition_activities_cost": 0.0,
     "permitting_and_leasing_cost": 0.0,
+    "permitting_and_leasing_cost_rvalue": 0.0,
     "permitting_and_leasing_cost_total": 0.0,
     "permitting_and_leasing_cost_total_check": 0.0,
     "personnel_access_system_cost": 0.0,
     "personnel_access_system_mooring_cost": 0.0,
     "personnel_facilities_cost": 0.0,
-    "plant_commissioning_cost": 5832820.0,
+    "plant_commissioning_cost": 5796120.0,
     "plant_commissioning_cost_input": 0.0,
     "plant_commissioning_cost_method": 2.0,
     "plant_commissioning_cost_modeled": 5832820.0,
-    "plant_commissioning_cost_modeled_ui": 5832820.0,
+    "plant_commissioning_cost_modeled_ui": 5796120.0,
+    "plant_commissioning_cost_rvalue": 0.0,
     "plumbing_fittings_cost": 0.0,
     "port_fees_cost": 0.0,
+    "port_fees_cost_rvalue": 0.0,
     "port_fees_cost_total": 0.0,
     "port_fees_cost_total_check": 0.0,
     "port_fees_total": 0.0,
     "port_improvement_cost": 0.0,
     "power_electrical_system_cost": 0.0,
     "power_electronics_cost": 0.0,
+    "power_electronics_cost_rvalue": 0.0,
     "power_electronics_cost_total": 0.0,
     "power_electronics_cost_total_check": 0.0,
     "power_marketing_cost": 0.0,
@@ -3939,12 +3995,14 @@
     "power_takeoff_system_cost_input_label": 0.0,
     "power_takeoff_system_cost_method": 2.0,
     "power_takeoff_system_cost_modeled": 44014100.0,
+    "power_takeoff_system_cost_rvalue": 0.0,
     "power_takeoff_system_cost_total": 0.0,
     "power_takeoff_system_total_label": 0.0,
     "pre_feed_cost": 0.0,
     "primary_hydraulic_pump_cost": 0.0,
     "primary_struct_assem_cost": 0.0,
     "prime_mover_cost": 0.0,
+    "prime_mover_cost_rvalue": 0.0,
     "prime_mover_cost_total": 0.0,
     "prime_mover_cost_total_check": 0.0,
     "procurement_cost": 0.0,
@@ -3956,12 +4014,14 @@
     "profit_eng_cost": 0.0,
     "project_certification_cost": 0.0,
     "project_certification_cost_total_display": 0.0,
-    "project_contingency_budget_cost": 18227600.0,
+    "project_contingency_budget_cost": 18112900.0,
+    "project_contingency_budget_cost_rvalue": 0.0,
     "project_contingency_cost_input": 0.0,
     "project_contingency_cost_method": 2.0,
-    "project_contingency_cost_modeled_ui": 18227600.0,
+    "project_contingency_cost_modeled_ui": 18112900.0,
     "project_contingency_modeled": 18227600.0,
     "project_management_during_development_cost": 0.0,
+    "project_management_during_development_cost_rvalue": 0.0,
     "project_management_during_development_cost_total": 0.0,
     "project_management_during_development_cost_total_check": 0.0,
     "protection_control_cost": 0.0,
@@ -3971,15 +4031,19 @@
     "quayside_docking_fees_cost": 0.0,
     "railings_cost": 0.0,
     "rectifying_circuit_cost": 0.0,
-    "reserve_accounts_cost": 10936500.0,
+    "reserve_accounts_cost": 10867700.0,
     "reserve_accounts_cost_input": 0.0,
     "reserve_accounts_cost_method": 2.0,
-    "reserve_accounts_cost_modeled_ui": 10936500.0,
+    "reserve_accounts_cost_modeled_ui": 10867700.0,
+    "reserve_accounts_cost_rvalue": 0.0,
     "reserve_accounts_cost_total": 0.0,
     "reserve_accounts_modeled": 10936500.0,
     "resource_and_metocean_assessment_cost": 0.0,
     "resource_assessment_cost": 0.0,
     "riser_cable_length": 8250.0,
+    "riser_cable_voltage": 7.2,
+    "riser_cable_voltage_calculated": 7.2,
+    "riser_cable_voltage_option": 0.0,
     "rotors_cost": 0.0,
     "row_spacing": 600.0,
     "salaries_cost": 0.0,
@@ -3989,6 +4053,7 @@
     "sales_general_and_administrative_operations_cost": 0.0,
     "scada_cost": 0.0,
     "scheduled_maintenance_cost": 0.0,
+    "scheduled_maintenance_cost_rvalue": 0.0,
     "scheduled_maintenance_cost_total": 0.0,
     "scheduled_maintenance_cost_total_check": 0.0,
     "scour_protection_assem_install_cost": 0.0,
@@ -6925,20 +6990,24 @@
         2.27728
     ],
     "site_access_override": 0.0,
-    "site_access_port_staging_cost": 4010060.0,
+    "site_access_port_staging_cost": 3984830.0,
     "site_access_port_staging_cost_input": 0.0,
     "site_access_port_staging_cost_method": 2.0,
     "site_access_port_staging_cost_modeled": 4010060.0,
-    "site_access_port_staging_cost_modeled_ui": 4010060.0,
+    "site_access_port_staging_cost_modeled_ui": 3984830.0,
+    "site_access_port_staging_cost_rvalue": 0.0,
     "site_access_port_staging_cost_total": 0.0,
     "site_access_shown": 0.0,
     "site_characterization_cost": 0.0,
+    "site_characterization_cost_rvalue": 0.0,
     "site_characterization_cost_total": 0.0,
     "site_characterization_cost_total_check": 0.0,
     "site_selection_cost": 0.0,
+    "site_selection_cost_rvalue": 0.0,
     "site_selection_cost_total": 0.0,
     "site_selection_cost_total_check": 0.0,
     "staging_port_cost": 0.0,
+    "staging_port_cost_rvalue": 0.0,
     "staging_port_cost_total": 0.0,
     "staging_port_cost_total_check": 0.0,
     "stakeholder_outreach_cost": 0.0,
@@ -6954,6 +7023,7 @@
     "structural_assembly_cost_method": 2.0,
     "structural_assembly_cost_modeled": 198680000.0,
     "structural_assembly_cost_modeled_formatted": 198680000.0,
+    "structural_assembly_cost_rvalue": 0.0,
     "structural_assembly_cost_total": 0.0,
     "structure_foundations_cost": 0.0,
     "stuctural_assem_shown": 0.0,
@@ -6964,6 +7034,7 @@
     "substructure_assem_install_cost_total": 0.0,
     "substructure_assem_install_cost_total_check": 0.0,
     "substructures_and_foundations_cost": 0.0,
+    "substructures_and_foundations_cost_rvalue": 0.0,
     "system_capacity": 28600.0,
     "test_num": 0.0,
     "topside_cost": 0.0,
@@ -6974,16 +7045,16 @@
     "total_device_cost_per_kwh": 0.0,
     "total_financial_cost_lcoe": 0.0,
     "total_financial_cost_per_kwh": 0.0,
-    "total_installed_cost": 407204000.0,
+    "total_installed_cost": 404642000.0,
     "total_installed_cost_lcoe": 0.0,
-    "total_installed_cost_mill": 407.204,
+    "total_installed_cost_mill": 404.642,
     "total_installed_cost_structural": 198680000.0,
     "total_operating_cost": 5431320.0,
     "total_operating_cost_mill": 5.43132,
     "total_operations_cost_lcoe": 0.0,
     "total_operations_cost_per_kwh": 0.0,
     "total_rated_capacity": 28600.0,
-    "total_test": 407204000.0,
+    "total_test": 404642000.0,
     "transmission_charges_rights_cost": 0.0,
     "transmission_towers_cost": 0.0,
     "transport_power_conversion_chain_cost": 0.0,
@@ -6994,7 +7065,7 @@
     "turbine_bearings_cost": 0.0,
     "tz": -8.0,
     "ui_capital_cost_capacity": 0.0,
-    "ui_capital_cost_reference": 407204000.0,
+    "ui_capital_cost_reference": 404642000.0,
     "ui_cfin": 0.0,
     "ui_crf": 0.0,
     "ui_fcr_input_option": 0.0,
@@ -7013,11 +7084,17 @@
     "underground_cable_system_onshore_electrical_infrastructure_cost": 0.0,
     "unscheduled_maintenance_contingency_cost": 0.0,
     "unscheduled_maintenance_cost": 0.0,
+    "unscheduled_maintenance_cost_rvalue": 0.0,
     "unscheduled_maintenance_cost_total": 0.0,
     "unscheduled_maintenance_cost_total_check": 0.0,
+    "use_offshore_substation_calc": 0.0,
+    "use_onshore_substation": 0.0,
     "use_wavefile_spacing": 0.0,
+    "user_export_cable_length": 0.0,
     "user_input_devices_per_row": 10.0,
     "user_input_number_rows": 10.0,
+    "user_inter_array_cable_length": 0.0,
+    "user_riser_cable_length": 0.0,
     "user_wave_power_matrix": [
         [
             0.0,
diff --git a/deploy/runtime/defaults/MEwave_None.json b/deploy/runtime/defaults/MEwave_None.json
index 444891b9be..ba8aec65eb 100644
--- a/deploy/runtime/defaults/MEwave_None.json
+++ b/deploy/runtime/defaults/MEwave_None.json
@@ -2,6 +2,7 @@
     "array_sizing_mode": 0.0,
     "average_power_flux": 32.2,
     "bathymetry": "Gently Sloping",
+    "cable_length_option": 0.0,
     "cable_system_overbuild": 10.0,
     "city": "Eureka",
     "country": "United States",
@@ -2944,9 +2945,18 @@
     ],
     "export_cable_length": 5555.0,
     "export_cable_redundancy": 0.0,
+    "export_cable_type": 0.0,
+    "export_cable_voltage": 36.0,
+    "export_cable_voltage_calculated": 7.2,
+    "export_cable_voltage_choice": 0.0,
+    "export_cable_voltage_option_ac": 0.0,
+    "export_cable_voltage_option_hvdc": 0.0,
     "floating_array": 1.0,
     "frequency_sum": 99.89,
     "inter_array_cable_length": 0.0,
+    "inter_array_cable_voltage": 7.2,
+    "inter_array_cable_voltage_calculated": 7.2,
+    "inter_array_cable_voltage_option": 0.0,
     "lat": 40.8398,
     "lib_wave_device": "RM3",
     "lib_wave_power_matrix": [
@@ -3457,6 +3467,8 @@
     ],
     "library_folder_list": "x",
     "library_or_input_wec": 0.0,
+    "load_grid_voltage": 7.2,
+    "load_grid_voltage_options": 0.0,
     "location": "Humboldt Bay - DOE Reference",
     "location_id": 596791.0,
     "location_ts": "lat40.84_lon-124.25__2010",
@@ -3477,7 +3489,12 @@
     "number_hours": 0.0,
     "number_records": 0.0,
     "number_rows": 1.0,
+    "offshore_substation_choice": 0.0,
+    "onshore_substation_choice": 0.0,
     "riser_cable_length": 82.5,
+    "riser_cable_voltage": 7.2,
+    "riser_cable_voltage_calculated": 7.2,
+    "riser_cable_voltage_option": 0.0,
     "row_spacing": 600.0,
     "sea_bed": "Sand and Clay",
     "significant_wave_height": [
@@ -6407,9 +6424,14 @@
     "tz": -8.0,
     "ui_step_minutes": 180.0,
     "ui_wave_resource_model_choice": 0.0,
+    "use_offshore_substation_calc": 0.0,
+    "use_onshore_substation": 0.0,
     "use_wavefile_spacing": 0.0,
+    "user_export_cable_length": 0.0,
     "user_input_devices_per_row": 10.0,
     "user_input_number_rows": 3.0,
+    "user_inter_array_cable_length": 0.0,
+    "user_riser_cable_length": 0.0,
     "user_wave_power_matrix": [
         [
             0.0,
diff --git a/deploy/runtime/defaults/MEwave_Single Owner.json b/deploy/runtime/defaults/MEwave_Single Owner.json
index 43209ade88..33a4ed7d24 100644
--- a/deploy/runtime/defaults/MEwave_Single Owner.json	
+++ b/deploy/runtime/defaults/MEwave_Single Owner.json	
@@ -4,15 +4,18 @@
     "additional_structural_components_cost": 0.0,
     "additional_structural_components_cost_total": 0.0,
     "air_turbine_cost": 0.0,
+    "air_turbine_cost_rvalue": 0.0,
     "air_turbine_cost_total": 0.0,
     "air_turbine_cost_total_check": 0.0,
     "analysis_period": 30.0,
     "analysis_period_warning": "",
     "anchors_and_piles_cost": 0.0,
     "ancillary_marine_systems_cost": 0.0,
+    "ancillary_marine_systems_cost_rvalue": 0.0,
     "ancillary_marine_systems_cost_total": 0.0,
     "ancillary_marine_systems_cost_total_check": 0.0,
     "annual_leases_fees_cost": 0.0,
+    "annual_leases_fees_cost_rvalue": 0.0,
     "annual_leases_fees_cost_total": 0.0,
     "annual_leases_fees_cost_total_check": 0.0,
     "array_cable_accessories_and_jointing_cost": 0.0,
@@ -20,7 +23,8 @@
     "array_cable_system_cost": 0.0,
     "array_cable_system_cost_input": 0.0,
     "array_cable_system_cost_method": 0.0,
-    "array_cable_system_cost_modeled": 12813800.0,
+    "array_cable_system_cost_modeled": 5107980.0,
+    "array_cable_system_cost_rvalue": 0.0,
     "array_cable_system_cost_total": 0.0,
     "array_cable_system_cost_total_check": 0.0,
     "array_cable_system_transportation_cost": 0.0,
@@ -33,13 +37,14 @@
     "assembly_and_install_cost_input": 0.0,
     "assembly_and_install_cost_method": 2.0,
     "assembly_and_install_cost_modeled": 25655500.0,
+    "assembly_and_install_cost_rvalue": 0.0,
     "assembly_and_install_cost_total": 0.0,
     "assembly_and_install_override": 0.0,
     "assembly_areas_cost": 0.0,
     "balance_of_system_cost_input": 0.0,
     "balance_of_system_cost_override": 0.0,
-    "balance_of_system_cost_total": 79150700.0,
-    "balance_of_system_cost_total_mill": 79.1507,
+    "balance_of_system_cost_total": 76795100.0,
+    "balance_of_system_cost_total_mill": 76.7951,
     "balance_of_system_scheduled_maintenance_cost": 0.0,
     "balance_of_system_unscheduled_maintenance_cost": 0.0,
     "ballast_system_cost": 0.0,
@@ -53,12 +58,14 @@
     "building_facilities_cost": 0.0,
     "buoyancy_chamber_cost": 0.0,
     "cable_accessories_and_jointing_cost": 0.0,
+    "cable_length_option": 0.0,
     "cable_mattresses_cost": 0.0,
     "cable_protection_cost": 0.0,
+    "cable_protection_cost_rvalue": 0.0,
     "cable_protection_cost_total": 0.0,
     "cable_protection_cost_total_check": 0.0,
     "cable_system_overbuild": 10.0,
-    "capex_check": 364551000.0,
+    "capex_check": 362258000.0,
     "carrying_cost_during_construction_cost": 0.0,
     "cathodic_protection_system_cost": 0.0,
     "cbi_fed_amount": 0.0,
@@ -95,7 +102,7 @@
     "condition_monitoring_cost": 0.0,
     "condition_monitoring_operations_cost": 0.0,
     "connecting_hardware_cost": 0.0,
-    "const_per_interest1": 3563030.0,
+    "const_per_interest1": 3540620.0,
     "const_per_interest2": 0.0,
     "const_per_interest3": 0.0,
     "const_per_interest4": 0.0,
@@ -105,7 +112,7 @@
     "const_per_interest_rate3": 0.0,
     "const_per_interest_rate4": 0.0,
     "const_per_interest_rate5": 0.0,
-    "const_per_interest_total": 3563030.0,
+    "const_per_interest_total": 3540620.0,
     "const_per_months1": 6.0,
     "const_per_months2": 0.0,
     "const_per_months3": 0.0,
@@ -122,13 +129,13 @@
     "const_per_percent4": 0.0,
     "const_per_percent5": 0.0,
     "const_per_percent_total": 100.0,
-    "const_per_principal1": 407204000.0,
+    "const_per_principal1": 404642000.0,
     "const_per_principal2": 0.0,
     "const_per_principal3": 0.0,
     "const_per_principal4": 0.0,
     "const_per_principal5": 0.0,
-    "const_per_principal_total": 407204000.0,
-    "const_per_total1": 7635070.0,
+    "const_per_principal_total": 404642000.0,
+    "const_per_total1": 7587030.0,
     "const_per_total2": 0.0,
     "const_per_total3": 0.0,
     "const_per_total4": 0.0,
@@ -138,8 +145,9 @@
     "const_per_upfront_rate3": 0.0,
     "const_per_upfront_rate4": 0.0,
     "const_per_upfront_rate5": 0.0,
-    "construction_financing_cost": 7635070.0,
+    "construction_financing_cost": 7587030.0,
     "construction_management_cost": 0.0,
+    "construction_management_cost_rvalue": 0.0,
     "construction_management_cost_total": 0.0,
     "construction_management_cost_total_check": 0.0,
     "cooling_system_cost": 0.0,
@@ -163,7 +171,9 @@
     "debt_option": 1.0,
     "debt_percent": 50.0,
     "debt_service_reserve_account_cost": 0.0,
+    "debt_service_reserve_account_cost_rvalue": 0.0,
     "decommissioning_reserve_account_cost": 0.0,
+    "decommissioning_reserve_account_cost_rvalue": 0.0,
     "dedicated_om_vessel_cost": 0.0,
     "degradation": [
         0.0
@@ -259,6 +269,7 @@
     "development_cost_input": 0.0,
     "development_cost_method": 2.0,
     "development_cost_modeled": 16536500.0,
+    "development_cost_rvalue": 0.0,
     "development_cost_total": 0.0,
     "development_override": 0.0,
     "development_shown": 0.0,
@@ -9077,15 +9088,17 @@
     "due_diligence_cost": 0.0,
     "e&m_shown": 0.0,
     "elec_infrac_shown": 0.0,
-    "elec_infras_cost": 21459900.0,
+    "elec_infras_cost": 19166200.0,
     "elec_infras_cost_input": 0.0,
     "elec_infras_cost_method": 2.0,
-    "elec_infras_cost_modeled": 21459900.0,
+    "elec_infras_cost_modeled": 19166200.0,
+    "elec_infras_cost_rvalue": 0.0,
     "elec_infras_cost_total": 0.0,
     "elec_infras_override": 0.0,
     "electrical_conversion_equipment_cost": 0.0,
     "electrical_equipment_onshore_substation_cost": 0.0,
     "electrical_generator_cost": 0.0,
+    "electrical_generator_cost_rvalue": 0.0,
     "electrical_generator_cost_total": 0.0,
     "electrical_generator_cost_total_check": 0.0,
     "en_electricity_rates": 0.0,
@@ -12016,11 +12029,13 @@
     "eng_and_mgmt_cost_input": 0.0,
     "eng_and_mgmt_cost_method": 2.0,
     "eng_and_mgmt_cost_modeled": 5655880.0,
+    "eng_and_mgmt_cost_rvalue": 0.0,
     "eng_and_mgmt_cost_total": 0.0,
     "eng_and_mgmt_override": 0.0,
     "engineering_certification_cost": 0.0,
     "entrance_exit_fees_cost": 0.0,
     "environmental_health_and_safety_monitoring_cost": 0.0,
+    "environmental_health_and_safety_monitoring_cost_rvalue": 0.0,
     "environmental_health_and_safety_monitoring_cost_total": 0.0,
     "environmental_health_and_safety_monitoring_cost_total_check": 0.0,
     "environmental_monitoring_cost": 0.0,
@@ -12042,10 +12057,17 @@
     "export_cable_system_cost": 0.0,
     "export_cable_system_cost_input": 0.0,
     "export_cable_system_cost_method": 0.0,
-    "export_cable_system_cost_modeled": 1603450.0,
+    "export_cable_system_cost_modeled": 813437.0,
+    "export_cable_system_cost_rvalue": 0.0,
     "export_cable_system_cost_total": 0.0,
     "export_cable_system_cost_total_check": 0.0,
     "export_cable_system_transportation_cost": 0.0,
+    "export_cable_type": 0.0,
+    "export_cable_voltage": 36.0,
+    "export_cable_voltage_calculated": 36.0,
+    "export_cable_voltage_choice": 0.0,
+    "export_cable_voltage_option_ac": 0.0,
+    "export_cable_voltage_option_hvdc": 100.0,
     "export_cables_cost": 0.0,
     "external_ballast_chambers_cost": 0.0,
     "fabrication_facilities_cost": 0.0,
@@ -12057,11 +12079,12 @@
     "feed_cost": 0.0,
     "financial_cost_input": 0.0,
     "financial_cost_override": 0.0,
-    "financial_cost_total": 32809600.0,
-    "financial_cost_total_mill": 32.8096,
+    "financial_cost_total": 32603200.0,
+    "financial_cost_total_mill": 32.6032,
     "financial_itemized_shown": 0.0,
     "financial_override_check": 0.0,
     "financing_and_incentives_cost": 0.0,
+    "financing_and_incentives_cost_rvalue": 0.0,
     "financing_and_incentives_cost_total": 0.0,
     "financing_and_incentives_cost_total_check": 0.0,
     "flip_target_percent": 10.0,
@@ -12071,6 +12094,7 @@
     "foundation_onshore_substation_cost": 0.0,
     "frequency_converter_cost": 0.0,
     "gearbox_cost": 0.0,
+    "gearbox_cost_rvalue": 0.0,
     "gearbox_cost_total": 0.0,
     "gearbox_cost_total_check": 0.0,
     "gears_cost": 0.0,
@@ -20845,12 +20869,14 @@
     "grid_interconnection_limit_kwac": 100000.0,
     "health_and_safety_monitoring_cost": 0.0,
     "health_safety_and_environmental_monitoring_cost": 0.0,
+    "health_safety_and_environmental_monitoring_cost_rvalue": 0.0,
     "health_safety_and_environmental_monitoring_cost_total": 0.0,
     "health_safety_and_environmental_monitoring_cost_total_check": 0.0,
     "health_safety_monitoring_cost": 0.0,
     "housing_cost": 0.0,
     "hub_assembly_cost": 0.0,
     "hydraulic_drivetrain_cost": 0.0,
+    "hydraulic_drivetrain_cost_rvalue": 0.0,
     "hydraulic_drivetrain_cost_total": 0.0,
     "hydraulic_drivetrain_cost_total_check": 0.0,
     "hydraulic_fluid_cost": 0.0,
@@ -20903,18 +20929,24 @@
     "incentives_cost": 0.0,
     "inflation_rate": 2.5,
     "initial_engineering_cost": 0.0,
+    "initial_engineering_cost_rvalue": 0.0,
     "initial_engineering_cost_total": 0.0,
     "initial_engineering_cost_total_check": 0.0,
-    "insurance_during_construction_cost": 3645510.0,
+    "insurance_during_construction_cost": 3622580.0,
     "insurance_during_construction_cost_input": 0.0,
-    "insurance_during_construction_cost_modeled_ui": 3645510.0,
+    "insurance_during_construction_cost_modeled_ui": 3622580.0,
+    "insurance_during_construction_cost_rvalue": 0.0,
     "insurance_during_construction_method": 2.0,
     "insurance_during_construction_modeled": 3430910.0,
     "insurance_operations_cost": 0.0,
     "insurance_rate": 0.0,
     "integration_assembly_testing_checkout_cost": 0.0,
     "inter_array_cable_length": 65340.0,
+    "inter_array_cable_voltage": 7.2,
+    "inter_array_cable_voltage_calculated": 7.2,
+    "inter_array_cable_voltage_option": 0.0,
     "interconnection_and_power_marketing_cost": 0.0,
+    "interconnection_and_power_marketing_cost_rvalue": 0.0,
     "interconnection_and_power_marketing_cost_total": 0.0,
     "interconnection_and_power_marketing_cost_total_check": 0.0,
     "interconnection_studies_and_fees_cost": 0.0,
@@ -20971,7 +21003,6 @@
     "legal_support_cost": 0.0,
     "level_check": 0.0,
     "level_eng": 0.0,
-    "level_value": 0.0,
     "lib_dispatch_factor1": 1.0,
     "lib_dispatch_factor2": 1.0,
     "lib_dispatch_factor3": 1.0,
@@ -22118,6 +22149,8 @@
     ],
     "library_folder_list": "x",
     "library_or_input_wec": 0.0,
+    "load_grid_voltage": 8.0,
+    "load_grid_voltage_options": 0.0,
     "loan_moratorium": 0.0,
     "location_id": 596791.0,
     "location_ts": "lat40.84_lon-124.25__2010",
@@ -22135,12 +22168,15 @@
     "maintenance_cost_input": 0.0,
     "maintenance_cost_method": 2.0,
     "maintenance_cost_modeled": 3658280.0,
+    "maintenance_cost_rvalue": 0.0,
     "maintenance_cost_total": 0.0,
     "maintenance_override_check": 0.0,
     "maintenance_reserve_account_cost": 0.0,
+    "maintenance_reserve_account_cost_rvalue": 0.0,
     "maintenance_we_shown": 0.0,
     "marine_coatings_cost": 0.0,
     "marine_energy_converter_device_cost": 0.0,
+    "marine_energy_converter_device_cost_rvalue": 0.0,
     "marine_energy_converter_device_cost_total": 0.0,
     "marine_energy_converter_device_cost_total_check": 0.0,
     "marine_energy_converter_power_consumption_cost": 0.0,
@@ -22150,6 +22186,7 @@
     "marine_management_cost": 0.0,
     "marine_system_cost_total_check": 0.0,
     "marine_systems_cost": 0.0,
+    "marine_systems_cost_rvalue": 0.0,
     "marine_systems_cost_total": 0.0,
     "mera_cost1": 0.0,
     "mera_cost2": 0.0,
@@ -22165,6 +22202,7 @@
     "mooring_found_substruc_cost_input": 0.0,
     "mooring_found_substruc_cost_method": 2.0,
     "mooring_found_substruc_cost_modeled": 52549700.0,
+    "mooring_found_substruc_cost_rvalue": 0.0,
     "mooring_found_substruc_cost_total": 0.0,
     "mooring_lines_cost": 0.0,
     "mooring_override": 0.0,
@@ -22181,16 +22219,19 @@
     "offshore_accommodations_platform_cost": 0.0,
     "offshore_accomodations_other_infras_cost": 0.0,
     "offshore_electrical_infrastructure_cost": 0.0,
+    "offshore_electrical_infrastructure_cost_rvalue": 0.0,
     "offshore_electrical_infrastructure_cost_total": 0.0,
     "offshore_electrical_infrastructure_cost_total_check": 0.0,
     "offshore_export_cables_assem_install_cost": 0.0,
     "offshore_logistical_infrastructure_assem_install_cost": 0.0,
     "offshore_logistical_infrastructure_other_infras_cost": 0.0,
     "offshore_substation_assem_install_cost": 0.0,
+    "offshore_substation_choice": 0.0,
     "offshore_substation_cost": 0.0,
     "offshore_substation_cost_input": 0.0,
     "offshore_substation_cost_method": 0.0,
-    "offshore_substation_cost_modeled": 2860000.0,
+    "offshore_substation_cost_modeled": 9709920.0,
+    "offshore_substation_cost_rvalue": 0.0,
     "offshore_substation_cost_total": 0.0,
     "offshore_substation_cost_total_check": 0.0,
     "offshore_substation_cost_total_display": 0.0,
@@ -22202,20 +22243,24 @@
     ],
     "onshore_electric_infrastructure_assem_install_cost": 0.0,
     "onshore_electrical_infrastructure_cost": 0.0,
+    "onshore_electrical_infrastructure_cost_rvalue": 0.0,
     "onshore_electrical_infrastructure_cost_total": 0.0,
     "onshore_electrical_infrastructure_cost_total_check": 0.0,
     "onshore_interconnection_rights_cost": 0.0,
     "onshore_land_lease_cost": 0.0,
     "onshore_om_facilities_cost": 0.0,
     "onshore_substation_assem_install_cost": 0.0,
+    "onshore_substation_choice": 0.0,
     "onshore_substation_cost": 0.0,
     "onshore_substation_cost_input": 0.0,
     "onshore_substation_cost_method": 0.0,
-    "onshore_substation_cost_modeled": 2145000.0,
+    "onshore_substation_cost_modeled": 1497220.0,
+    "onshore_substation_cost_rvalue": 0.0,
     "onshore_substation_cost_total": 0.0,
     "onshore_substation_cost_total_check": 0.0,
     "onshore_substations_cost": 0.0,
     "onshore_transmission_infrastructure_cost": 0.0,
+    "onshore_transmission_infrastructure_cost_rvalue": 0.0,
     "onshore_transmission_infrastructure_cost_total": 0.0,
     "onshore_transmission_infrastructure_cost_total_check": 0.0,
     "onshore_transmission_infrastructure_transportation_cost": 0.0,
@@ -22226,8 +22271,10 @@
     "operations_cost_input": 0.0,
     "operations_cost_method": 2.0,
     "operations_cost_modeled": 1773030.0,
+    "operations_cost_rvalue": 0.0,
     "operations_cost_total": 0.0,
     "operations_management_general_administration_cost": 0.0,
+    "operations_management_general_administration_cost_rvalue": 0.0,
     "operations_management_general_administration_cost_total": 0.0,
     "operations_management_general_administration_cost_total_check": 0.0,
     "operations_override_check": 0.0,
@@ -22246,6 +22293,7 @@
     "other_elec_infra_cost_input": 0.0,
     "other_elec_infra_cost_method": 0.0,
     "other_elec_infra_cost_modeled": 2037670.0,
+    "other_elec_infra_cost_rvalue": 0.0,
     "other_elec_infra_cost_total": 0.0,
     "other_electrical_generator_cost": 0.0,
     "other_eng_cost": 0.0,
@@ -22255,6 +22303,7 @@
     "other_financial_cost_input": 0.0,
     "other_financial_cost_method": 2.0,
     "other_financial_cost_modeled": 0.0,
+    "other_financial_cost_rvalue": 0.0,
     "other_financing_cost": 0.0,
     "other_gearbox_cost": 0.0,
     "other_gen_admin_cost": 0.0,
@@ -22265,6 +22314,7 @@
     "other_infrastructure_cost_input": 0.0,
     "other_infrastructure_cost_method": 2.0,
     "other_infrastructure_cost_modeled": 0.0,
+    "other_infrastructure_cost_rvalue": 0.0,
     "other_infrastructure_cost_total": 0.0,
     "other_infrastructure_transportation_other_infras_cost": 0.0,
     "other_initial_engineering_cost": 0.0,
@@ -22290,6 +22340,7 @@
     "other_pto_cost": 0.0,
     "other_pto_total": 0.0,
     "other_reserve_account_cost": 0.0,
+    "other_reserve_account_cost_rvalue": 0.0,
     "other_scheduled_maintenance_cost": 0.0,
     "other_shortterm_energy_storage_cost": 0.0,
     "other_site_access_cost": 0.0,
@@ -22299,6 +22350,7 @@
     "other_substructure_cost": 0.0,
     "other_unscheduled_maintenance_cost": 0.0,
     "outfitting_structure_cost": 0.0,
+    "outfitting_structure_cost_rvalue": 0.0,
     "outfitting_structure_cost_total": 0.0,
     "outfitting_structure_cost_total_check": 0.0,
     "overhead_lines_cost": 0.0,
@@ -22339,24 +22391,28 @@
     "pbi_uti_term": 10.0,
     "permit_acquisition_activities_cost": 0.0,
     "permitting_and_leasing_cost": 0.0,
+    "permitting_and_leasing_cost_rvalue": 0.0,
     "permitting_and_leasing_cost_total": 0.0,
     "permitting_and_leasing_cost_total_check": 0.0,
     "personnel_access_system_cost": 0.0,
     "personnel_access_system_mooring_cost": 0.0,
     "personnel_facilities_cost": 0.0,
-    "plant_commissioning_cost": 5832820.0,
+    "plant_commissioning_cost": 5796120.0,
     "plant_commissioning_cost_input": 0.0,
     "plant_commissioning_cost_method": 2.0,
     "plant_commissioning_cost_modeled": 5489460.0,
-    "plant_commissioning_cost_modeled_ui": 5832820.0,
+    "plant_commissioning_cost_modeled_ui": 5796120.0,
+    "plant_commissioning_cost_rvalue": 0.0,
     "plumbing_fittings_cost": 0.0,
     "port_fees_cost": 0.0,
+    "port_fees_cost_rvalue": 0.0,
     "port_fees_cost_total": 0.0,
     "port_fees_cost_total_check": 0.0,
     "port_fees_total": 0.0,
     "port_improvement_cost": 0.0,
     "power_electrical_system_cost": 0.0,
     "power_electronics_cost": 0.0,
+    "power_electronics_cost_rvalue": 0.0,
     "power_electronics_cost_total": 0.0,
     "power_electronics_cost_total_check": 0.0,
     "power_marketing_cost": 0.0,
@@ -22368,6 +22424,7 @@
     "power_takeoff_system_cost_input_label": 0.0,
     "power_takeoff_system_cost_method": 2.0,
     "power_takeoff_system_cost_modeled": 44014100.0,
+    "power_takeoff_system_cost_rvalue": 0.0,
     "power_takeoff_system_cost_total": 0.0,
     "power_takeoff_system_total_label": 0.0,
     "ppa_escalation": 1.0,
@@ -22380,6 +22437,7 @@
     "primary_hydraulic_pump_cost": 0.0,
     "primary_struct_assem_cost": 0.0,
     "prime_mover_cost": 0.0,
+    "prime_mover_cost_rvalue": 0.0,
     "prime_mover_cost_total": 0.0,
     "prime_mover_cost_total_check": 0.0,
     "procurement_cost": 0.0,
@@ -22391,17 +22449,19 @@
     "profit_eng_cost": 0.0,
     "project_certification_cost": 0.0,
     "project_certification_cost_total_display": 0.0,
-    "project_contingency_budget_cost": 18227600.0,
+    "project_contingency_budget_cost": 18112900.0,
+    "project_contingency_budget_cost_rvalue": 0.0,
     "project_contingency_cost_input": 0.0,
     "project_contingency_cost_method": 2.0,
-    "project_contingency_cost_modeled_ui": 18227600.0,
+    "project_contingency_cost_modeled_ui": 18112900.0,
     "project_contingency_modeled": 17154600.0,
     "project_management_during_development_cost": 0.0,
+    "project_management_during_development_cost_rvalue": 0.0,
     "project_management_during_development_cost_total": 0.0,
     "project_management_during_development_cost_total_check": 0.0,
     "prop_tax_assessed_decline": 0.0,
     "prop_tax_cost_assessed_percent": 100.0,
-    "property_assessed_value": 407204000.0,
+    "property_assessed_value": 404642000.0,
     "property_tax_rate": 0.0,
     "protection_control_cost": 0.0,
     "ptc_fed_amount": [
@@ -22424,10 +22484,11 @@
     ],
     "real_discount_rate": 5.5,
     "rectifying_circuit_cost": 0.0,
-    "reserve_accounts_cost": 10936500.0,
+    "reserve_accounts_cost": 10867700.0,
     "reserve_accounts_cost_input": 0.0,
     "reserve_accounts_cost_method": 2.0,
-    "reserve_accounts_cost_modeled_ui": 10936500.0,
+    "reserve_accounts_cost_modeled_ui": 10867700.0,
+    "reserve_accounts_cost_rvalue": 0.0,
     "reserve_accounts_cost_total": 0.0,
     "reserve_accounts_modeled": 10292700.0,
     "reserves_interest": 1.75,
@@ -22437,6 +22498,9 @@
     "revenue_capacity_payments_is_shown": 0.0,
     "revenue_curtailment_is_shown": 0.0,
     "riser_cable_length": 8250.0,
+    "riser_cable_voltage": 7.2,
+    "riser_cable_voltage_calculated": 7.2,
+    "riser_cable_voltage_option": 0.0,
     "rotors_cost": 0.0,
     "row_spacing": 600.0,
     "salaries_cost": 0.0,
@@ -22449,6 +22513,7 @@
     "salvage_value": 0.0,
     "scada_cost": 0.0,
     "scheduled_maintenance_cost": 0.0,
+    "scheduled_maintenance_cost_rvalue": 0.0,
     "scheduled_maintenance_cost_total": 0.0,
     "scheduled_maintenance_cost_total_check": 0.0,
     "scour_protection_assem_install_cost": 0.0,
@@ -25388,21 +25453,25 @@
         2.27728
     ],
     "site_access_override": 0.0,
-    "site_access_port_staging_cost": 4010060.0,
+    "site_access_port_staging_cost": 3984830.0,
     "site_access_port_staging_cost_input": 0.0,
     "site_access_port_staging_cost_method": 2.0,
     "site_access_port_staging_cost_modeled": 3774010.0,
-    "site_access_port_staging_cost_modeled_ui": 4010060.0,
+    "site_access_port_staging_cost_modeled_ui": 3984830.0,
+    "site_access_port_staging_cost_rvalue": 0.0,
     "site_access_port_staging_cost_total": 0.0,
     "site_access_shown": 0.0,
     "site_characterization_cost": 0.0,
+    "site_characterization_cost_rvalue": 0.0,
     "site_characterization_cost_total": 0.0,
     "site_characterization_cost_total_check": 0.0,
     "site_selection_cost": 0.0,
+    "site_selection_cost_rvalue": 0.0,
     "site_selection_cost_total": 0.0,
     "site_selection_cost_total_check": 0.0,
     "solution_mode_message": "",
     "staging_port_cost": 0.0,
+    "staging_port_cost_rvalue": 0.0,
     "staging_port_cost_total": 0.0,
     "staging_port_cost_total_check": 0.0,
     "stakeholder_outreach_cost": 0.0,
@@ -25420,6 +25489,7 @@
     "structural_assembly_cost_method": 2.0,
     "structural_assembly_cost_modeled": 198680000.0,
     "structural_assembly_cost_modeled_formatted": 198680000.0,
+    "structural_assembly_cost_rvalue": 0.0,
     "structural_assembly_cost_total": 0.0,
     "structure_foundations_cost": 0.0,
     "stuctural_assem_shown": 0.0,
@@ -25430,6 +25500,7 @@
     "substructure_assem_install_cost_total": 0.0,
     "substructure_assem_install_cost_total_check": 0.0,
     "substructures_and_foundations_cost": 0.0,
+    "substructures_and_foundations_cost_rvalue": 0.0,
     "system_capacity": 28600.0,
     "system_use_lifetime_output": 0.0,
     "term_int_rate": 4.0,
@@ -25444,16 +25515,16 @@
     "total_device_cost_per_kwh": 0.0,
     "total_financial_cost_lcoe": 0.0,
     "total_financial_cost_per_kwh": 0.0,
-    "total_installed_cost": 407204000.0,
+    "total_installed_cost": 404642000.0,
     "total_installed_cost_lcoe": 0.0,
-    "total_installed_cost_mill": 407.204,
+    "total_installed_cost_mill": 404.642,
     "total_installed_cost_structural": 198680000.0,
     "total_operating_cost": 5431320.0,
     "total_operating_cost_mill": 5.43132,
     "total_operations_cost_lcoe": 0.0,
     "total_operations_cost_per_kwh": 0.0,
     "total_rated_capacity": 28600.0,
-    "total_test": 407204000.0,
+    "total_test": 404642000.0,
     "transmission_charges_rights_cost": 0.0,
     "transmission_towers_cost": 0.0,
     "transport_power_conversion_chain_cost": 0.0,
@@ -25471,6 +25542,7 @@
     "underground_cable_system_onshore_electrical_infrastructure_cost": 0.0,
     "unscheduled_maintenance_contingency_cost": 0.0,
     "unscheduled_maintenance_cost": 0.0,
+    "unscheduled_maintenance_cost_rvalue": 0.0,
     "unscheduled_maintenance_cost_total": 0.0,
     "unscheduled_maintenance_cost_total_check": 0.0,
     "ur_annual_min_charge": 0.0,
@@ -27025,9 +27097,14 @@
     "ur_yearzero_usage_peaks": [
         0.0
     ],
+    "use_offshore_substation_calc": 0.0,
+    "use_onshore_substation": 0.0,
     "use_wavefile_spacing": 0.0,
+    "user_export_cable_length": 0.0,
     "user_input_devices_per_row": 10.0,
     "user_input_number_rows": 10.0,
+    "user_inter_array_cable_length": 0.0,
+    "user_riser_cable_length": 0.0,
     "user_wave_power_matrix": [
         [
             0.0,
diff --git a/deploy/runtime/macros/MEtidal/ME Tidal Report.lk b/deploy/runtime/macros/MEtidal/ME Tidal Report.lk
index b491fc2a14..d116fd795f 100644
--- a/deploy/runtime/macros/MEtidal/ME Tidal Report.lk	
+++ b/deploy/runtime/macros/MEtidal/ME Tidal Report.lk	
@@ -1219,7 +1219,7 @@ reportCode =
      '<h2>Financials</h2>'
 	'<table>'
          '<tr>'
-            '<th colspan="2">Finacials</th>'
+            '<th colspan="2">Financials</th>'
         '</tr>'
          '<tr>'
              '<td>Levelized Cost of Energy</td>'
diff --git a/deploy/runtime/macros/MEwave/ME Wave Report.lk b/deploy/runtime/macros/MEwave/ME Wave Report.lk
index 1654a9f4e2..d9e6076692 100644
--- a/deploy/runtime/macros/MEwave/ME Wave Report.lk	
+++ b/deploy/runtime/macros/MEwave/ME Wave Report.lk	
@@ -1301,7 +1301,7 @@ reportCode =
      '<h2>Financials</h2>'
 	'<table>'
          '<tr>'
-            '<th colspan="2">Finacials</th>'
+            '<th colspan="2">Financials</th>'
         '</tr>'
          '<tr>'
              '<td>Levelized Cost of Energy</td>'
diff --git a/deploy/runtime/startup.lk b/deploy/runtime/startup.lk
index 49724ea7e8..4c3133870c 100644
--- a/deploy/runtime/startup.lk
+++ b/deploy/runtime/startup.lk
@@ -2204,7 +2204,10 @@ setup_electricity_purchases();
 function setup_metidal_pages(lcoe_fcr)
 {
 	addpage( [[ 'Marine Tidal Resource']], { 'sidebar'='Tidal Resource', 'help'='me_tidal_resource' } );
-	addpage( [[ 'Marine Tidal Converter' ]], { 'sidebar'='Tidal Energy Converter', 'help'='me_tidal_converter' } );
+	addpage( [[ {'name'='Marine Tidal Converter', 'caption'='Tidal Converter Library'}],
+			[{'name'='Marine Tidal Converter User', 'caption'='Tidal Converter Input'}],
+			[{'name'='Marine Tidal Turbine Design', 'caption'='Tidal Converter Design'}]], 
+		{ 'sidebar'='Tidal Energy Converter', 'help'='me_tidal_converter', 'exclusive_var'='tidal_design_excl','exclusive_tab'=true, 'exclusive_hide'=true, 'exclusive_header_pages'=['Marine Tidal Converter Header'] } );
 	addpage( [[ 'Marine Array' ]], { 'sidebar'='Array', 'help'='me_tidal_array' } );
 	addpage( [[ 'Marine Losses' ]], { 'sidebar'='Losses', 'help'='me_tidal_losses' } );
 	if (lcoe_fcr == 1) {
diff --git a/deploy/runtime/ui/Marine Array.json b/deploy/runtime/ui/Marine Array.json
index 0343da7b3f..f90a829254 100644
--- a/deploy/runtime/ui/Marine Array.json	
+++ b/deploy/runtime/ui/Marine Array.json	
@@ -1,7 +1,7 @@
 {
     "Name": "Marine Array",
-    "Width": 807.0,
-    "Height": 590.0,
+    "Width": 802.0,
+    "Height": 1025.0,
     "FormObjects": {
         "GroupBox": {
             "Visible": 1.0,
@@ -61,7 +61,7 @@
                 },
                 "Height": {
                     "Type": 3.0,
-                    "Integer": 458.0
+                    "Integer": 899.0
                 },
                 "Tool Tip": {
                     "Type": 5.0,
@@ -126,6 +126,55 @@
                 }
             }
         },
+        "RadioChoice": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "cable_length_option"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 42.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 633.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 318.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 45.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Selection": {
+                    "Type": 3.0,
+                    "Integer": 0.0
+                },
+                "Items": {
+                    "Type": 6.0,
+                    "StringList": "Calculate cable lengths|Enter cable lengths"
+                },
+                "ShowCaptions": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "Horizontal": {
+                    "Type": 2.0,
+                    "Boolean": 0.0
+                },
+                "TabOrder": {
+                    "Type": 3.0,
+                    "Integer": -1.0
+                }
+            }
+        },
         "Numeric": {
             "Visible": 1.0,
             "ObjectProperties": {
@@ -139,7 +188,7 @@
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 378.0
+                    "Integer": 390.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -147,7 +196,7 @@
                 },
                 "Height": {
                     "Type": 3.0,
-                    "Integer": 21.0
+                    "Integer": 24.0
                 },
                 "Tool Tip": {
                     "Type": 5.0,
@@ -305,7 +354,7 @@
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 207.0
+                    "Integer": 213.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -313,7 +362,7 @@
                 },
                 "Height": {
                     "Type": 3.0,
-                    "Integer": 21.0
+                    "Integer": 24.0
                 },
                 "Tool Tip": {
                     "Type": 5.0,
@@ -388,7 +437,7 @@
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 183.0
+                    "Integer": 186.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -396,7 +445,7 @@
                 },
                 "Height": {
                     "Type": 3.0,
-                    "Integer": 21.0
+                    "Integer": 24.0
                 },
                 "Tool Tip": {
                     "Type": 5.0,
@@ -471,7 +520,7 @@
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 288.0
+                    "Integer": 300.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -479,7 +528,7 @@
                 },
                 "Height": {
                     "Type": 3.0,
-                    "Integer": 21.0
+                    "Integer": 24.0
                 },
                 "Tool Tip": {
                     "Type": 5.0,
@@ -554,7 +603,7 @@
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 288.0
+                    "Integer": 300.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -562,7 +611,7 @@
                 },
                 "Height": {
                     "Type": 3.0,
-                    "Integer": 21.0
+                    "Integer": 24.0
                 },
                 "Tool Tip": {
                     "Type": 5.0,
@@ -633,11 +682,11 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 258.0
+                    "Integer": 513.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 513.0
+                    "Integer": 654.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -645,7 +694,7 @@
                 },
                 "Height": {
                     "Type": 3.0,
-                    "Integer": 21.0
+                    "Integer": 24.0
                 },
                 "Tool Tip": {
                     "Type": 5.0,
@@ -720,48 +769,7 @@
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 429.0
-                },
-                "Width": {
-                    "Type": 3.0,
-                    "Integer": 27.0
-                },
-                "Height": {
-                    "Type": 3.0,
-                    "Integer": 24.0
-                },
-                "Tool Tip": {
-                    "Type": 5.0,
-                    "String": ""
-                },
-                "Caption": {
-                    "Type": 5.0,
-                    "String": ""
-                },
-                "State": {
-                    "Type": 2.0,
-                    "Boolean": 1.0
-                },
-                "TabOrder": {
-                    "Type": 3.0,
-                    "Integer": -1.0
-                }
-            }
-        },
-        "CheckBox": {
-            "Visible": 1.0,
-            "ObjectProperties": {
-                "Name": {
-                    "Type": 5.0,
-                    "String": "floating_array"
-                },
-                "X": {
-                    "Type": 3.0,
-                    "Integer": 258.0
-                },
-                "Y": {
-                    "Type": 3.0,
-                    "Integer": 402.0
+                    "Integer": 444.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -794,15 +802,15 @@
             "ObjectProperties": {
                 "Name": {
                     "Type": 5.0,
-                    "String": "inter_array_cable_length"
+                    "String": "export_cable_voltage"
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 258.0
+                    "Integer": 210.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 489.0
+                    "Integer": 771.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -810,7 +818,7 @@
                 },
                 "Height": {
                     "Type": 3.0,
-                    "Integer": 21.0
+                    "Integer": 24.0
                 },
                 "Tool Tip": {
                     "Type": 5.0,
@@ -842,7 +850,7 @@
                 },
                 "ThousandsSep": {
                     "Type": 2.0,
-                    "Boolean": 0.0
+                    "Boolean": 1.0
                 },
                 "Editable": {
                     "Type": 2.0,
@@ -868,7 +876,48 @@
                 },
                 "TabOrder": {
                     "Type": 3.0,
-                    "Integer": 4.0
+                    "Integer": -1.0
+                }
+            }
+        },
+        "Choice": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "export_cable_voltage_choice"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 366.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 771.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 312.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 24.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Items": {
+                    "Type": 6.0,
+                    "StringList": "Use Modeled Voltage|7.2kV AC|12kV AC|36kV AC|66kV AC|72.5kV AC|145kV AC|220kV AC|400kV AC|150kV HVDC|300kV HVDC"
+                },
+                "Selection": {
+                    "Type": 3.0,
+                    "Integer": -1.0
+                },
+                "TabOrder": {
+                    "Type": 3.0,
+                    "Integer": -1.0
                 }
             }
         },
@@ -877,23 +926,23 @@
             "ObjectProperties": {
                 "Name": {
                     "Type": 5.0,
-                    "String": "layout_instructions"
+                    "String": "export_cable_voltage_lbl"
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 621.0
+                    "Integer": 312.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 21.0
+                    "Integer": 774.0
                 },
                 "Width": {
                     "Type": 3.0,
-                    "Integer": 165.0
+                    "Integer": 51.0
                 },
                 "Height": {
                     "Type": 3.0,
-                    "Integer": 78.0
+                    "Integer": 21.0
                 },
                 "Tool Tip": {
                     "Type": 5.0,
@@ -901,7 +950,7 @@
                 },
                 "Caption": {
                     "Type": 5.0,
-                    "String": "Specify the number of devices using the Array Layout parameters below."
+                    "String": "kV AC"
                 },
                 "TextColour": {
                     "Type": 4.0,
@@ -922,7 +971,7 @@
                 },
                 "WordWrap": {
                     "Type": 2.0,
-                    "Boolean": 1.0
+                    "Boolean": 0.0
                 },
                 "AlignRight": {
                     "Type": 2.0,
@@ -930,36 +979,48 @@
                 },
                 "AlignTop": {
                     "Type": 2.0,
-                    "Boolean": 1.0
+                    "Boolean": 0.0
                 }
             }
         },
-        "Plot": {
+        "CheckBox": {
             "Visible": 1.0,
             "ObjectProperties": {
                 "Name": {
                     "Type": 5.0,
-                    "String": "mhk_array_plot"
+                    "String": "floating_array"
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 411.0
+                    "Integer": 258.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 147.0
+                    "Integer": 417.0
                 },
                 "Width": {
                     "Type": 3.0,
-                    "Integer": 340.0
+                    "Integer": 27.0
                 },
                 "Height": {
                     "Type": 3.0,
-                    "Integer": 320.0
+                    "Integer": 24.0
                 },
                 "Tool Tip": {
                     "Type": 5.0,
                     "String": ""
+                },
+                "Caption": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "State": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "TabOrder": {
+                    "Type": 3.0,
+                    "Integer": -1.0
                 }
             }
         },
@@ -968,19 +1029,19 @@
             "ObjectProperties": {
                 "Name": {
                     "Type": 5.0,
-                    "String": "number_devices"
+                    "String": "inter_array_cable_length"
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 483.0
+                    "Integer": 513.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 45.0
+                    "Integer": 627.0
                 },
                 "Width": {
                     "Type": 3.0,
-                    "Integer": 90.0
+                    "Integer": 100.0
                 },
                 "Height": {
                     "Type": 3.0,
@@ -996,7 +1057,7 @@
                 },
                 "Mode": {
                     "Type": 3.0,
-                    "Integer": 0.0
+                    "Integer": 1.0
                 },
                 "Format": {
                     "Type": 3.0,
@@ -1004,7 +1065,7 @@
                 },
                 "Decimals": {
                     "Type": 3.0,
-                    "Integer": 0.0
+                    "Integer": 3.0
                 },
                 "Prefix": {
                     "Type": 5.0,
@@ -1016,7 +1077,7 @@
                 },
                 "ThousandsSep": {
                     "Type": 2.0,
-                    "Boolean": 1.0
+                    "Boolean": 0.0
                 },
                 "Editable": {
                     "Type": 2.0,
@@ -1042,7 +1103,7 @@
                 },
                 "TabOrder": {
                     "Type": 3.0,
-                    "Integer": -1.0
+                    "Integer": 4.0
                 }
             }
         },
@@ -1051,15 +1112,15 @@
             "ObjectProperties": {
                 "Name": {
                     "Type": 5.0,
-                    "String": "number_rows"
+                    "String": "inter_array_cable_voltage"
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 258.0
+                    "Integer": 210.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 159.0
+                    "Integer": 741.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -1067,7 +1128,7 @@
                 },
                 "Height": {
                     "Type": 3.0,
-                    "Integer": 21.0
+                    "Integer": 24.0
                 },
                 "Tool Tip": {
                     "Type": 5.0,
@@ -1079,7 +1140,7 @@
                 },
                 "Mode": {
                     "Type": 3.0,
-                    "Integer": 0.0
+                    "Integer": 1.0
                 },
                 "Format": {
                     "Type": 3.0,
@@ -1099,7 +1160,7 @@
                 },
                 "ThousandsSep": {
                     "Type": 2.0,
-                    "Boolean": 0.0
+                    "Boolean": 1.0
                 },
                 "Editable": {
                     "Type": 2.0,
@@ -1125,129 +1186,1315 @@
                 },
                 "TabOrder": {
                     "Type": 3.0,
-                    "Integer": 3.0
+                    "Integer": -1.0
                 }
             }
         },
-        "Image": {
+        "Choice": {
             "Visible": 1.0,
             "ObjectProperties": {
                 "Name": {
                     "Type": 5.0,
-                    "String": "object 12"
+                    "String": "inter_array_cable_voltage_option"
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 564.0
+                    "Integer": 366.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 447.0
+                    "Integer": 741.0
                 },
                 "Width": {
                     "Type": 3.0,
-                    "Integer": 40.0
+                    "Integer": 312.0
                 },
                 "Height": {
                     "Type": 3.0,
-                    "Integer": 64.0
+                    "Integer": 24.0
                 },
                 "Tool Tip": {
                     "Type": 5.0,
                     "String": ""
                 },
-                "Image": {
-                    "Type": 7.0,
-                    "Image": "Marine Array.png"
+                "Items": {
+                    "Type": 6.0,
+                    "StringList": "Use Modeled Voltage|7.2kV|12kV|24kV|36kV|66kV"
                 },
-                "Centered": {
-                    "Type": 2.0,
-                    "Boolean": 1.0
+                "Selection": {
+                    "Type": 3.0,
+                    "Integer": -1.0
+                },
+                "TabOrder": {
+                    "Type": 3.0,
+                    "Integer": -1.0
                 }
             }
         },
-        "Divider": {
+        "Label": {
             "Visible": 1.0,
             "ObjectProperties": {
                 "Name": {
                     "Type": 5.0,
-                    "String": "object 21"
+                    "String": "layout_instructions"
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 45.0
+                    "Integer": 621.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 468.0
+                    "Integer": 21.0
                 },
                 "Width": {
                     "Type": 3.0,
-                    "Integer": 333.0
+                    "Integer": 165.0
                 },
                 "Height": {
                     "Type": 3.0,
-                    "Integer": 16.0
+                    "Integer": 78.0
                 },
                 "Tool Tip": {
                     "Type": 5.0,
                     "String": ""
                 },
-                "Orientation": {
-                    "Type": 3.0,
-                    "Integer": 0.0
+                "Caption": {
+                    "Type": 5.0,
+                    "String": "Specify the number of devices using the Array Layout parameters below."
                 },
-                "Colour": {
+                "TextColour": {
                     "Type": 4.0,
                     "Color": {
-                        "Red": 120.0,
-                        "Green": 120.0,
-                        "Blue": 120.0,
+                        "Red": 0.0,
+                        "Green": 0.0,
+                        "Blue": 0.0,
                         "Alpha": 255.0
                     }
                 },
-                "Caption": {
-                    "Type": 5.0,
-                    "String": "Calculated Cable Lengths"
-                },
                 "Bold": {
                     "Type": 2.0,
-                    "Boolean": 1.0
-                }
-            }
-        },
+                    "Boolean": 0.0
+                },
+                "FontSize": {
+                    "Type": 3.0,
+                    "Integer": 0.0
+                },
+                "WordWrap": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "AlignRight": {
+                    "Type": 2.0,
+                    "Boolean": 0.0
+                },
+                "AlignTop": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                }
+            }
+        },
+        "Numeric": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "load_grid_voltage"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 207.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 957.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 90.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 24.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Value": {
+                    "Type": 1.0,
+                    "Double": 0.0
+                },
+                "Mode": {
+                    "Type": 3.0,
+                    "Integer": 1.0
+                },
+                "Format": {
+                    "Type": 3.0,
+                    "Integer": 0.0
+                },
+                "Decimals": {
+                    "Type": 3.0,
+                    "Integer": 3.0
+                },
+                "Prefix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Suffix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "ThousandsSep": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "Editable": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "ForeColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 0.0,
+                        "Green": 0.0,
+                        "Blue": 0.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "BackColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 255.0,
+                        "Green": 255.0,
+                        "Blue": 255.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "TabOrder": {
+                    "Type": 3.0,
+                    "Integer": -1.0
+                }
+            }
+        },
+        "Choice": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "load_grid_voltage_options"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 450.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 957.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 264.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 24.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Items": {
+                    "Type": 6.0,
+                    "StringList": "Extra Low Voltage (kV < 4)|Low Voltage (4 ≤ kV ≤ 34)|Medium Voltage (34 ≤ kV ≤ 69)|High Voltage (69 ≤ kV ≤ 138)|Extra High Voltage (138 ≤ kV ≤ 345)|Ultra High Voltage (345 ≤ kV ≤ 765)"
+                },
+                "Selection": {
+                    "Type": 3.0,
+                    "Integer": -1.0
+                },
+                "TabOrder": {
+                    "Type": 3.0,
+                    "Integer": -1.0
+                }
+            }
+        },
+        "Plot": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "mhk_array_plot"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 411.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 144.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 340.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 320.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                }
+            }
+        },
+        "Numeric": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "number_devices"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 483.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 45.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 90.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 24.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Value": {
+                    "Type": 1.0,
+                    "Double": 0.0
+                },
+                "Mode": {
+                    "Type": 3.0,
+                    "Integer": 0.0
+                },
+                "Format": {
+                    "Type": 3.0,
+                    "Integer": 0.0
+                },
+                "Decimals": {
+                    "Type": 3.0,
+                    "Integer": 0.0
+                },
+                "Prefix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Suffix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "ThousandsSep": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "Editable": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "ForeColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 0.0,
+                        "Green": 0.0,
+                        "Blue": 0.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "BackColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 255.0,
+                        "Green": 255.0,
+                        "Blue": 255.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "TabOrder": {
+                    "Type": 3.0,
+                    "Integer": -1.0
+                }
+            }
+        },
+        "Numeric": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "number_rows"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 258.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 159.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 100.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 24.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Value": {
+                    "Type": 1.0,
+                    "Double": 0.0
+                },
+                "Mode": {
+                    "Type": 3.0,
+                    "Integer": 0.0
+                },
+                "Format": {
+                    "Type": 3.0,
+                    "Integer": 0.0
+                },
+                "Decimals": {
+                    "Type": 3.0,
+                    "Integer": 3.0
+                },
+                "Prefix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Suffix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "ThousandsSep": {
+                    "Type": 2.0,
+                    "Boolean": 0.0
+                },
+                "Editable": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "ForeColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 0.0,
+                        "Green": 0.0,
+                        "Blue": 0.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "BackColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 255.0,
+                        "Green": 255.0,
+                        "Blue": 255.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "TabOrder": {
+                    "Type": 3.0,
+                    "Integer": 3.0
+                }
+            }
+        },
+        "Image": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "object 12"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 411.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 465.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 340.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 43.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Image": {
+                    "Type": 7.0,
+                    "Image": "Marine Array.png"
+                },
+                "Centered": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                }
+            }
+        },
+        "Divider": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "object 21"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 30.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 870.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 741.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 16.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Orientation": {
+                    "Type": 3.0,
+                    "Integer": 0.0
+                },
+                "Colour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 120.0,
+                        "Green": 120.0,
+                        "Blue": 120.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "Caption": {
+                    "Type": 5.0,
+                    "String": "Substation / Load Specifications"
+                },
+                "Bold": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                }
+            }
+        },
+        "Divider": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "object 2110"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 30.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 717.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 747.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 16.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Orientation": {
+                    "Type": 3.0,
+                    "Integer": 0.0
+                },
+                "Colour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 120.0,
+                        "Green": 120.0,
+                        "Blue": 120.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "Caption": {
+                    "Type": 5.0,
+                    "String": "Assumed Cable Voltages"
+                },
+                "Bold": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                }
+            }
+        },
+        "Divider": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "object 2118"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 30.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 603.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 747.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 16.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Orientation": {
+                    "Type": 3.0,
+                    "Integer": 0.0
+                },
+                "Colour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 120.0,
+                        "Green": 120.0,
+                        "Blue": 120.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "Caption": {
+                    "Type": 5.0,
+                    "String": "Calculated Cable Lengths"
+                },
+                "Bold": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                }
+            }
+        },
+        "GroupBox": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "object 4"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 15.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 579.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 774.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 432.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Caption": {
+                    "Type": 5.0,
+                    "String": "Cable specifications"
+                },
+                "Bold": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                }
+            }
+        },
+        "Label": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "object 7"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 75.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 771.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 135.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 24.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Caption": {
+                    "Type": 5.0,
+                    "String": "Export cable voltage"
+                },
+                "TextColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 0.0,
+                        "Green": 0.0,
+                        "Blue": 0.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "Bold": {
+                    "Type": 2.0,
+                    "Boolean": 0.0
+                },
+                "FontSize": {
+                    "Type": 3.0,
+                    "Integer": 0.0
+                },
+                "WordWrap": {
+                    "Type": 2.0,
+                    "Boolean": 0.0
+                },
+                "AlignRight": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "AlignTop": {
+                    "Type": 2.0,
+                    "Boolean": 0.0
+                }
+            }
+        },
+        "Label": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "object 719"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 603.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 474.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 120.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 24.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Caption": {
+                    "Type": 5.0,
+                    "String": "Wave direction"
+                },
+                "TextColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 0.0,
+                        "Green": 0.0,
+                        "Blue": 0.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "Bold": {
+                    "Type": 2.0,
+                    "Boolean": 0.0
+                },
+                "FontSize": {
+                    "Type": 3.0,
+                    "Integer": 0.0
+                },
+                "WordWrap": {
+                    "Type": 2.0,
+                    "Boolean": 0.0
+                },
+                "AlignRight": {
+                    "Type": 2.0,
+                    "Boolean": 0.0
+                },
+                "AlignTop": {
+                    "Type": 2.0,
+                    "Boolean": 0.0
+                }
+            }
+        },
+        "Label": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "object 742"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 408.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 513.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 386.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 57.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Caption": {
+                    "Type": 5.0,
+                    "String": "Row spacing affects calculated cable lengths but not array energy production."
+                },
+                "TextColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 0.0,
+                        "Green": 0.0,
+                        "Blue": 0.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "Bold": {
+                    "Type": 2.0,
+                    "Boolean": 0.0
+                },
+                "FontSize": {
+                    "Type": 3.0,
+                    "Integer": 0.0
+                },
+                "WordWrap": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "AlignRight": {
+                    "Type": 2.0,
+                    "Boolean": 0.0
+                },
+                "AlignTop": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                }
+            }
+        },
+        "Label": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "object 78"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 45.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 927.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 162.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 24.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Caption": {
+                    "Type": 5.0,
+                    "String": "Onshore substation required"
+                },
+                "TextColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 0.0,
+                        "Green": 0.0,
+                        "Blue": 0.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "Bold": {
+                    "Type": 2.0,
+                    "Boolean": 0.0
+                },
+                "FontSize": {
+                    "Type": 3.0,
+                    "Integer": 0.0
+                },
+                "WordWrap": {
+                    "Type": 2.0,
+                    "Boolean": 0.0
+                },
+                "AlignRight": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "AlignTop": {
+                    "Type": 2.0,
+                    "Boolean": 0.0
+                }
+            }
+        },
         "Label": {
             "Visible": 1.0,
             "ObjectProperties": {
                 "Name": {
                     "Type": 5.0,
-                    "String": "object 7"
+                    "String": "object 79"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 45.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 894.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 162.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 24.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Caption": {
+                    "Type": 5.0,
+                    "String": "Offshore substation required"
+                },
+                "TextColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 0.0,
+                        "Green": 0.0,
+                        "Blue": 0.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "Bold": {
+                    "Type": 2.0,
+                    "Boolean": 0.0
+                },
+                "FontSize": {
+                    "Type": 3.0,
+                    "Integer": 0.0
+                },
+                "WordWrap": {
+                    "Type": 2.0,
+                    "Boolean": 0.0
+                },
+                "AlignRight": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "AlignTop": {
+                    "Type": 2.0,
+                    "Boolean": 0.0
+                }
+            }
+        },
+        "Choice": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "offshore_substation_choice"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 207.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 894.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 180.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 24.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Items": {
+                    "Type": 6.0,
+                    "StringList": "Yes|No"
+                },
+                "Selection": {
+                    "Type": 3.0,
+                    "Integer": -1.0
+                },
+                "TabOrder": {
+                    "Type": 3.0,
+                    "Integer": -1.0
+                }
+            }
+        },
+        "Choice": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "onshore_substation_choice"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 207.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 927.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 180.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 24.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Items": {
+                    "Type": 6.0,
+                    "StringList": "Yes|No"
+                },
+                "Selection": {
+                    "Type": 3.0,
+                    "Integer": -1.0
+                },
+                "TabOrder": {
+                    "Type": 3.0,
+                    "Integer": -1.0
+                }
+            }
+        },
+        "Numeric": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "riser_cable_length"
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 405.0
+                    "Integer": 513.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 507.0
+                    "Integer": 681.0
                 },
                 "Width": {
                     "Type": 3.0,
-                    "Integer": 386.0
+                    "Integer": 100.0
                 },
                 "Height": {
                     "Type": 3.0,
-                    "Integer": 57.0
+                    "Integer": 24.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Value": {
+                    "Type": 1.0,
+                    "Double": 0.0
+                },
+                "Mode": {
+                    "Type": 3.0,
+                    "Integer": 1.0
+                },
+                "Format": {
+                    "Type": 3.0,
+                    "Integer": 0.0
+                },
+                "Decimals": {
+                    "Type": 3.0,
+                    "Integer": 3.0
+                },
+                "Prefix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Suffix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "ThousandsSep": {
+                    "Type": 2.0,
+                    "Boolean": 0.0
+                },
+                "Editable": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "ForeColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 0.0,
+                        "Green": 0.0,
+                        "Blue": 0.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "BackColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 255.0,
+                        "Green": 255.0,
+                        "Blue": 255.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "TabOrder": {
+                    "Type": 3.0,
+                    "Integer": 6.0
+                }
+            }
+        },
+        "Numeric": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "riser_cable_voltage"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 210.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 801.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 100.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 24.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Value": {
+                    "Type": 1.0,
+                    "Double": 0.0
+                },
+                "Mode": {
+                    "Type": 3.0,
+                    "Integer": 1.0
+                },
+                "Format": {
+                    "Type": 3.0,
+                    "Integer": 0.0
+                },
+                "Decimals": {
+                    "Type": 3.0,
+                    "Integer": 3.0
+                },
+                "Prefix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Suffix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "ThousandsSep": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "Editable": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "ForeColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 0.0,
+                        "Green": 0.0,
+                        "Blue": 0.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "BackColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 255.0,
+                        "Green": 255.0,
+                        "Blue": 255.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "TabOrder": {
+                    "Type": 3.0,
+                    "Integer": -1.0
+                }
+            }
+        },
+        "Choice": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "riser_cable_voltage_option"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 366.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 801.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 312.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 24.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Items": {
+                    "Type": 6.0,
+                    "StringList": "Use Modeled Voltage|7.2kV|12kV|24kV|36kV"
+                },
+                "Selection": {
+                    "Type": 3.0,
+                    "Integer": -1.0
+                },
+                "TabOrder": {
+                    "Type": 3.0,
+                    "Integer": -1.0
+                }
+            }
+        },
+        "Numeric": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "row_spacing"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 258.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 240.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 100.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 24.0
                 },
                 "Tool Tip": {
                     "Type": 5.0,
                     "String": ""
                 },
-                "Caption": {
-                    "Type": 5.0,
-                    "String": "Row spacing affects calculated cable lengths but not array energy production."
+                "Value": {
+                    "Type": 1.0,
+                    "Double": 0.0
+                },
+                "Mode": {
+                    "Type": 3.0,
+                    "Integer": 1.0
+                },
+                "Format": {
+                    "Type": 3.0,
+                    "Integer": 1.0
+                },
+                "Decimals": {
+                    "Type": 3.0,
+                    "Integer": 3.0
+                },
+                "Prefix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Suffix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "ThousandsSep": {
+                    "Type": 2.0,
+                    "Boolean": 0.0
+                },
+                "Editable": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
                 },
-                "TextColour": {
+                "ForeColour": {
                     "Type": 4.0,
                     "Color": {
                         "Red": 0.0,
@@ -1256,25 +2503,18 @@
                         "Alpha": 255.0
                     }
                 },
-                "Bold": {
-                    "Type": 2.0,
-                    "Boolean": 0.0
+                "BackColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 255.0,
+                        "Green": 255.0,
+                        "Blue": 255.0,
+                        "Alpha": 255.0
+                    }
                 },
-                "FontSize": {
+                "TabOrder": {
                     "Type": 3.0,
-                    "Integer": 0.0
-                },
-                "WordWrap": {
-                    "Type": 2.0,
-                    "Boolean": 1.0
-                },
-                "AlignRight": {
-                    "Type": 2.0,
-                    "Boolean": 0.0
-                },
-                "AlignTop": {
-                    "Type": 2.0,
-                    "Boolean": 1.0
+                    "Integer": 6.0
                 }
             }
         },
@@ -1283,23 +2523,23 @@
             "ObjectProperties": {
                 "Name": {
                     "Type": 5.0,
-                    "String": "object 719"
+                    "String": "sizing_warning"
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 603.0
+                    "Integer": 621.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 474.0
+                    "Integer": 21.0
                 },
                 "Width": {
                     "Type": 3.0,
-                    "Integer": 120.0
+                    "Integer": 165.0
                 },
                 "Height": {
                     "Type": 3.0,
-                    "Integer": 24.0
+                    "Integer": 81.0
                 },
                 "Tool Tip": {
                     "Type": 5.0,
@@ -1307,12 +2547,12 @@
                 },
                 "Caption": {
                     "Type": 5.0,
-                    "String": "Wave direction"
+                    "String": "It is not possible to reach the desired array capacity exactly for this device."
                 },
                 "TextColour": {
                     "Type": 4.0,
                     "Color": {
-                        "Red": 0.0,
+                        "Red": 255.0,
                         "Green": 0.0,
                         "Blue": 0.0,
                         "Alpha": 255.0
@@ -1328,7 +2568,7 @@
                 },
                 "WordWrap": {
                     "Type": 2.0,
-                    "Boolean": 0.0
+                    "Boolean": 1.0
                 },
                 "AlignRight": {
                     "Type": 2.0,
@@ -1336,7 +2576,7 @@
                 },
                 "AlignTop": {
                     "Type": 2.0,
-                    "Boolean": 0.0
+                    "Boolean": 1.0
                 }
             }
         },
@@ -1345,23 +2585,23 @@
             "ObjectProperties": {
                 "Name": {
                     "Type": 5.0,
-                    "String": "riser_cable_length"
+                    "String": "system_capacity"
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 258.0
+                    "Integer": 483.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 537.0
+                    "Integer": 72.0
                 },
                 "Width": {
                     "Type": 3.0,
-                    "Integer": 100.0
+                    "Integer": 90.0
                 },
                 "Height": {
                     "Type": 3.0,
-                    "Integer": 21.0
+                    "Integer": 24.0
                 },
                 "Tool Tip": {
                     "Type": 5.0,
@@ -1377,11 +2617,11 @@
                 },
                 "Format": {
                     "Type": 3.0,
-                    "Integer": 0.0
+                    "Integer": 1.0
                 },
                 "Decimals": {
                     "Type": 3.0,
-                    "Integer": 3.0
+                    "Integer": 0.0
                 },
                 "Prefix": {
                     "Type": 5.0,
@@ -1393,7 +2633,7 @@
                 },
                 "ThousandsSep": {
                     "Type": 2.0,
-                    "Boolean": 0.0
+                    "Boolean": 1.0
                 },
                 "Editable": {
                     "Type": 2.0,
@@ -1419,90 +2659,89 @@
                 },
                 "TabOrder": {
                     "Type": 3.0,
-                    "Integer": 6.0
+                    "Integer": -1.0
                 }
             }
         },
-        "Numeric": {
+        "CheckBox": {
             "Visible": 1.0,
             "ObjectProperties": {
                 "Name": {
                     "Type": 5.0,
-                    "String": "row_spacing"
+                    "String": "use_offshore_substation_calc"
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 258.0
+                    "Integer": 402.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 231.0
+                    "Integer": 894.0
                 },
                 "Width": {
                     "Type": 3.0,
-                    "Integer": 100.0
+                    "Integer": 120.0
                 },
                 "Height": {
                     "Type": 3.0,
-                    "Integer": 21.0
+                    "Integer": 24.0
                 },
                 "Tool Tip": {
                     "Type": 5.0,
                     "String": ""
                 },
-                "Value": {
-                    "Type": 1.0,
-                    "Double": 0.0
+                "Caption": {
+                    "Type": 5.0,
+                    "String": "Calculate?"
                 },
-                "Mode": {
+                "State": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "TabOrder": {
                     "Type": 3.0,
-                    "Integer": 1.0
+                    "Integer": -1.0
+                }
+            }
+        },
+        "CheckBox": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "use_wavefile_spacing"
                 },
-                "Format": {
+                "X": {
                     "Type": 3.0,
-                    "Integer": 1.0
+                    "Integer": 258.0
                 },
-                "Decimals": {
+                "Y": {
                     "Type": 3.0,
-                    "Integer": 3.0
+                    "Integer": 270.0
                 },
-                "Prefix": {
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 27.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 24.0
+                },
+                "Tool Tip": {
                     "Type": 5.0,
                     "String": ""
                 },
-                "Suffix": {
+                "Caption": {
                     "Type": 5.0,
                     "String": ""
                 },
-                "ThousandsSep": {
+                "State": {
                     "Type": 2.0,
                     "Boolean": 0.0
                 },
-                "Editable": {
-                    "Type": 2.0,
-                    "Boolean": 1.0
-                },
-                "ForeColour": {
-                    "Type": 4.0,
-                    "Color": {
-                        "Red": 0.0,
-                        "Green": 0.0,
-                        "Blue": 0.0,
-                        "Alpha": 255.0
-                    }
-                },
-                "BackColour": {
-                    "Type": 4.0,
-                    "Color": {
-                        "Red": 255.0,
-                        "Green": 255.0,
-                        "Blue": 255.0,
-                        "Alpha": 255.0
-                    }
-                },
                 "TabOrder": {
                     "Type": 3.0,
-                    "Integer": 6.0
+                    "Integer": -1.0
                 }
             }
         },
@@ -1511,23 +2750,23 @@
             "ObjectProperties": {
                 "Name": {
                     "Type": 5.0,
-                    "String": "sizing_warning"
+                    "String": "use_wavefile_spacing_label"
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 621.0
+                    "Integer": 9.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 21.0
+                    "Integer": 270.0
                 },
                 "Width": {
                     "Type": 3.0,
-                    "Integer": 165.0
+                    "Integer": 246.0
                 },
                 "Height": {
                     "Type": 3.0,
-                    "Integer": 81.0
+                    "Integer": 24.0
                 },
                 "Tool Tip": {
                     "Type": 5.0,
@@ -1535,12 +2774,12 @@
                 },
                 "Caption": {
                     "Type": 5.0,
-                    "String": "It is not possible to reach the desired array capacity exactly for this device."
+                    "String": "Use values from wave resource file"
                 },
                 "TextColour": {
                     "Type": 4.0,
                     "Color": {
-                        "Red": 255.0,
+                        "Red": 0.0,
                         "Green": 0.0,
                         "Blue": 0.0,
                         "Alpha": 255.0
@@ -1556,15 +2795,15 @@
                 },
                 "WordWrap": {
                     "Type": 2.0,
-                    "Boolean": 1.0
+                    "Boolean": 0.0
                 },
                 "AlignRight": {
                     "Type": 2.0,
-                    "Boolean": 0.0
+                    "Boolean": 1.0
                 },
                 "AlignTop": {
                     "Type": 2.0,
-                    "Boolean": 1.0
+                    "Boolean": 0.0
                 }
             }
         },
@@ -1573,19 +2812,19 @@
             "ObjectProperties": {
                 "Name": {
                     "Type": 5.0,
-                    "String": "system_capacity"
+                    "String": "user_export_cable_length"
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 483.0
+                    "Integer": 513.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 72.0
+                    "Integer": 654.0
                 },
                 "Width": {
                     "Type": 3.0,
-                    "Integer": 90.0
+                    "Integer": 100.0
                 },
                 "Height": {
                     "Type": 3.0,
@@ -1605,11 +2844,94 @@
                 },
                 "Format": {
                     "Type": 3.0,
-                    "Integer": 1.0
+                    "Integer": 0.0
+                },
+                "Decimals": {
+                    "Type": 3.0,
+                    "Integer": 3.0
+                },
+                "Prefix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Suffix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "ThousandsSep": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "Editable": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "ForeColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 0.0,
+                        "Green": 0.0,
+                        "Blue": 0.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "BackColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 255.0,
+                        "Green": 255.0,
+                        "Blue": 255.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "TabOrder": {
+                    "Type": 3.0,
+                    "Integer": -1.0
+                }
+            }
+        },
+        "Numeric": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "user_input_devices_per_row"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 258.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 186.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 100.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 24.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Value": {
+                    "Type": 1.0,
+                    "Double": 0.0
+                },
+                "Mode": {
+                    "Type": 3.0,
+                    "Integer": 0.0
+                },
+                "Format": {
+                    "Type": 3.0,
+                    "Integer": 0.0
                 },
                 "Decimals": {
                     "Type": 3.0,
-                    "Integer": 0.0
+                    "Integer": 3.0
                 },
                 "Prefix": {
                     "Type": 5.0,
@@ -1621,7 +2943,7 @@
                 },
                 "ThousandsSep": {
                     "Type": 2.0,
-                    "Boolean": 1.0
+                    "Boolean": 0.0
                 },
                 "Editable": {
                     "Type": 2.0,
@@ -1647,16 +2969,16 @@
                 },
                 "TabOrder": {
                     "Type": 3.0,
-                    "Integer": -1.0
+                    "Integer": 4.0
                 }
             }
         },
-        "CheckBox": {
+        "Numeric": {
             "Visible": 1.0,
             "ObjectProperties": {
                 "Name": {
                     "Type": 5.0,
-                    "String": "use_wavefile_spacing"
+                    "String": "user_input_number_rows"
                 },
                 "X": {
                     "Type": 3.0,
@@ -1664,11 +2986,11 @@
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 258.0
+                    "Integer": 159.0
                 },
                 "Width": {
                     "Type": 3.0,
-                    "Integer": 27.0
+                    "Integer": 100.0
                 },
                 "Height": {
                     "Type": 3.0,
@@ -1678,52 +3000,39 @@
                     "Type": 5.0,
                     "String": ""
                 },
-                "Caption": {
-                    "Type": 5.0,
-                    "String": ""
-                },
-                "State": {
-                    "Type": 2.0,
-                    "Boolean": 0.0
-                },
-                "TabOrder": {
-                    "Type": 3.0,
-                    "Integer": -1.0
-                }
-            }
-        },
-        "Label": {
-            "Visible": 1.0,
-            "ObjectProperties": {
-                "Name": {
-                    "Type": 5.0,
-                    "String": "use_wavefile_spacing_label"
-                },
-                "X": {
-                    "Type": 3.0,
-                    "Integer": 9.0
+                "Value": {
+                    "Type": 1.0,
+                    "Double": 0.0
                 },
-                "Y": {
+                "Mode": {
                     "Type": 3.0,
-                    "Integer": 258.0
+                    "Integer": 0.0
                 },
-                "Width": {
+                "Format": {
                     "Type": 3.0,
-                    "Integer": 246.0
+                    "Integer": 0.0
                 },
-                "Height": {
+                "Decimals": {
                     "Type": 3.0,
-                    "Integer": 24.0
+                    "Integer": 3.0
                 },
-                "Tool Tip": {
+                "Prefix": {
                     "Type": 5.0,
                     "String": ""
                 },
-                "Caption": {
+                "Suffix": {
                     "Type": 5.0,
-                    "String": "Use values from wave resource file"
+                    "String": ""
                 },
-                "TextColour": {
+                "ThousandsSep": {
+                    "Type": 2.0,
+                    "Boolean": 0.0
+                },
+                "Editable": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "ForeColour": {
                     "Type": 4.0,
                     "Color": {
                         "Red": 0.0,
@@ -1732,25 +3041,18 @@
                         "Alpha": 255.0
                     }
                 },
-                "Bold": {
-                    "Type": 2.0,
-                    "Boolean": 0.0
+                "BackColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 255.0,
+                        "Green": 255.0,
+                        "Blue": 255.0,
+                        "Alpha": 255.0
+                    }
                 },
-                "FontSize": {
+                "TabOrder": {
                     "Type": 3.0,
-                    "Integer": 0.0
-                },
-                "WordWrap": {
-                    "Type": 2.0,
-                    "Boolean": 0.0
-                },
-                "AlignRight": {
-                    "Type": 2.0,
-                    "Boolean": 1.0
-                },
-                "AlignTop": {
-                    "Type": 2.0,
-                    "Boolean": 0.0
+                    "Integer": 3.0
                 }
             }
         },
@@ -1759,15 +3061,15 @@
             "ObjectProperties": {
                 "Name": {
                     "Type": 5.0,
-                    "String": "user_input_devices_per_row"
+                    "String": "user_inter_array_cable_length"
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 258.0
+                    "Integer": 513.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 183.0
+                    "Integer": 627.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -1775,7 +3077,7 @@
                 },
                 "Height": {
                     "Type": 3.0,
-                    "Integer": 21.0
+                    "Integer": 24.0
                 },
                 "Tool Tip": {
                     "Type": 5.0,
@@ -1787,7 +3089,7 @@
                 },
                 "Mode": {
                     "Type": 3.0,
-                    "Integer": 0.0
+                    "Integer": 1.0
                 },
                 "Format": {
                     "Type": 3.0,
@@ -1807,7 +3109,7 @@
                 },
                 "ThousandsSep": {
                     "Type": 2.0,
-                    "Boolean": 0.0
+                    "Boolean": 1.0
                 },
                 "Editable": {
                     "Type": 2.0,
@@ -1833,7 +3135,7 @@
                 },
                 "TabOrder": {
                     "Type": 3.0,
-                    "Integer": 4.0
+                    "Integer": -1.0
                 }
             }
         },
@@ -1842,15 +3144,15 @@
             "ObjectProperties": {
                 "Name": {
                     "Type": 5.0,
-                    "String": "user_input_number_rows"
+                    "String": "user_riser_cable_length"
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 258.0
+                    "Integer": 513.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 159.0
+                    "Integer": 681.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -1858,7 +3160,7 @@
                 },
                 "Height": {
                     "Type": 3.0,
-                    "Integer": 21.0
+                    "Integer": 24.0
                 },
                 "Tool Tip": {
                     "Type": 5.0,
@@ -1870,7 +3172,7 @@
                 },
                 "Mode": {
                     "Type": 3.0,
-                    "Integer": 0.0
+                    "Integer": 1.0
                 },
                 "Format": {
                     "Type": 3.0,
@@ -1890,7 +3192,7 @@
                 },
                 "ThousandsSep": {
                     "Type": 2.0,
-                    "Boolean": 0.0
+                    "Boolean": 1.0
                 },
                 "Editable": {
                     "Type": 2.0,
@@ -1916,7 +3218,7 @@
                 },
                 "TabOrder": {
                     "Type": 3.0,
-                    "Integer": 3.0
+                    "Integer": -1.0
                 }
             }
         },
@@ -1933,7 +3235,7 @@
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 312.0
+                    "Integer": 327.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -1941,7 +3243,7 @@
                 },
                 "Height": {
                     "Type": 3.0,
-                    "Integer": 21.0
+                    "Integer": 24.0
                 },
                 "Tool Tip": {
                     "Type": 5.0,
@@ -2016,7 +3318,7 @@
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 312.0
+                    "Integer": 327.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -2024,7 +3326,7 @@
                 },
                 "Height": {
                     "Type": 3.0,
-                    "Integer": 21.0
+                    "Integer": 24.0
                 },
                 "Tool Tip": {
                     "Type": 5.0,
@@ -2091,100 +3393,256 @@
         "array_sizing_mode": {
             "Version": 4.0,
             "Type": 1.0,
-            "Label": "Array sizing mode",
-            "Units": " ",
+            "Label": "Array sizing mode",
+            "Units": " ",
+            "Group": "ME Array",
+            "IndexLabels": "Use a single device|Specify desired rated capacity|Specify number of devices",
+            "Flags": 3.0,
+            "DefaultValue": 0.0,
+            "UIObject": "Image",
+            "sscVariableName": "",
+            "sscVariableValue": ""
+        },
+        "cable_length_option": {
+            "Version": 4.0,
+            "Type": 1.0,
+            "Label": "Calculate or enter cable lengths",
+            "Units": "0/1",
+            "Group": "ME Array",
+            "IndexLabels": "",
+            "Flags": 3.0,
+            "DefaultValue": 0.0,
+            "UIObject": "RadioChoice",
+            "sscVariableName": "",
+            "sscVariableValue": ""
+        },
+        "cable_system_overbuild": {
+            "Version": 4.0,
+            "Type": 1.0,
+            "Label": "Cable system overbuild",
+            "Units": "%",
+            "Group": "ME Array",
+            "IndexLabels": "",
+            "Flags": 2.0,
+            "DefaultValue": 10.0,
+            "UIObject": "Numeric",
+            "sscVariableName": "",
+            "sscVariableValue": ""
+        },
+        "desired_array_size": {
+            "Version": 4.0,
+            "Type": 1.0,
+            "Label": "Desired rated capacity",
+            "Units": "kW",
+            "Group": "ME Array",
+            "IndexLabels": "",
+            "Flags": 2.0,
+            "DefaultValue": 0.0,
+            "UIObject": "Numeric",
+            "sscVariableName": "",
+            "sscVariableValue": ""
+        },
+        "device_spacing_in_row": {
+            "Version": 4.0,
+            "Type": 1.0,
+            "Label": "Spacing between devices in a row",
+            "Units": "m",
+            "Group": "ME Array",
+            "IndexLabels": "",
+            "Flags": 2.0,
+            "DefaultValue": 600.0,
+            "UIObject": "Numeric",
+            "sscVariableName": "",
+            "sscVariableValue": ""
+        },
+        "devices_per_row": {
+            "Version": 4.0,
+            "Type": 1.0,
+            "Label": "Devices per row",
+            "Units": " ",
+            "Group": "ME Array",
+            "IndexLabels": "",
+            "Flags": 8.0,
+            "DefaultValue": 10.0,
+            "UIObject": "Numeric",
+            "sscVariableName": "",
+            "sscVariableValue": ""
+        },
+        "distance_to_shore": {
+            "Version": 4.0,
+            "Type": 1.0,
+            "Label": "Distance to shore",
+            "Units": "m",
+            "Group": "ME Array",
+            "IndexLabels": "",
+            "Flags": 8.0,
+            "DefaultValue": 5000.0,
+            "UIObject": "Numeric",
+            "sscVariableName": "",
+            "sscVariableValue": ""
+        },
+        "distance_to_shore_input": {
+            "Version": 4.0,
+            "Type": 1.0,
+            "Label": "Distance to shore",
+            "Units": "m",
+            "Group": "ME Array",
+            "IndexLabels": "",
+            "Flags": 2.0,
+            "DefaultValue": 0.0,
+            "UIObject": "Numeric",
+            "sscVariableName": "",
+            "sscVariableValue": ""
+        },
+        "export_cable_length": {
+            "Version": 4.0,
+            "Type": 1.0,
+            "Label": "Export cable length",
+            "Units": "m",
+            "Group": "ME Array",
+            "IndexLabels": "",
+            "Flags": 8.0,
+            "DefaultValue": 0.0,
+            "UIObject": "Numeric",
+            "sscVariableName": "",
+            "sscVariableValue": ""
+        },
+        "export_cable_redundancy": {
+            "Version": 4.0,
+            "Type": 1.0,
+            "Label": "Build export cable redundancy",
+            "Units": " ",
+            "Group": "ME Array",
+            "IndexLabels": "",
+            "Flags": 2.0,
+            "DefaultValue": 0.0,
+            "UIObject": "CheckBox",
+            "sscVariableName": "",
+            "sscVariableValue": ""
+        },
+        "export_cable_type": {
+            "Version": 4.0,
+            "Type": 1.0,
+            "Label": "Export cable type",
+            "Units": "AC/HVDC",
+            "Group": "Marine Array",
+            "IndexLabels": "",
+            "Flags": 8.0,
+            "DefaultValue": 0.0,
+            "UIObject": "Default",
+            "sscVariableName": "",
+            "sscVariableValue": ""
+        },
+        "export_cable_voltage": {
+            "Version": 4.0,
+            "Type": 1.0,
+            "Label": "Export cable voltage",
+            "Units": "kV",
             "Group": "ME Array",
-            "IndexLabels": "Use a single device|Specify desired rated capacity|Specify number of devices",
-            "Flags": 3.0,
+            "IndexLabels": "",
+            "Flags": 9.0,
             "DefaultValue": 0.0,
-            "UIObject": "Image",
+            "UIObject": "Numeric",
             "sscVariableName": "",
             "sscVariableValue": ""
         },
-        "cable_system_overbuild": {
+        "export_cable_voltage_calculated": {
             "Version": 4.0,
             "Type": 1.0,
-            "Label": "Cable system overbuild",
-            "Units": "%",
-            "Group": "ME Array",
+            "Label": "Export cable voltage calculated",
+            "Units": "kV",
+            "Group": "Marine Array",
             "IndexLabels": "",
-            "Flags": 2.0,
-            "DefaultValue": 10.0,
+            "Flags": 8.0,
+            "DefaultValue": 0.0,
             "UIObject": "Numeric",
             "sscVariableName": "",
             "sscVariableValue": ""
         },
-        "desired_array_size": {
+        "export_cable_voltage_choice": {
             "Version": 4.0,
             "Type": 1.0,
-            "Label": "Desired rated capacity",
-            "Units": "kW",
+            "Label": "Override calculated AC/HVDC option for export cables",
+            "Units": "0/1",
             "Group": "ME Array",
-            "IndexLabels": "",
-            "Flags": 2.0,
+            "IndexLabels": "Use Modeled Voltage|7.2kV AC|12kV AC|24kV AC|36kV AC|66kV AC|72.5kV AC|145kV AC|220kV AC|400kV AC|150kV HVDC|300kV HVDC",
+            "Flags": 3.0,
             "DefaultValue": 0.0,
-            "UIObject": "Numeric",
+            "UIObject": "Choice",
             "sscVariableName": "",
             "sscVariableValue": ""
         },
-        "device_spacing_in_row": {
+        "export_cable_voltage_option_ac": {
             "Version": 4.0,
             "Type": 1.0,
-            "Label": "Spacing between devices in a row",
-            "Units": "m",
+            "Label": "Export cable voltage AC option",
+            "Units": " ",
             "Group": "ME Array",
-            "IndexLabels": "",
-            "Flags": 2.0,
-            "DefaultValue": 600.0,
-            "UIObject": "Numeric",
+            "IndexLabels": "7.2kV|12kV|24kV|36kV|66kV",
+            "Flags": 3.0,
+            "DefaultValue": 0.0,
+            "UIObject": "RadioChoice",
             "sscVariableName": "",
             "sscVariableValue": ""
         },
-        "devices_per_row": {
+        "export_cable_voltage_option_hvdc": {
             "Version": 4.0,
             "Type": 1.0,
-            "Label": "Devices per row",
+            "Label": "Export cable HVDC voltage options",
+            "Units": " ",
+            "Group": "Marine Array",
+            "IndexLabels": "150 kV|300 kV",
+            "Flags": 3.0,
+            "DefaultValue": 0.0,
+            "UIObject": "RadioChoice",
+            "sscVariableName": "",
+            "sscVariableValue": ""
+        },
+        "floating_array": {
+            "Version": 4.0,
+            "Type": 1.0,
+            "Label": "Floating array",
             "Units": " ",
             "Group": "ME Array",
             "IndexLabels": "",
-            "Flags": 8.0,
-            "DefaultValue": 10.0,
-            "UIObject": "Numeric",
+            "Flags": 2.0,
+            "DefaultValue": 1.0,
+            "UIObject": "CheckBox",
             "sscVariableName": "",
             "sscVariableValue": ""
         },
-        "distance_to_shore": {
+        "inter_array_cable_length": {
             "Version": 4.0,
             "Type": 1.0,
-            "Label": "Distance to shore",
+            "Label": "Inter-array cable length",
             "Units": "m",
             "Group": "ME Array",
             "IndexLabels": "",
             "Flags": 8.0,
-            "DefaultValue": 5000.0,
+            "DefaultValue": 0.0,
             "UIObject": "Numeric",
             "sscVariableName": "",
             "sscVariableValue": ""
         },
-        "distance_to_shore_input": {
+        "inter_array_cable_voltage": {
             "Version": 4.0,
             "Type": 1.0,
-            "Label": "Distance to shore",
-            "Units": "m",
+            "Label": "Inter-array cable voltage",
+            "Units": "kV",
             "Group": "ME Array",
             "IndexLabels": "",
-            "Flags": 2.0,
+            "Flags": 8.0,
             "DefaultValue": 0.0,
             "UIObject": "Numeric",
             "sscVariableName": "",
             "sscVariableValue": ""
         },
-        "export_cable_length": {
+        "inter_array_cable_voltage_calculated": {
             "Version": 4.0,
             "Type": 1.0,
-            "Label": "Export cable length",
-            "Units": "m",
-            "Group": "ME Array",
+            "Label": "Inter-array cable voltage calculated",
+            "Units": "kV",
+            "Group": "Marine Array",
             "IndexLabels": "",
             "Flags": 8.0,
             "DefaultValue": 0.0,
@@ -2192,42 +3650,42 @@
             "sscVariableName": "",
             "sscVariableValue": ""
         },
-        "export_cable_redundancy": {
+        "inter_array_cable_voltage_option": {
             "Version": 4.0,
             "Type": 1.0,
-            "Label": "Build export cable redundancy",
+            "Label": "Inter-array cable voltage option",
             "Units": " ",
             "Group": "ME Array",
-            "IndexLabels": "",
-            "Flags": 2.0,
+            "IndexLabels": "Use Modeled Voltage|7.2kV|12kV|24kV|36kV|66kV",
+            "Flags": 3.0,
             "DefaultValue": 0.0,
-            "UIObject": "CheckBox",
+            "UIObject": "Choice",
             "sscVariableName": "",
             "sscVariableValue": ""
         },
-        "floating_array": {
+        "load_grid_voltage": {
             "Version": 4.0,
             "Type": 1.0,
-            "Label": "Floating array",
-            "Units": " ",
+            "Label": "Onshore substation voltage",
+            "Units": "kV AC",
             "Group": "ME Array",
             "IndexLabels": "",
-            "Flags": 2.0,
-            "DefaultValue": 1.0,
-            "UIObject": "CheckBox",
+            "Flags": 8.0,
+            "DefaultValue": 0.0,
+            "UIObject": "Default",
             "sscVariableName": "",
             "sscVariableValue": ""
         },
-        "inter_array_cable_length": {
+        "load_grid_voltage_options": {
             "Version": 4.0,
             "Type": 1.0,
-            "Label": "Inter-array cable length",
-            "Units": "m",
+            "Label": "Load grid voltage",
+            "Units": "kV",
             "Group": "ME Array",
             "IndexLabels": "",
-            "Flags": 8.0,
+            "Flags": 2.0,
             "DefaultValue": 0.0,
-            "UIObject": "Numeric",
+            "UIObject": "Choice",
             "sscVariableName": "",
             "sscVariableValue": ""
         },
@@ -2257,6 +3715,32 @@
             "sscVariableName": "",
             "sscVariableValue": ""
         },
+        "offshore_substation_choice": {
+            "Version": 4.0,
+            "Type": 1.0,
+            "Label": "Offshore substation cost choice",
+            "Units": " ",
+            "Group": "ME Array",
+            "IndexLabels": "Yes|No",
+            "Flags": 1.0,
+            "DefaultValue": 0.0,
+            "UIObject": "Choice",
+            "sscVariableName": "",
+            "sscVariableValue": ""
+        },
+        "onshore_substation_choice": {
+            "Version": 4.0,
+            "Type": 1.0,
+            "Label": "Onshore substation choice",
+            "Units": "0/1",
+            "Group": "Marine Array",
+            "IndexLabels": "Yes|No",
+            "Flags": 3.0,
+            "DefaultValue": 0.0,
+            "UIObject": "Default",
+            "sscVariableName": "",
+            "sscVariableValue": ""
+        },
         "riser_cable_length": {
             "Version": 4.0,
             "Type": 1.0,
@@ -2270,6 +3754,45 @@
             "sscVariableName": "",
             "sscVariableValue": ""
         },
+        "riser_cable_voltage": {
+            "Version": 4.0,
+            "Type": 1.0,
+            "Label": "Riser cable voltage",
+            "Units": "kV",
+            "Group": "ME Array",
+            "IndexLabels": "",
+            "Flags": 8.0,
+            "DefaultValue": 0.0,
+            "UIObject": "Numeric",
+            "sscVariableName": "",
+            "sscVariableValue": ""
+        },
+        "riser_cable_voltage_calculated": {
+            "Version": 4.0,
+            "Type": 1.0,
+            "Label": "Riser cable voltage calculated",
+            "Units": "kV",
+            "Group": "Marine Array",
+            "IndexLabels": "",
+            "Flags": 8.0,
+            "DefaultValue": 0.0,
+            "UIObject": "Default",
+            "sscVariableName": "",
+            "sscVariableValue": ""
+        },
+        "riser_cable_voltage_option": {
+            "Version": 4.0,
+            "Type": 1.0,
+            "Label": "Riser cable voltage option",
+            "Units": " ",
+            "Group": "ME Array",
+            "IndexLabels": "Use Modeled Voltage|7.2kV|12kV|24kV|36kV",
+            "Flags": 3.0,
+            "DefaultValue": 0.0,
+            "UIObject": "RadioChoice",
+            "sscVariableName": "",
+            "sscVariableValue": ""
+        },
         "row_spacing": {
             "Version": 4.0,
             "Type": 1.0,
@@ -2296,6 +3819,32 @@
             "sscVariableName": "",
             "sscVariableValue": ""
         },
+        "use_offshore_substation_calc": {
+            "Version": 4.0,
+            "Type": 1.0,
+            "Label": "Use modeled offshore substation boolean",
+            "Units": "0/1",
+            "Group": "Marine Array",
+            "IndexLabels": "",
+            "Flags": 3.0,
+            "DefaultValue": 0.0,
+            "UIObject": "CheckBox",
+            "sscVariableName": "",
+            "sscVariableValue": ""
+        },
+        "use_onshore_substation": {
+            "Version": 4.0,
+            "Type": 1.0,
+            "Label": " ",
+            "Units": " ",
+            "Group": " ",
+            "IndexLabels": "",
+            "Flags": 8.0,
+            "DefaultValue": 0.0,
+            "UIObject": "Default",
+            "sscVariableName": "",
+            "sscVariableValue": ""
+        },
         "use_wavefile_spacing": {
             "Version": 4.0,
             "Type": 1.0,
@@ -2309,6 +3858,19 @@
             "sscVariableName": "",
             "sscVariableValue": ""
         },
+        "user_export_cable_length": {
+            "Version": 4.0,
+            "Type": 1.0,
+            "Label": "Export cable length",
+            "Units": "m",
+            "Group": "ME Array",
+            "IndexLabels": "",
+            "Flags": 0.0,
+            "DefaultValue": 0.0,
+            "UIObject": "Default",
+            "sscVariableName": "",
+            "sscVariableValue": ""
+        },
         "user_input_devices_per_row": {
             "Version": 4.0,
             "Type": 1.0,
@@ -2335,6 +3897,32 @@
             "sscVariableName": "",
             "sscVariableValue": ""
         },
+        "user_inter_array_cable_length": {
+            "Version": 4.0,
+            "Type": 1.0,
+            "Label": "Inter-array cable length",
+            "Units": "m",
+            "Group": "ME Array",
+            "IndexLabels": "",
+            "Flags": 2.0,
+            "DefaultValue": 0.0,
+            "UIObject": "Numeric",
+            "sscVariableName": "",
+            "sscVariableValue": ""
+        },
+        "user_riser_cable_length": {
+            "Version": 4.0,
+            "Type": 1.0,
+            "Label": "Riser cable length",
+            "Units": "m",
+            "Group": "ME Array",
+            "IndexLabels": "",
+            "Flags": 2.0,
+            "DefaultValue": 0.0,
+            "UIObject": "Numeric",
+            "sscVariableName": "",
+            "sscVariableValue": ""
+        },
         "water_depth": {
             "Version": 4.0,
             "Type": 1.0,
@@ -2387,13 +3975,125 @@
         "\t\treturn 0;",
         "\t}",
         "\t//msgbox(data);",
-        "\t${inter_array_cable_length} = data.inter_array_cable_length;",
-        "\t${export_cable_length} = data.export_cable_length;",
-        "\t${riser_cable_length} = data.riser_cable_length;",
+        "\tif (${cable_length_option} == 0) {",
+        "\t\t${inter_array_cable_length} = data.inter_array_cable_length;",
+        "\t\t${export_cable_length} = data.export_cable_length;",
+        "\t\t${riser_cable_length} = data.riser_cable_length;",
+        "\t}",
+        "\telse {",
+        "\t\t${inter_array_cable_length} = ${user_inter_array_cable_length};",
+        "\t\t${export_cable_length} = ${user_export_cable_length};",
+        "\t\t${riser_cable_length} = ${user_riser_cable_length};",
+        "\t}",
+        "\t",
+        "};",
+        "",
+        "equations{'$MIMO$ cable_voltage'} = define() {",
+        "\tdata.devices_per_row = ${devices_per_row};",
+        "\tdata.device_spacing_in_row = ${device_spacing_in_row};",
+        "\tdata.number_rows = ${number_rows};",
+        "\tdata.row_spacing = ${row_spacing};",
+        "\tdata.cable_system_overbuild = ${cable_system_overbuild};",
+        "\tdata.water_depth = ${water_depth};",
+        "\tdata.number_devices = ${number_devices};",
+        "\tdata.distance_to_shore = ${distance_to_shore};",
+        "\tdata.floating_array = ${floating_array};",
+        "\tdata.export_cable_redundancy = ${export_cable_redundancy};",
+        "\t",
+        "\tdata.inter_array_cable_length = ${inter_array_cable_length};",
+        "\tdata.riser_cable_length = ${riser_cable_length};",
+        "\tdata.export_cable_length = ${export_cable_length};",
+        "\tdata.system_capacity = ${system_capacity};",
+        "\tdata.device_rated_power = ${device_rated_power};",
+        "\tdata.use_onshore_substation = ${onshore_substation_choice};",
+        "\tdata.load_grid_voltage = ${load_grid_voltage};",
+        "\t",
+        "\tsuccess = ssc_eqn(\"me_array_cable_voltage\", data);",
+        "\t",
+        "\tif (!success){",
+        "\t\tmsgbox(\"error = \" + success);",
+        "\t\treturn 0;",
+        "\t}",
+        "\t",
+        "\t${inter_array_cable_voltage_calculated} = data.array_cable_voltage;",
+        "\t${export_cable_voltage_calculated} = data.export_cable_voltage;",
+        "\t${riser_cable_voltage_calculated} = data.riser_cable_voltage;",
+        "\t${export_cable_type} = data.export_cable_type;",
+        "\tif (financing() != \"None\") {",
+        "\t\tif (${floating_array} == 1) ${array_cable_system_cost_modeled} = data.array_cable_cost_total +  data.riser_cable_cost_total;",
+        "\t\telse ${array_cable_system_cost_modeled} = data.array_cable_cost_total;",
+        "\t\t${export_cable_system_cost_modeled} = data.export_cable_cost_total;",
+        "\t\tif (${offshore_substation_choice} == 0) {",
+        "\t\t\t${offshore_substation_cost_modeled} = data.offshore_substation_cost_total;",
+        "\t\t}",
+        "\t\telse {",
+        "\t\t\t${offshore_substation_cost_modeled} = 0;",
+        "\t\t}",
+        "\t\tif (${onshore_substation_choice} == 0) { //0=Yes",
+        "\t\t\t${onshore_substation_cost_modeled} = data.onshore_substation_cost_total;",
+        "\t\t}",
+        "\t\telse {",
+        "\t\t\t${onshore_substation_cost_modeled} = 0;",
+        "\t\t}",
+        "\t}",
         "",
         "\treturn 0;",
         "};",
         "",
+        "equations{'inter_array_cable_voltage'} = define() {",
+        "\treturn ?${inter_array_cable_voltage_option}",
+        "\t[",
+        "\t\t${inter_array_cable_voltage_calculated},",
+        "\t\t7.2,",
+        "\t\t12,",
+        "\t\t24,",
+        "\t\t36,",
+        "\t\t66",
+        "\t];",
+        "};",
+        "",
+        "equations{'riser_cable_voltage'} = define() {",
+        "\treturn ?${riser_cable_voltage_option}",
+        "\t[",
+        "\t\t${riser_cable_voltage_calculated},",
+        "\t\t7.2,",
+        "\t\t12,",
+        "\t\t24,",
+        "\t\t36,",
+        "\t];",
+        "};",
+        "",
+        "equations{'export_cable_voltage'} = define() {",
+        "\t",
+        "\treturn ?${export_cable_voltage_choice}",
+        "\t[",
+        "\t\t${export_cable_voltage_calculated},",
+        "\t\t7.2,",
+        "\t\t12,",
+        "\t\t24,",
+        "\t\t36,",
+        "\t\t66,",
+        "\t\t72.5,",
+        "\t\t145,",
+        "\t\t220,",
+        "\t\t400,",
+        "\t\t150,",
+        "\t\t300",
+        "\t];",
+        "};",
+        "",
+        "equations{'load_grid_voltage'} = define() {",
+        "\treturn ?${load_grid_voltage_options}",
+        "\t[",
+        "\t\t8,",
+        "\t\t46,",
+        "\t\t69,",
+        "\t\t161,",
+        "\t\t230,",
+        "\t\t415",
+        "\t];",
+        "};",
+        "",
         "",
         "equations{ '$MIMO$ MHKFarmLayout' } = define() {",
         "\tif (${array_sizing_mode} == 0) //single device",
@@ -2480,6 +4180,18 @@
         "\trefresh();\t\t",
         "}",
         "",
+        "on_change{'cable_length_option'} = define() ",
+        "{",
+        "\tcheck = value('cable_length_option');",
+        "\tshow('inter_array_cable_length', check == 0);",
+        "\tshow('export_cable_length', check == 0);",
+        "\tshow('riser_cable_length', check == 0);",
+        "\tshow('user_inter_array_cable_length', check == 1);",
+        "\tshow('user_export_cable_length', check == 1);",
+        "\tshow('user_riser_cable_length', check == 1);",
+        "\trefresh();",
+        "};",
+        "",
         "function array_layout_inputs()",
         "{",
         "\tif (value('array_sizing_mode') == 0) //single device",
@@ -2556,7 +4268,11 @@
         "\tarray_layout_inputs();",
         "\tplot_mhk_array();",
         "\twavefile_spacing_check();",
-        "\tshow('riser_cable_length', value('floating_array'));",
+        "\ton_change{'cable_length_option'}();",
+        "\texport_cable_voltage_check();",
+        "\toffshore_substation_check();",
+        "\ton_change{'onshore_substation_choice'}();",
+        "\ton_change{'floating_array'}();",
         "\trefresh();",
         "};",
         "",
@@ -2588,7 +4304,10 @@
         "",
         "on_change{'floating_array'} = define()",
         "{",
-        "\tshow('riser_cable_length', value('floating_array'));",
+        "\tenable('riser_cable_length', value('floating_array'));",
+        "\tenable('user_riser_cable_length', value('floating_array'));",
+        "\tenable('riser_cable_voltage', value('floating_array'));",
+        "\tenable('riser_cable_voltage_option', value('floating_array'));",
         "\trefresh();",
         "};",
         "",
@@ -2637,6 +4356,68 @@
         "\t}",
         "\t",
         "}",
+        "",
+        "on_change{'onshore_substation_choice'} = define() {",
+        "\tcheck = value('onshore_substation_choice');",
+        "\tenable('load_grid_voltage', check == 0);",
+        "\tenable('load_grid_voltage_options', check == 0);",
+        "};",
+        "",
+        "",
+        "function offshore_substation_check() {",
+        "\tcalc = value('use_offshore_substation_calc');",
+        "\tif (calc == 1) {",
+        "\t\tif (value('export_cable_voltage') == value('inter_array_cable_voltage')) {",
+        "\t\t\tvalue('offshore_substation_choice',1); //No",
+        "\t\t\trefresh('offshore_substation_choice');",
+        "\t\t\tenable('offshore_substation_choice',false);",
+        "\t\t}",
+        "\t\telse {",
+        "\t\t\tvalue('offshore_substation_choice',0); //Yes",
+        "\t\t\trefresh('offshore_substation_choice');",
+        "\t\t\tenable('offshore_substation_choice',false);",
+        "\t\t}",
+        "\t}",
+        "\telse {",
+        "\t\tenable('offshore_substation_choice',true);",
+        "\t}",
+        "\t",
+        "}",
+        "",
+        "on_change{'use_offshore_substation_calc'} = define() {",
+        "\toffshore_substation_check();",
+        "};",
+        "",
+        "function export_cable_voltage_check() ",
+        "{",
+        "\tcheck = value('export_cable_voltage_choice');",
+        "\tif (check == 0) {",
+        "\t\tshow('export_cable_voltage_option_ac', false);",
+        "\t\tshow('export_cable_voltage_option_hvdc', false);",
+        "\t\tif (value('export_cable_type') == 0) {",
+        "\t\t\tproperty('export_cable_voltage_lbl', 'Caption', 'kV AC');",
+        "\t\t}",
+        "\t\telse {",
+        "\t\t\tproperty('export_cable_voltage_lbl', 'Caption', 'kV HVDC');",
+        "\t\t}",
+        "\t\t",
+        "\t}",
+        "\telse if (check > 0 && check < 10) {",
+        "\t\tshow('export_cable_voltage_option_ac', true);",
+        "\t\tshow('export_cable_voltage_option_hvdc', false);",
+        "\t\tproperty('export_cable_voltage_lbl', 'Caption', 'kV AC');",
+        "\t}",
+        "\telse {",
+        "\t\tshow('export_cable_voltage_option_ac', false);",
+        "\t\tshow('export_cable_voltage_option_hvdc', true);",
+        "\t\tproperty('export_cable_voltage_lbl', 'Caption', 'kV HVDC');",
+        "\t\t",
+        "\t}",
+        "}",
+        "",
+        "on_change{'export_cable_voltage_choice'} = define() {",
+        "\texport_cable_voltage_check();",
+        "};",
         "\t",
         ""
     ]
diff --git a/deploy/runtime/ui/Marine Costs - Assembly & Installation.json b/deploy/runtime/ui/Marine Costs - Assembly & Installation.json
index e0e90cfd18..2ecf95253e 100644
--- a/deploy/runtime/ui/Marine Costs - Assembly & Installation.json	
+++ b/deploy/runtime/ui/Marine Costs - Assembly & Installation.json	
@@ -520,7 +520,7 @@
                 }
             }
         },
-        "CheckBox": {
+        "Choice": {
             "Visible": 1.0,
             "ObjectProperties": {
                 "Name": {
@@ -529,15 +529,15 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 354.0
+                    "Integer": 477.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 312.0
+                    "Integer": 282.0
                 },
                 "Width": {
                     "Type": 3.0,
-                    "Integer": 183.0
+                    "Integer": 177.0
                 },
                 "Height": {
                     "Type": 3.0,
@@ -547,13 +547,13 @@
                     "Type": 5.0,
                     "String": ""
                 },
-                "Caption": {
-                    "Type": 5.0,
-                    "String": "Enter detailed costs"
+                "Items": {
+                    "Type": 6.0,
+                    "StringList": "Enter cost|Enter itemized costs|Array scaling costs"
                 },
-                "State": {
-                    "Type": 2.0,
-                    "Boolean": 0.0
+                "Selection": {
+                    "Type": 3.0,
+                    "Integer": -1.0
                 },
                 "TabOrder": {
                     "Type": 3.0,
@@ -561,7 +561,7 @@
                 }
             }
         },
-        "CheckBox": {
+        "Choice": {
             "Visible": 1.0,
             "ObjectProperties": {
                 "Name": {
@@ -570,11 +570,11 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 354.0
+                    "Integer": 477.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 462.0
+                    "Integer": 432.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -588,13 +588,13 @@
                     "Type": 5.0,
                     "String": ""
                 },
-                "Caption": {
-                    "Type": 5.0,
-                    "String": "Enter detailed costs"
+                "Items": {
+                    "Type": 6.0,
+                    "StringList": "Enter cost|Enter itemized costs|Array scaling costs"
                 },
-                "State": {
-                    "Type": 2.0,
-                    "Boolean": 0.0
+                "Selection": {
+                    "Type": 3.0,
+                    "Integer": -1.0
                 },
                 "TabOrder": {
                     "Type": 3.0,
@@ -602,7 +602,7 @@
                 }
             }
         },
-        "CheckBox": {
+        "Choice": {
             "Visible": 1.0,
             "ObjectProperties": {
                 "Name": {
@@ -611,11 +611,11 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 354.0
+                    "Integer": 477.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 702.0
+                    "Integer": 672.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -629,13 +629,13 @@
                     "Type": 5.0,
                     "String": ""
                 },
-                "Caption": {
-                    "Type": 5.0,
-                    "String": "Enter detailed costs"
+                "Items": {
+                    "Type": 6.0,
+                    "StringList": "Enter cost|Enter itemized costs|Array scaling costs"
                 },
-                "State": {
-                    "Type": 2.0,
-                    "Boolean": 0.0
+                "Selection": {
+                    "Type": 3.0,
+                    "Integer": -1.0
                 },
                 "TabOrder": {
                     "Type": 3.0,
@@ -643,7 +643,7 @@
                 }
             }
         },
-        "CheckBox": {
+        "Choice": {
             "Visible": 1.0,
             "ObjectProperties": {
                 "Name": {
@@ -652,15 +652,15 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 354.0
+                    "Integer": 477.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 102.0
+                    "Integer": 72.0
                 },
                 "Width": {
                     "Type": 3.0,
-                    "Integer": 189.0
+                    "Integer": 177.0
                 },
                 "Height": {
                     "Type": 3.0,
@@ -670,13 +670,13 @@
                     "Type": 5.0,
                     "String": ""
                 },
-                "Caption": {
-                    "Type": 5.0,
-                    "String": "Enter detailed costs"
+                "Items": {
+                    "Type": 6.0,
+                    "StringList": "Enter cost|Enter itemized costs|Array scaling costs"
                 },
-                "State": {
-                    "Type": 2.0,
-                    "Boolean": 0.0
+                "Selection": {
+                    "Type": 3.0,
+                    "Integer": -1.0
                 },
                 "TabOrder": {
                     "Type": 3.0,
@@ -850,6 +850,89 @@
                 }
             }
         },
+        "Numeric": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "marine_energy_converter_device_cost_rvalue"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 468.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 312.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 100.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 24.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Value": {
+                    "Type": 1.0,
+                    "Double": 0.0
+                },
+                "Mode": {
+                    "Type": 3.0,
+                    "Integer": 1.0
+                },
+                "Format": {
+                    "Type": 3.0,
+                    "Integer": 0.0
+                },
+                "Decimals": {
+                    "Type": 3.0,
+                    "Integer": 3.0
+                },
+                "Prefix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Suffix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "ThousandsSep": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "Editable": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "ForeColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 0.0,
+                        "Green": 0.0,
+                        "Blue": 0.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "BackColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 255.0,
+                        "Green": 255.0,
+                        "Blue": 255.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "TabOrder": {
+                    "Type": 3.0,
+                    "Integer": -1.0
+                }
+            }
+        },
         "Numeric": {
             "Visible": 1.0,
             "ObjectProperties": {
@@ -2583,6 +2666,89 @@
                 }
             }
         },
+        "Numeric": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "offshore_electrical_infrastructure_cost_rvalue"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 468.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 462.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 100.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 24.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Value": {
+                    "Type": 1.0,
+                    "Double": 0.0
+                },
+                "Mode": {
+                    "Type": 3.0,
+                    "Integer": 1.0
+                },
+                "Format": {
+                    "Type": 3.0,
+                    "Integer": 0.0
+                },
+                "Decimals": {
+                    "Type": 3.0,
+                    "Integer": 3.0
+                },
+                "Prefix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Suffix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "ThousandsSep": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "Editable": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "ForeColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 0.0,
+                        "Green": 0.0,
+                        "Blue": 0.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "BackColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 255.0,
+                        "Green": 255.0,
+                        "Blue": 255.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "TabOrder": {
+                    "Type": 3.0,
+                    "Integer": -1.0
+                }
+            }
+        },
         "Numeric": {
             "Visible": 1.0,
             "ObjectProperties": {
@@ -3081,6 +3247,89 @@
                 }
             }
         },
+        "Numeric": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "onshore_electrical_infrastructure_cost_rvalue"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 468.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 702.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 100.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 24.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Value": {
+                    "Type": 1.0,
+                    "Double": 0.0
+                },
+                "Mode": {
+                    "Type": 3.0,
+                    "Integer": 1.0
+                },
+                "Format": {
+                    "Type": 3.0,
+                    "Integer": 0.0
+                },
+                "Decimals": {
+                    "Type": 3.0,
+                    "Integer": 3.0
+                },
+                "Prefix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Suffix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "ThousandsSep": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "Editable": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "ForeColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 0.0,
+                        "Green": 0.0,
+                        "Blue": 0.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "BackColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 255.0,
+                        "Green": 255.0,
+                        "Blue": 255.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "TabOrder": {
+                    "Type": 3.0,
+                    "Integer": -1.0
+                }
+            }
+        },
         "Numeric": {
             "Visible": 1.0,
             "ObjectProperties": {
@@ -4090,7 +4339,7 @@
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 72.0
+                    "Integer": 75.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -4243,6 +4492,89 @@
                 }
             }
         },
+        "Numeric": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "substructures_and_foundations_cost_rvalue"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 468.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 102.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 100.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 24.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Value": {
+                    "Type": 1.0,
+                    "Double": 0.0
+                },
+                "Mode": {
+                    "Type": 3.0,
+                    "Integer": 1.0
+                },
+                "Format": {
+                    "Type": 3.0,
+                    "Integer": 0.0
+                },
+                "Decimals": {
+                    "Type": 3.0,
+                    "Integer": 3.0
+                },
+                "Prefix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Suffix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "ThousandsSep": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "Editable": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "ForeColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 0.0,
+                        "Green": 0.0,
+                        "Blue": 0.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "BackColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 255.0,
+                        "Green": 255.0,
+                        "Blue": 255.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "TabOrder": {
+                    "Type": 3.0,
+                    "Integer": -1.0
+                }
+            }
+        },
         "ToolTipCtrl": {
             "Visible": 1.0,
             "ObjectProperties": {
@@ -4611,7 +4943,7 @@
             "IndexLabels": "",
             "Flags": 3.0,
             "DefaultValue": 0.0,
-            "UIObject": "CheckBox",
+            "UIObject": "Choice",
             "sscVariableName": "",
             "sscVariableValue": ""
         },
@@ -4624,7 +4956,7 @@
             "IndexLabels": "",
             "Flags": 3.0,
             "DefaultValue": 0.0,
-            "UIObject": "CheckBox",
+            "UIObject": "Choice",
             "sscVariableName": "",
             "sscVariableValue": ""
         },
@@ -4637,7 +4969,7 @@
             "IndexLabels": "",
             "Flags": 0.0,
             "DefaultValue": 0.0,
-            "UIObject": "CheckBox",
+            "UIObject": "Choice",
             "sscVariableName": "",
             "sscVariableValue": ""
         },
@@ -4650,7 +4982,7 @@
             "IndexLabels": "",
             "Flags": 3.0,
             "DefaultValue": 0.0,
-            "UIObject": "CheckBox",
+            "UIObject": "Choice",
             "sscVariableName": "",
             "sscVariableValue": ""
         },
@@ -4693,6 +5025,19 @@
             "sscVariableName": "",
             "sscVariableValue": ""
         },
+        "marine_energy_converter_device_cost_rvalue": {
+            "Version": 4.0,
+            "Type": 1.0,
+            "Label": "Marine energy converter device array scaling R-value",
+            "Units": "",
+            "Group": "ME Costs - Assembly Installation",
+            "IndexLabels": "",
+            "Flags": 2.0,
+            "DefaultValue": 0.0,
+            "UIObject": "Default",
+            "sscVariableName": "",
+            "sscVariableValue": ""
+        },
         "marine_energy_converter_device_cost_total": {
             "Version": 4.0,
             "Type": 1.0,
@@ -4758,6 +5103,19 @@
             "sscVariableName": "",
             "sscVariableValue": ""
         },
+        "offshore_electrical_infrastructure_cost_rvalue": {
+            "Version": 4.0,
+            "Type": 1.0,
+            "Label": "Offshore electrical infrastructure array scaling R-value",
+            "Units": "",
+            "Group": "ME Costs - Assembly Installation",
+            "IndexLabels": "",
+            "Flags": 2.0,
+            "DefaultValue": 0.0,
+            "UIObject": "Default",
+            "sscVariableName": "",
+            "sscVariableValue": ""
+        },
         "offshore_electrical_infrastructure_cost_total": {
             "Version": 4.0,
             "Type": 1.0,
@@ -4849,6 +5207,19 @@
             "sscVariableName": "",
             "sscVariableValue": ""
         },
+        "onshore_electrical_infrastructure_cost_rvalue": {
+            "Version": 4.0,
+            "Type": 1.0,
+            "Label": "Onshore electrical infrastructure array scaling R-value",
+            "Units": "",
+            "Group": "ME Costs - Assembly Installation",
+            "IndexLabels": "",
+            "Flags": 2.0,
+            "DefaultValue": 0.0,
+            "UIObject": "Default",
+            "sscVariableName": "",
+            "sscVariableValue": ""
+        },
         "onshore_electrical_infrastructure_cost_total": {
             "Version": 4.0,
             "Type": 1.0,
@@ -5057,6 +5428,19 @@
             "sscVariableName": "",
             "sscVariableValue": ""
         },
+        "substructures_and_foundations_cost_rvalue": {
+            "Version": 4.0,
+            "Type": 1.0,
+            "Label": "Substructures and foundation array scaling R-value",
+            "Units": "",
+            "Group": "ME Costs - Assembly Installation",
+            "IndexLabels": "",
+            "Flags": 2.0,
+            "DefaultValue": 0.0,
+            "UIObject": "Default",
+            "sscVariableName": "",
+            "sscVariableValue": ""
+        },
         "underground_cable_system_onshore_electrical_infrastructure_cost": {
             "Version": 4.0,
             "Type": 1.0,
@@ -5083,9 +5467,14 @@
         "\t{",
         "\t\treturn ${substructures_and_foundations_cost};",
         "\t}",
-        "\telse",
+        "\telse if (${detailed_cost_choice_substructures}==1)",
         "\t{",
         "\t\treturn ${substructure_assem_install_cost_total};",
+        "\t}\r",
+        "\telse {\r",
+        "\t\tb = -log(1-${substructures_and_foundations_cost_rvalue})/log(2);\r",
+        "\t\treturn (${substructures_and_foundations_cost}*pow(${number_devices},-b))*${number_devices};\r",
+        "\r",
         "\t}",
         "};",
         "",
@@ -5101,9 +5490,14 @@
         "\t{",
         "\t\treturn ${marine_energy_converter_device_cost};",
         "\t}",
-        "\telse",
+        "\telse if (${detailed_cost_choice_mec_device}==1)",
         "\t{",
         "\t\treturn ${marine_energy_converter_device_cost_total};",
+        "\t}\r",
+        "\telse {\r",
+        "\t\tb = -log(1-${marine_energy_converter_device_cost_rvalue})/log(2);\r",
+        "\t\treturn (${marine_energy_converter_device_cost}*pow(${number_devices},-b))*${number_devices};\r",
+        "\r",
         "\t}",
         "};",
         "",
@@ -5119,9 +5513,14 @@
         "\t{",
         "\t\treturn ${onshore_electrical_infrastructure_cost};",
         "\t}",
-        "\telse",
+        "\telse if (${detailed_cost_choice_onshore_infrastructure}==1)",
         "\t{",
         "\t\treturn ${onshore_electrical_infrastructure_cost_total};",
+        "\t}\r",
+        "\telse {\r",
+        "\t\tb = -log(1-${onshore_electrical_infrastructure_cost_rvalue})/log(2);\r",
+        "\t\treturn (${onshore_electrical_infrastructure_cost}*pow(${number_devices},-b))*${number_devices};\r",
+        "\r",
         "\t}",
         "};",
         "",
@@ -5136,9 +5535,14 @@
         "\t{",
         "\t\treturn ${offshore_electrical_infrastructure_cost};",
         "\t}",
-        "\telse",
+        "\telse if (${detailed_cost_choice_offshore_infrastructure}==1)",
         "\t{",
         "\t\treturn ${offshore_electrical_infrastructure_cost_total};",
+        "\t}\r",
+        "\telse {\r",
+        "\t\tb = -log(1-${offshore_electrical_infrastructure_cost_rvalue})/log(2);\r",
+        "\t\treturn (${offshore_electrical_infrastructure_cost}*pow(${number_devices},-b))*${number_devices};\r",
+        "\r",
         "\t}",
         "};",
         "",
@@ -5158,7 +5562,8 @@
         "\t\t\t\t\t0,",
         "\t\t\t\t\t0,",
         "\t\t\t\t\t2,",
-        "\t\t\t\t\t1",
+        "\t\t\t\t\t1,\r",
+        "\t\t\t\t\t3",
         "\t\t\t\t];",
         "\t}",
         "\telse",
@@ -5169,12 +5574,14 @@
         "",
         "",
         "equations {'assembly_and_install_cost'} = define() {",
+        "\tarray_scaling_b_value = -log(1 - ${assembly_and_install_cost_rvalue}) / log(2);\r",
         "\treturn ?${assembly_and_install_cost_method}",
         "\t\t\t[",
         "\t\t\t\t${assembly_and_install_cost_input}*${system_capacity},",
         "\t\t\t\t${assembly_and_install_cost_input},",
         "\t\t\t\t${assembly_and_install_cost_modeled},",
-        "\t\t\t\t${assembly_and_install_cost_total}",
+        "\t\t\t\t${assembly_and_install_cost_total},\r",
+        "\t\t\t\t(${assembly_and_install_cost_input}*pow(${number_devices},-array_scaling_b_value))*${number_devices}",
         "\t\t\t];",
         "};",
         "",
@@ -5189,19 +5596,19 @@
     ],
     "Callbacks": [
         "on_load{'Marine Costs - Assembly & Installation'} = define() {",
-        "\ton_change{'itemized_check_assem_install'};",
+        "\ton_change{'itemized_check_assem_install'}();",
         "\tenable_itemized_assem_install();",
         "\t//enable_itemized_level();",
-        "\ton_change{'detailed_cost_choice_substructures'};",
-        "\ton_change{'detailed_cost_choice_mec_device'};",
-        "\ton_change{'detailed_cost_choice_offshore_infrastructure'};",
-        "\ton_change{'detailed_cost_choice_onshore_infrastructure'};",
+        "\ton_change{'detailed_cost_choice_substructures'}();",
+        "\ton_change{'detailed_cost_choice_mec_device'}();",
+        "\ton_change{'detailed_cost_choice_offshore_infrastructure'}();",
+        "\ton_change{'detailed_cost_choice_onshore_infrastructure'}();",
         "\tdetailed_cost_substructures();",
         "\tdetailed_cost_mec_device();",
         "\tdetailed_cost_offshore_infrastructure();",
         "\tdetailed_cost_onshore_infrastructure();",
         "\tcheck_override_assembly();",
-        "\ton_change{'assembly_and_install_override'};",
+        "\ton_change{'assembly_and_install_override'}();",
         "};",
         "",
         "on_change{'assembly_and_install_override'} = define() {",
@@ -5227,15 +5634,16 @@
         "\tif (value('itemized_check_assem_install')==1)",
         "\t{",
         "\t\tdetailed_value = value('detailed_cost_choice_substructures');",
-        "\t\tenable('substructures_and_foundations_cost',detailed_value==0);",
-        "\t\tshow('substructures_and_foundations_cost',detailed_value==0);",
-        "\t\tenable('substructure_assem_install_cost_total',detailed_value);",
-        "\t\tshow('substructure_assem_install_cost_total',detailed_value);",
-        "\t\tenable('foundation_assem_install_cost',detailed_value);",
-        "\t\tenable('substructure_assem_install_cost',detailed_value);",
-        "\t\tenable('scour_protection_assem_install_cost',detailed_value);",
-        "\t\tenable('noise_mitigation_cost',detailed_value);",
-        "\t\tenable('other_substructure_cost',detailed_value);",
+        "\t\tenable('substructures_and_foundations_cost',detailed_value!=1);",
+        "\t\tshow('substructures_and_foundations_cost',detailed_value!=1);",
+        "\t\tenable('substructure_assem_install_cost_total',detailed_value==1);",
+        "\t\tshow('substructure_assem_install_cost_total',detailed_value==1);",
+        "\t\tenable('foundation_assem_install_cost',detailed_value==1);",
+        "\t\tenable('substructure_assem_install_cost',detailed_value==1);",
+        "\t\tenable('scour_protection_assem_install_cost',detailed_value==1);",
+        "\t\tenable('noise_mitigation_cost',detailed_value==1);",
+        "\t\tenable('other_substructure_cost',detailed_value==1);\r",
+        "\t\tenable('substructures_and_foundations_cost_rvalue',detailed_value==2);",
         "\t\t",
         "\t\trefresh();",
         "\t}",
@@ -5250,14 +5658,14 @@
         "\tif (value('itemized_check_assem_install')==1)",
         "\t{",
         "\t\tdetailed_value = value('detailed_cost_choice_mec_device');",
-        "\t\tenable('marine_energy_converter_device_cost',detailed_value==0);",
-        "\t\tshow('marine_energy_converter_device_cost',detailed_value==0);",
-        "\t\tenable('marine_energy_converter_device_cost_total',detailed_value);",
-        "\t\tshow('marine_energy_converter_device_cost_total',detailed_value);",
-        "\t\tenable('structural_assembly_assem_install_cost',detailed_value);",
-        "\t\tenable('power_takeoff_system_assem_install_cost',detailed_value);",
-        "\t\tenable('other_marine_energy_converter_device_cost',detailed_value);",
-        "\t\t",
+        "\t\tenable('marine_energy_converter_device_cost',detailed_value!=1);",
+        "\t\tshow('marine_energy_converter_device_cost',detailed_value!=1);",
+        "\t\tenable('marine_energy_converter_device_cost_total',detailed_value==1);",
+        "\t\tshow('marine_energy_converter_device_cost_total',detailed_value==1);",
+        "\t\tenable('structural_assembly_assem_install_cost',detailed_value==1);",
+        "\t\tenable('power_takeoff_system_assem_install_cost',detailed_value==1);",
+        "\t\tenable('other_marine_energy_converter_device_cost',detailed_value==1);",
+        "\t\tenable('marine_energy_converter_device_cost_rvalue',detailed_value==2);",
         "\t\trefresh();",
         "\t}",
         "}",
@@ -5272,15 +5680,15 @@
         "\tif (value('itemized_check_assem_install')==1)",
         "\t{",
         "\t\tdetailed_value = value('detailed_cost_choice_onshore_infrastructure');",
-        "\t\tenable('onshore_electrical_infrastructure_cost',detailed_value==0);",
-        "\t\tshow('onshore_electrical_infrastructure_cost',detailed_value==0);",
-        "\t\tenable('onshore_electrical_infrastructure_cost_total',detailed_value);",
-        "\t\tshow('onshore_electrical_infrastructure_cost_total',detailed_value);",
-        "\t\tenable('underground_cable_system_onshore_electrical_infrastructure_costt',detailed_value);",
-        "\t\tenable('overhead_transmission_line_cost',detailed_value);",
-        "\t\tenable('onshore_substation_assem_install_cost',detailed_value);",
-        "\t\tenable('other_onshore_electrical_infrastructure_cost',detailed_value);",
-        "\t\t",
+        "\t\tenable('onshore_electrical_infrastructure_cost',detailed_value!=1);",
+        "\t\tshow('onshore_electrical_infrastructure_cost',detailed_value!=1);",
+        "\t\tenable('onshore_electrical_infrastructure_cost_total',detailed_value==1);",
+        "\t\tshow('onshore_electrical_infrastructure_cost_total',detailed_value==1);",
+        "\t\tenable('underground_cable_system_onshore_electrical_infrastructure_costt',detailed_value==1);",
+        "\t\tenable('overhead_transmission_line_cost',detailed_value==1);",
+        "\t\tenable('onshore_substation_assem_install_cost',detailed_value==1);",
+        "\t\tenable('other_onshore_electrical_infrastructure_cost',detailed_value==1);",
+        "\t\tenable('onshore_electrical_infrastructure_cost_rvalue',detailed_value==2);",
         "\t\trefresh();",
         "\t}",
         "}",
@@ -5294,17 +5702,17 @@
         "\tif (value('itemized_check_assem_install')==1)",
         "\t{",
         "\t\tdetailed_value = value('detailed_cost_choice_offshore_infrastructure');",
-        "\t\tenable('offshore_electrical_infrastructure_cost',detailed_value==0);",
-        "\t\tshow('offshore_electrical_infrastructure_cost',detailed_value==0);",
-        "\t\tenable('offshore_electrical_infrastructure_cost_total',detailed_value);",
-        "\t\tshow('offshore_electrical_infrastructure_cost_total',detailed_value);",
-        "\t\tenable('array_cables_assem_install_cost',detailed_value);",
-        "\t\tenable('offshore_export_cables_assem_install_cost',detailed_value);",
-        "\t\tenable('offshore_substation_assem_install_cost',detailed_value);",
-        "\t\tenable('offshore_accommodations_platform_cost',detailed_value);",
-        "\t\tenable('onshore_electric_infrastructure_assem_install_cost',detailed_value);",
-        "\t\tenable('other_offshore_electrical_infrastructure_cost',detailed_value);",
-        "\t\t",
+        "\t\tenable('offshore_electrical_infrastructure_cost',detailed_value!=1);",
+        "\t\tshow('offshore_electrical_infrastructure_cost',detailed_value!=1);",
+        "\t\tenable('offshore_electrical_infrastructure_cost_total',detailed_value==1);",
+        "\t\tshow('offshore_electrical_infrastructure_cost_total',detailed_value==1);",
+        "\t\tenable('array_cables_assem_install_cost',detailed_value==1);",
+        "\t\tenable('offshore_export_cables_assem_install_cost',detailed_value==1);",
+        "\t\tenable('offshore_substation_assem_install_cost',detailed_value==1);",
+        "\t\tenable('offshore_accommodations_platform_cost',detailed_value==1);",
+        "\t\tenable('onshore_electric_infrastructure_assem_install_cost',detailed_value==1);",
+        "\t\tenable('other_offshore_electrical_infrastructure_cost',detailed_value==1);",
+        "\t\tenable('offshore_electrical_infrastructure_cost_rvalue',detailed_value==2);",
         "\t\trefresh();",
         "\t}",
         "}",
@@ -5319,7 +5727,8 @@
         "\titemized_value = value('itemized_check_assem_install');",
         "\tenable('substructures_and_foundations_cost',itemized_value==1);",
         "\tenable('substructure_assem_install_cost_total',itemized_value==1);",
-        "\tenable('detailed_cost_choice_substructures',itemized_value==1);",
+        "\tenable('detailed_cost_choice_substructures',itemized_value==1);\r",
+        "\tenable('substructures_and_foundations_cost_rvalue',itemized_value==1);",
         "\tenable('foundation_assem_install_cost',itemized_value==1);",
         "\tenable('substructure_assem_install_cost',itemized_value==1);",
         "\tenable('scour_protection_assem_install_cost',itemized_value==1);",
@@ -5327,13 +5736,15 @@
         "\tenable('other_substructure_cost',itemized_value==1);",
         "\tenable('marine_energy_converter_device_cost',itemized_value==1);",
         "\tenable('marine_energy_converter_device_cost_total',itemized_value==1);",
-        "\tenable('detailed_cost_choice_mec_device',itemized_value==1);",
+        "\tenable('detailed_cost_choice_mec_device',itemized_value==1);\r",
+        "\tenable('marine_energy_converter_device_cost_rvalue',itemized_value==1);",
         "\tenable('structural_assembly_assem_install_cost',itemized_value==1);",
         "\tenable('power_takeoff_system_assem_install_cost',itemized_value==1);",
         "\tenable('other_marine_energy_converter_device_cost',itemized_value==1);",
         "\tenable('offshore_electrical_infrastructure_cost',itemized_value==1);",
         "\tenable('offshore_electrical_infrastructure_cost_total',itemized_value==1);",
         "\tenable('detailed_cost_choice_offshore_infrastructure',itemized_value==1);",
+        "\tenable('offshore_electrical_infrastructure_cost_rvalue',itemized_value==1);\r",
         "\tenable('array_cables_assem_install_cost',itemized_value==1);",
         "\tenable('offshore_export_cables_assem_install_cost',itemized_value==1);",
         "\tenable('offshore_substation_assem_install_cost',itemized_value==1);",
@@ -5343,6 +5754,7 @@
         "\tenable('onshore_electrical_infrastructure_cost',itemized_value==1);",
         "\tenable('onshore_electrical_infrastructure_cost_total',itemized_value==1);",
         "\tenable('detailed_cost_choice_onshore_infrastructure',itemized_value==1);",
+        "\tenable('onshore_electrical_infrastructure_cost_rvalue',itemized_value==1);\r",
         "\tenable('underground_cable_system_onshore_electrical_infrastructure_cost',itemized_value==1);",
         "\tenable('overhead_transmission_line_cost',itemized_value==1);",
         "\tenable('onshore_substation_assem_install_cost',itemized_value==1);",
@@ -5352,10 +5764,11 @@
         "\tenable('other_assem_install_cost',itemized_value==1);",
         "\t//show('level_eng',itemized_value==1);",
         "\t//show('level_label',itemized_value==1);",
-        "\tenable('assembly_and_install_cost_input',itemized_value!=2);",
+        "\tenable('assembly_and_install_cost_input',itemized_value!=2);\r",
+        "\tenable('assembly_and_install_cost_rvalue', itemized_value==3);",
         "\tshow('assembly_and_install_cost_total',itemized_value==1);",
         "\tshow('assem_level_total_label',itemized_value==1);",
-        "\tshow('assembly_and_install_cost_input',(itemized_value==0 || itemized_value==2));",
+        "\tshow('assembly_and_install_cost_input',itemized_value != 1);",
         "\tshow('assem_user_input_label',(itemized_value==0 || itemized_value==2));",
         "\t//show('level_label',itemized_value==1);",
         "\t//show('level_line',itemized_value==1);",
diff --git a/deploy/runtime/ui/Marine Costs - BoS.json b/deploy/runtime/ui/Marine Costs - BoS.json
index 70137d4c88..0a5a2c682d 100644
--- a/deploy/runtime/ui/Marine Costs - BoS.json	
+++ b/deploy/runtime/ui/Marine Costs - BoS.json	
@@ -12,7 +12,7 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 681.0
+                    "Integer": 789.0
                 },
                 "Y": {
                     "Type": 3.0,
@@ -198,7 +198,7 @@
                 },
                 "Items": {
                     "Type": 6.0,
-                    "StringList": "Enter in $/kW|Enter in $|Use Modeled Value ($)|Use Cost Breakdown ($)"
+                    "StringList": "Enter in $/kW|Enter in $|Use Modeled Value ($)|Use Cost Breakdown ($)|Use Array Scaling"
                 },
                 "Selection": {
                     "Type": 3.0,
@@ -293,6 +293,89 @@
                 }
             }
         },
+        "Numeric": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "assembly_and_install_cost_rvalue"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 681.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 378.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 100.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 24.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Value": {
+                    "Type": 1.0,
+                    "Double": 0.0
+                },
+                "Mode": {
+                    "Type": 3.0,
+                    "Integer": 1.0
+                },
+                "Format": {
+                    "Type": 3.0,
+                    "Integer": 0.0
+                },
+                "Decimals": {
+                    "Type": 3.0,
+                    "Integer": 3.0
+                },
+                "Prefix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Suffix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "ThousandsSep": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "Editable": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "ForeColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 0.0,
+                        "Green": 0.0,
+                        "Blue": 0.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "BackColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 255.0,
+                        "Green": 255.0,
+                        "Blue": 255.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "TabOrder": {
+                    "Type": 3.0,
+                    "Integer": 1.0
+                }
+            }
+        },
         "Numeric": {
             "Visible": 1.0,
             "ObjectProperties": {
@@ -385,11 +468,11 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 681.0
+                    "Integer": 789.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 462.0
+                    "Integer": 465.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -468,11 +551,11 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 519.0
+                    "Integer": 627.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 501.0
+                    "Integer": 504.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -509,11 +592,11 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 681.0
+                    "Integer": 789.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 462.0
+                    "Integer": 465.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -654,7 +737,7 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 681.0
+                    "Integer": 789.0
                 },
                 "Y": {
                     "Type": 3.0,
@@ -902,7 +985,7 @@
                 },
                 "Items": {
                     "Type": 6.0,
-                    "StringList": "Enter in $/kW|Enter in $|Use Modeled Value ($)|Use Cost Breakdown ($)"
+                    "StringList": "Enter in $/kW|Enter in $|Use Modeled Value ($)|Use Cost Breakdown ($)|Use Array Scaling"
                 },
                 "Selection": {
                     "Type": 3.0,
@@ -997,6 +1080,89 @@
                 }
             }
         },
+        "Numeric": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "development_cost_rvalue"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 681.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 213.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 100.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 24.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Value": {
+                    "Type": 1.0,
+                    "Double": 0.0
+                },
+                "Mode": {
+                    "Type": 3.0,
+                    "Integer": 1.0
+                },
+                "Format": {
+                    "Type": 3.0,
+                    "Integer": 0.0
+                },
+                "Decimals": {
+                    "Type": 3.0,
+                    "Integer": 3.0
+                },
+                "Prefix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Suffix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "ThousandsSep": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "Editable": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "ForeColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 0.0,
+                        "Green": 0.0,
+                        "Blue": 0.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "BackColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 255.0,
+                        "Green": 255.0,
+                        "Blue": 255.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "TabOrder": {
+                    "Type": 3.0,
+                    "Integer": 1.0
+                }
+            }
+        },
         "Numeric": {
             "Visible": 1.0,
             "ObjectProperties": {
@@ -1089,7 +1255,7 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 681.0
+                    "Integer": 789.0
                 },
                 "Y": {
                     "Type": 3.0,
@@ -1275,7 +1441,7 @@
                 },
                 "Items": {
                     "Type": 6.0,
-                    "StringList": "Enter in $/kW|Enter in $|Use Modeled Value ($)|Use Cost Breakdown ($)"
+                    "StringList": "Enter in $/kW|Enter in $|Use Modeled Costs ($)|Use Cost Breakdown ($)|Use Array Scaling"
                 },
                 "Selection": {
                     "Type": 3.0,
@@ -1370,6 +1536,89 @@
                 }
             }
         },
+        "Numeric": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "elec_infras_cost_rvalue"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 681.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 279.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 100.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 24.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Value": {
+                    "Type": 1.0,
+                    "Double": 0.0
+                },
+                "Mode": {
+                    "Type": 3.0,
+                    "Integer": 1.0
+                },
+                "Format": {
+                    "Type": 3.0,
+                    "Integer": 0.0
+                },
+                "Decimals": {
+                    "Type": 3.0,
+                    "Integer": 3.0
+                },
+                "Prefix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Suffix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "ThousandsSep": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "Editable": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "ForeColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 0.0,
+                        "Green": 0.0,
+                        "Blue": 0.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "BackColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 255.0,
+                        "Green": 255.0,
+                        "Blue": 255.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "TabOrder": {
+                    "Type": 3.0,
+                    "Integer": 1.0
+                }
+            }
+        },
         "Numeric": {
             "Visible": 1.0,
             "ObjectProperties": {
@@ -1462,7 +1711,7 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 681.0
+                    "Integer": 789.0
                 },
                 "Y": {
                     "Type": 3.0,
@@ -1648,7 +1897,7 @@
                 },
                 "Items": {
                     "Type": 6.0,
-                    "StringList": "Enter in $/kW|Enter in $|Use Modeled Value ($)|Use Cost Breakdown ($)"
+                    "StringList": "Enter in $/kW|Enter in $|Use Modeled Value ($)|Use Cost Breakdown ($)|Use Array Scaling"
                 },
                 "Selection": {
                     "Type": 3.0,
@@ -1748,11 +1997,11 @@
             "ObjectProperties": {
                 "Name": {
                     "Type": 5.0,
-                    "String": "eng_and_mgmt_cost_total"
+                    "String": "eng_and_mgmt_cost_rvalue"
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 558.0
+                    "Integer": 681.0
                 },
                 "Y": {
                     "Type": 3.0,
@@ -1784,7 +2033,90 @@
                 },
                 "Decimals": {
                     "Type": 3.0,
-                    "Integer": 0.0
+                    "Integer": 3.0
+                },
+                "Prefix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Suffix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "ThousandsSep": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "Editable": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "ForeColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 0.0,
+                        "Green": 0.0,
+                        "Blue": 0.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "BackColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 255.0,
+                        "Green": 255.0,
+                        "Blue": 255.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "TabOrder": {
+                    "Type": 3.0,
+                    "Integer": 1.0
+                }
+            }
+        },
+        "Numeric": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "eng_and_mgmt_cost_total"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 558.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 246.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 100.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 24.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Value": {
+                    "Type": 1.0,
+                    "Double": 0.0
+                },
+                "Mode": {
+                    "Type": 3.0,
+                    "Integer": 1.0
+                },
+                "Format": {
+                    "Type": 3.0,
+                    "Integer": 0.0
+                },
+                "Decimals": {
+                    "Type": 3.0,
+                    "Integer": 0.0
                 },
                 "Prefix": {
                     "Type": 5.0,
@@ -1835,7 +2167,7 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 780.0
+                    "Integer": 879.0
                 },
                 "Y": {
                     "Type": 3.0,
@@ -1897,7 +2229,7 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 780.0
+                    "Integer": 879.0
                 },
                 "Y": {
                     "Type": 3.0,
@@ -1959,7 +2291,7 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 780.0
+                    "Integer": 879.0
                 },
                 "Y": {
                     "Type": 3.0,
@@ -2021,7 +2353,7 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 780.0
+                    "Integer": 879.0
                 },
                 "Y": {
                     "Type": 3.0,
@@ -2083,7 +2415,7 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 780.0
+                    "Integer": 879.0
                 },
                 "Y": {
                     "Type": 3.0,
@@ -2145,7 +2477,7 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 780.0
+                    "Integer": 879.0
                 },
                 "Y": {
                     "Type": 3.0,
@@ -2207,7 +2539,7 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 780.0
+                    "Integer": 879.0
                 },
                 "Y": {
                     "Type": 3.0,
@@ -2542,7 +2874,7 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 666.0
+                    "Integer": 780.0
                 },
                 "Y": {
                     "Type": 3.0,
@@ -2595,6 +2927,68 @@
                 }
             }
         },
+        "Label": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "object 73228"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 666.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 186.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 114.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 24.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Caption": {
+                    "Type": 5.0,
+                    "String": "Array scaling R-value"
+                },
+                "TextColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 0.0,
+                        "Green": 0.0,
+                        "Blue": 0.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "Bold": {
+                    "Type": 2.0,
+                    "Boolean": 0.0
+                },
+                "FontSize": {
+                    "Type": 3.0,
+                    "Integer": 0.0
+                },
+                "WordWrap": {
+                    "Type": 2.0,
+                    "Boolean": 0.0
+                },
+                "AlignRight": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "AlignTop": {
+                    "Type": 2.0,
+                    "Boolean": 0.0
+                }
+            }
+        },
         "Label": {
             "Visible": 1.0,
             "ObjectProperties": {
@@ -2604,11 +2998,11 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 474.0
+                    "Integer": 582.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 462.0
+                    "Integer": 465.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -3162,7 +3556,7 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 681.0
+                    "Integer": 789.0
                 },
                 "Y": {
                     "Type": 3.0,
@@ -3348,7 +3742,7 @@
                 },
                 "Items": {
                     "Type": 6.0,
-                    "StringList": "Enter in $/kW|Enter in $|Use Modeled Value ($)|Use Cost Breakdown ($)"
+                    "StringList": "Enter in $/kW|Enter in $|Use Modeled Value ($)|Use Cost Breakdown ($)|Use Array Scaling"
                 },
                 "Selection": {
                     "Type": 3.0,
@@ -3443,6 +3837,89 @@
                 }
             }
         },
+        "Numeric": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "other_infrastructure_cost_rvalue"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 681.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 411.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 100.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 24.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Value": {
+                    "Type": 1.0,
+                    "Double": 0.0
+                },
+                "Mode": {
+                    "Type": 3.0,
+                    "Integer": 1.0
+                },
+                "Format": {
+                    "Type": 3.0,
+                    "Integer": 0.0
+                },
+                "Decimals": {
+                    "Type": 3.0,
+                    "Integer": 3.0
+                },
+                "Prefix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Suffix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "ThousandsSep": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "Editable": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "ForeColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 0.0,
+                        "Green": 0.0,
+                        "Blue": 0.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "BackColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 255.0,
+                        "Green": 255.0,
+                        "Blue": 255.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "TabOrder": {
+                    "Type": 3.0,
+                    "Integer": 1.0
+                }
+            }
+        },
         "Numeric": {
             "Visible": 1.0,
             "ObjectProperties": {
@@ -3618,7 +4095,7 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 681.0
+                    "Integer": 789.0
                 },
                 "Y": {
                     "Type": 3.0,
@@ -3804,7 +4281,7 @@
                 },
                 "Items": {
                     "Type": 6.0,
-                    "StringList": "Enter in $/kW|Enter in $|Use Modeled Value ($)"
+                    "StringList": "Enter in $/kW|Enter in $|Use Modeled Value ($)|Use Array Scaling"
                 },
                 "Selection": {
                     "Type": 3.0,
@@ -3904,12 +4381,95 @@
             "ObjectProperties": {
                 "Name": {
                     "Type": 5.0,
-                    "String": "site_access_port_staging_cost"
+                    "String": "plant_commissioning_cost_rvalue"
                 },
                 "X": {
                     "Type": 3.0,
                     "Integer": 681.0
                 },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 312.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 100.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 24.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Value": {
+                    "Type": 1.0,
+                    "Double": 0.0
+                },
+                "Mode": {
+                    "Type": 3.0,
+                    "Integer": 1.0
+                },
+                "Format": {
+                    "Type": 3.0,
+                    "Integer": 0.0
+                },
+                "Decimals": {
+                    "Type": 3.0,
+                    "Integer": 3.0
+                },
+                "Prefix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Suffix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "ThousandsSep": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "Editable": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "ForeColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 0.0,
+                        "Green": 0.0,
+                        "Blue": 0.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "BackColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 255.0,
+                        "Green": 255.0,
+                        "Blue": 255.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "TabOrder": {
+                    "Type": 3.0,
+                    "Integer": 1.0
+                }
+            }
+        },
+        "Numeric": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "site_access_port_staging_cost"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 789.0
+                },
                 "Y": {
                     "Type": 3.0,
                     "Integer": 345.0
@@ -4094,7 +4654,7 @@
                 },
                 "Items": {
                     "Type": 6.0,
-                    "StringList": "Enter in $/kW|Enter in $|Use Modeled Value ($)|Use Cost Breakdown ($)"
+                    "StringList": "Enter in $/kW|Enter in $|Use Modeled Costs ($)|Use Cost Breakdown ($)|Use Array Scaling"
                 },
                 "Selection": {
                     "Type": 3.0,
@@ -4189,6 +4749,89 @@
                 }
             }
         },
+        "Numeric": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "site_access_port_staging_cost_rvalue"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 681.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 345.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 100.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 24.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Value": {
+                    "Type": 1.0,
+                    "Double": 0.0
+                },
+                "Mode": {
+                    "Type": 3.0,
+                    "Integer": 1.0
+                },
+                "Format": {
+                    "Type": 3.0,
+                    "Integer": 0.0
+                },
+                "Decimals": {
+                    "Type": 3.0,
+                    "Integer": 3.0
+                },
+                "Prefix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Suffix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "ThousandsSep": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "Editable": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "ForeColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 0.0,
+                        "Green": 0.0,
+                        "Blue": 0.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "BackColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 255.0,
+                        "Green": 255.0,
+                        "Blue": 255.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "TabOrder": {
+                    "Type": 3.0,
+                    "Integer": 1.0
+                }
+            }
+        },
         "Numeric": {
             "Visible": 1.0,
             "ObjectProperties": {
@@ -4274,6 +4917,19 @@
         }
     },
     "VarDatabase": {
+        "assembly_and_install_cost_rvalue": {
+            "Version": 4.0,
+            "Type": 1.0,
+            "Label": "",
+            "Units": "",
+            "Group": "",
+            "IndexLabels": "",
+            "Flags": 0.0,
+            "DefaultValue": 0.0,
+            "UIObject": "Default",
+            "sscVariableName": "",
+            "sscVariableValue": ""
+        },
         "balance_of_system_cost_input": {
             "Version": 4.0,
             "Type": 1.0,
@@ -4339,6 +4995,58 @@
             "sscVariableName": "",
             "sscVariableValue": ""
         },
+        "development_cost_rvalue": {
+            "Version": 4.0,
+            "Type": 1.0,
+            "Label": "",
+            "Units": "",
+            "Group": "ME Costs - BOS",
+            "IndexLabels": "",
+            "Flags": 0.0,
+            "DefaultValue": 0.0,
+            "UIObject": "Default",
+            "sscVariableName": "",
+            "sscVariableValue": ""
+        },
+        "elec_infras_cost_rvalue": {
+            "Version": 4.0,
+            "Type": 1.0,
+            "Label": "",
+            "Units": "",
+            "Group": "ME Costs - BOS",
+            "IndexLabels": "",
+            "Flags": 0.0,
+            "DefaultValue": 0.0,
+            "UIObject": "Default",
+            "sscVariableName": "",
+            "sscVariableValue": ""
+        },
+        "eng_and_mgmt_cost_rvalue": {
+            "Version": 4.0,
+            "Type": 1.0,
+            "Label": "",
+            "Units": "",
+            "Group": "ME Costs - BOS",
+            "IndexLabels": "",
+            "Flags": 0.0,
+            "DefaultValue": 0.0,
+            "UIObject": "Default",
+            "sscVariableName": "",
+            "sscVariableValue": ""
+        },
+        "other_infrastructure_cost_rvalue": {
+            "Version": 4.0,
+            "Type": 1.0,
+            "Label": "",
+            "Units": "",
+            "Group": "ME Costs - BOS",
+            "IndexLabels": "",
+            "Flags": 0.0,
+            "DefaultValue": 0.0,
+            "UIObject": "Default",
+            "sscVariableName": "",
+            "sscVariableValue": ""
+        },
         "plant_commissioning_cost": {
             "Version": 4.0,
             "Type": 1.0,
@@ -4371,7 +5079,7 @@
             "Label": "Plant commissioning cost method ",
             "Units": " ",
             "Group": "ME Costs - BOS",
-            "IndexLabels": "Enter in $/kW|Enter in $| Use Modeled Costs ($)|Use Cost Breakdown ($)",
+            "IndexLabels": "Enter in $/kW|Enter in $| Use Modeled Costs ($)|Use Array Scaling",
             "Flags": 3.0,
             "DefaultValue": 2.0,
             "UIObject": "Choice",
@@ -4390,6 +5098,32 @@
             "UIObject": "Default",
             "sscVariableName": "",
             "sscVariableValue": ""
+        },
+        "plant_commissioning_cost_rvalue": {
+            "Version": 4.0,
+            "Type": 1.0,
+            "Label": "",
+            "Units": "",
+            "Group": "ME Costs - BOS",
+            "IndexLabels": "",
+            "Flags": 0.0,
+            "DefaultValue": 0.0,
+            "UIObject": "Default",
+            "sscVariableName": "",
+            "sscVariableValue": ""
+        },
+        "site_access_port_staging_cost_rvalue": {
+            "Version": 4.0,
+            "Type": 1.0,
+            "Label": "",
+            "Units": "",
+            "Group": "ME Costs - BOS",
+            "IndexLabels": "",
+            "Flags": 0.0,
+            "DefaultValue": 0.0,
+            "UIObject": "Default",
+            "sscVariableName": "",
+            "sscVariableValue": ""
         }
     },
     "Equations": [
@@ -4416,11 +5150,13 @@
         "};",
         "",
         "equations{ 'plant_commissioning_cost' } = define() {",
+        "\tarray_scaling_b_value = -log(1 - ${plant_commissioning_cost_rvalue}) / log(2);\r",
         "\treturn ?${plant_commissioning_cost_method}",
         "\t\t\t[",
         "\t\t\t\t${plant_commissioning_cost_input} * ${system_capacity},",
         "\t\t\t\t${plant_commissioning_cost_input},",
-        "\t\t\t\t${plant_commissioning_cost_modeled_ui}",
+        "\t\t\t\t${plant_commissioning_cost_modeled_ui},\r",
+        "\t\t\t\t(${plant_commissioning_cost_input}*pow(${number_devices},-array_scaling_b_value))*${number_devices}",
         "\t\t\t];",
         "};",
         "",
@@ -4429,7 +5165,8 @@
         "\t\t\t[",
         "\t\t\t\t0,",
         "\t\t\t\t0,",
-        "\t\t\t\t1",
+        "\t\t\t\t1,\r",
+        "\t\t\t\t3",
         "\t\t\t];",
         "};",
         "",
@@ -4518,47 +5255,55 @@
         "\t//Development",
         "\tshow('development_cost_total',value('development_cost_method')==3);",
         "\tshow('development_cost_input',value('development_cost_method')!=3);",
-        "\tenable('development_cost_input',value('development_cost_method')!=2);",
+        "\tenable('development_cost_input',value('development_cost_method')!=2);\r",
+        "\tenable('development_cost_rvalue',value('development_cost_method')==4);",
         "\t",
         "\t//E&M",
         "\tshow('eng_and_mgmt_cost_total',value('eng_and_mgmt_cost_method')==3);",
         "\tshow('eng_and_mgmt_cost_input',value('eng_and_mgmt_cost_method')!=3);",
-        "\tenable('eng_and_mgmt_cost_input',value('eng_and_mgmt_cost_method')!=2);",
+        "\tenable('eng_and_mgmt_cost_input',value('eng_and_mgmt_cost_method')!=2);\r",
+        "\tenable('eng_and_mgmt_cost_rvalue',value('eng_and_mgmt_cost_method')==4);",
         "\t",
         "\t//Electrical Infrastructure",
         "\tshow('elec_infras_cost_total',value('elec_infras_cost_method')==3);",
         "\tshow('elec_infras_cost_input',value('elec_infras_cost_method')!=3);",
-        "\tenable('elec_infras_cost_input',value('elec_infras_cost_method')!=2);",
+        "\tenable('elec_infras_cost_input',value('elec_infras_cost_method')!=2);\r",
+        "\tenable('elec_infras_cost_rvalue',value('elec_infras_cost_method')==4);",
         "\t",
         "\t//Plant Commissioning",
         "\t//show('plant_commissioning_cost_total',value('plant_commissioning_cost_method')==3);",
         "\t//show('plant_commissioning_cost_input',value('plant_commissioning_cost_method')!=2);",
-        "\tenable('plant_commissioning_cost_input',value('plant_commissioning_cost_method')!=2);",
+        "\tenable('plant_commissioning_cost_input',value('plant_commissioning_cost_method')!=2);\r",
+        "\tenable('plant_commissioning_cost_rvalue',value('plant_commissioning_cost_method')==4);",
         "\t",
         "\t//Site access, Port and Staging",
         "\tshow('site_access_port_staging_cost_total',value('site_access_port_staging_cost_method')==3);",
         "\tshow('site_access_port_staging_cost_input',value('site_access_port_staging_cost_method')!=3);",
-        "\tenable('site_access_port_staging_cost_input',value('site_access_port_staging_cost_method')!=2);",
+        "\tenable('site_access_port_staging_cost_input',value('site_access_port_staging_cost_method')!=2);\r",
+        "\tenable('site_access_port_staging_cost_rvalue',value('site_access_port_staging_cost_method')==4);",
         "\t",
         "\t//Assembly and Install",
         "\tshow('assembly_and_install_cost_total',value('assembly_and_install_cost_method')==3);",
         "\tshow('assembly_and_install_cost_input',value('assembly_and_install_cost_method')!=3);",
         "\tenable('assembly_and_install_cost_input',value('assembly_and_install_cost_method')!=2);",
-        "\t",
+        "\tenable('assembly_and_install_cost_rvalue',value('assembly_and_install_cost_method')==4);",
+        "\t\r",
         "\t//Other Infrastructure",
         "\tshow('other_infrastructure_cost_total',value('other_infrastructure_cost_method')==3);",
         "\tshow('other_infrastructure_cost_input',value('other_infrastructure_cost_method')!=3);",
-        "\tenable('other_infrastructure_cost_input',value('other_infrastructure_cost_method')!=2);",
+        "\tenable('other_infrastructure_cost_input',value('other_infrastructure_cost_method')!=2);\r",
+        "\tenable('other_infrastructure_cost_rvalue',value('assembly_and_install_cost_method')==4);",
         "\t",
-        "\ton_change{'balance_of_system_cost_override'};",
+        "\ton_change{'balance_of_system_cost_override'}();",
         "\toverride_balance_of_system_cost();",
-        "\ton_change{'plant_commissioning_cost_override'};",
+        "\ton_change{'plant_commissioning_cost_method'}();",
         "\t",
         "\trefresh();",
         "};",
         "",
         "on_change{'plant_commissioning_cost_method'} = define() {",
         "\tenable('plant_commissioning_cost_input',value('plant_commissioning_cost_method')!=2);",
+        "\tenable('plant_commissioning_cost_rvalue', value('plant_commissioning_cost_method')==3);\r",
         "\trefresh();",
         "};",
         "",
diff --git a/deploy/runtime/ui/Marine Costs - Development.json b/deploy/runtime/ui/Marine Costs - Development.json
index a4652658a9..ee7ff17efd 100644
--- a/deploy/runtime/ui/Marine Costs - Development.json	
+++ b/deploy/runtime/ui/Marine Costs - Development.json	
@@ -495,7 +495,7 @@
                 }
             }
         },
-        "CheckBox": {
+        "Choice": {
             "Visible": 1.0,
             "ObjectProperties": {
                 "Name": {
@@ -504,15 +504,15 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 357.0
+                    "Integer": 474.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 1203.0
+                    "Integer": 1173.0
                 },
                 "Width": {
                     "Type": 3.0,
-                    "Integer": 186.0
+                    "Integer": 177.0
                 },
                 "Height": {
                     "Type": 3.0,
@@ -522,13 +522,13 @@
                     "Type": 5.0,
                     "String": ""
                 },
-                "Caption": {
-                    "Type": 5.0,
-                    "String": "Enter detailed costs"
+                "Items": {
+                    "Type": 6.0,
+                    "StringList": "Enter cost|Enter itemized costs|Array scaling costs"
                 },
-                "State": {
-                    "Type": 2.0,
-                    "Boolean": 0.0
+                "Selection": {
+                    "Type": 3.0,
+                    "Integer": -1.0
                 },
                 "TabOrder": {
                     "Type": 3.0,
@@ -536,7 +536,7 @@
                 }
             }
         },
-        "CheckBox": {
+        "Choice": {
             "Visible": 1.0,
             "ObjectProperties": {
                 "Name": {
@@ -545,15 +545,15 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 360.0
+                    "Integer": 474.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 453.0
+                    "Integer": 423.0
                 },
                 "Width": {
                     "Type": 3.0,
-                    "Integer": 183.0
+                    "Integer": 177.0
                 },
                 "Height": {
                     "Type": 3.0,
@@ -563,13 +563,13 @@
                     "Type": 5.0,
                     "String": ""
                 },
-                "Caption": {
-                    "Type": 5.0,
-                    "String": "Enter detailed costs"
+                "Items": {
+                    "Type": 6.0,
+                    "StringList": "Enter cost|Enter itemized costs|Array scaling costs"
                 },
-                "State": {
-                    "Type": 2.0,
-                    "Boolean": 0.0
+                "Selection": {
+                    "Type": 3.0,
+                    "Integer": -1.0
                 },
                 "TabOrder": {
                     "Type": 3.0,
@@ -577,7 +577,7 @@
                 }
             }
         },
-        "CheckBox": {
+        "Choice": {
             "Visible": 1.0,
             "ObjectProperties": {
                 "Name": {
@@ -586,15 +586,15 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 348.0
+                    "Integer": 474.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 783.0
+                    "Integer": 753.0
                 },
                 "Width": {
                     "Type": 3.0,
-                    "Integer": 183.0
+                    "Integer": 177.0
                 },
                 "Height": {
                     "Type": 3.0,
@@ -604,13 +604,13 @@
                     "Type": 5.0,
                     "String": ""
                 },
-                "Caption": {
-                    "Type": 5.0,
-                    "String": "Enter detailed costs"
+                "Items": {
+                    "Type": 6.0,
+                    "StringList": "Enter cost|Enter itemized costs|Array scaling costs"
                 },
-                "State": {
-                    "Type": 2.0,
-                    "Boolean": 0.0
+                "Selection": {
+                    "Type": 3.0,
+                    "Integer": -1.0
                 },
                 "TabOrder": {
                     "Type": 3.0,
@@ -618,7 +618,7 @@
                 }
             }
         },
-        "CheckBox": {
+        "Choice": {
             "Visible": 1.0,
             "ObjectProperties": {
                 "Name": {
@@ -627,15 +627,15 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 360.0
+                    "Integer": 474.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 273.0
+                    "Integer": 243.0
                 },
                 "Width": {
                     "Type": 3.0,
-                    "Integer": 183.0
+                    "Integer": 177.0
                 },
                 "Height": {
                     "Type": 3.0,
@@ -645,13 +645,13 @@
                     "Type": 5.0,
                     "String": ""
                 },
-                "Caption": {
-                    "Type": 5.0,
-                    "String": "Enter detailed costs"
+                "Items": {
+                    "Type": 6.0,
+                    "StringList": "Enter cost|Enter itemized costs|Array scaling costs"
                 },
-                "State": {
-                    "Type": 2.0,
-                    "Boolean": 0.0
+                "Selection": {
+                    "Type": 3.0,
+                    "Integer": -1.0
                 },
                 "TabOrder": {
                     "Type": 3.0,
@@ -659,7 +659,7 @@
                 }
             }
         },
-        "CheckBox": {
+        "Choice": {
             "Visible": 1.0,
             "ObjectProperties": {
                 "Name": {
@@ -668,15 +668,15 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 357.0
+                    "Integer": 474.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 963.0
+                    "Integer": 933.0
                 },
                 "Width": {
                     "Type": 3.0,
-                    "Integer": 189.0
+                    "Integer": 177.0
                 },
                 "Height": {
                     "Type": 3.0,
@@ -686,13 +686,13 @@
                     "Type": 5.0,
                     "String": ""
                 },
-                "Caption": {
-                    "Type": 5.0,
-                    "String": "Enter detailed costs"
+                "Items": {
+                    "Type": 6.0,
+                    "StringList": "Enter cost|Enter itemized costs|Array scaling costs"
                 },
-                "State": {
-                    "Type": 2.0,
-                    "Boolean": 0.0
+                "Selection": {
+                    "Type": 3.0,
+                    "Integer": -1.0
                 },
                 "TabOrder": {
                     "Type": 3.0,
@@ -700,7 +700,7 @@
                 }
             }
         },
-        "CheckBox": {
+        "Choice": {
             "Visible": 1.0,
             "ObjectProperties": {
                 "Name": {
@@ -709,15 +709,15 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 360.0
+                    "Integer": 474.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 603.0
+                    "Integer": 573.0
                 },
                 "Width": {
                     "Type": 3.0,
-                    "Integer": 183.0
+                    "Integer": 177.0
                 },
                 "Height": {
                     "Type": 3.0,
@@ -727,13 +727,13 @@
                     "Type": 5.0,
                     "String": ""
                 },
-                "Caption": {
-                    "Type": 5.0,
-                    "String": "Enter detailed costs"
+                "Items": {
+                    "Type": 6.0,
+                    "StringList": "Enter cost|Enter itemized costs|Array scaling costs"
                 },
-                "State": {
-                    "Type": 2.0,
-                    "Boolean": 0.0
+                "Selection": {
+                    "Type": 3.0,
+                    "Integer": -1.0
                 },
                 "TabOrder": {
                     "Type": 3.0,
@@ -741,7 +741,7 @@
                 }
             }
         },
-        "CheckBox": {
+        "Choice": {
             "Visible": 1.0,
             "ObjectProperties": {
                 "Name": {
@@ -750,11 +750,11 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 360.0
+                    "Integer": 477.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 93.0
+                    "Integer": 63.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -768,13 +768,13 @@
                     "Type": 5.0,
                     "String": ""
                 },
-                "Caption": {
-                    "Type": 5.0,
-                    "String": "Enter detailed costs"
+                "Items": {
+                    "Type": 6.0,
+                    "StringList": "Enter cost|Enter itemized costs|Array scaling costs"
                 },
-                "State": {
-                    "Type": 2.0,
-                    "Boolean": 0.0
+                "Selection": {
+                    "Type": 3.0,
+                    "Integer": -1.0
                 },
                 "TabOrder": {
                     "Type": 3.0,
@@ -1409,15 +1409,15 @@
             "ObjectProperties": {
                 "Name": {
                     "Type": 5.0,
-                    "String": "financing_and_incentives_cost_total"
+                    "String": "financing_and_incentives_cost_rvalue"
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 339.0
+                    "Integer": 468.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 1173.0
+                    "Integer": 1203.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -1445,11 +1445,11 @@
                 },
                 "Decimals": {
                     "Type": 3.0,
-                    "Integer": 0.0
+                    "Integer": 3.0
                 },
                 "Prefix": {
                     "Type": 5.0,
-                    "String": "$"
+                    "String": ""
                 },
                 "Suffix": {
                     "Type": 5.0,
@@ -1492,15 +1492,15 @@
             "ObjectProperties": {
                 "Name": {
                     "Type": 5.0,
-                    "String": "geological_and_bathymetry_cost"
+                    "String": "financing_and_incentives_cost_total"
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 468.0
+                    "Integer": 339.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 693.0
+                    "Integer": 1173.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -1566,7 +1566,7 @@
                 },
                 "TabOrder": {
                     "Type": 3.0,
-                    "Integer": 18.0
+                    "Integer": -1.0
                 }
             }
         },
@@ -1575,7 +1575,7 @@
             "ObjectProperties": {
                 "Name": {
                     "Type": 5.0,
-                    "String": "incentives_cost"
+                    "String": "geological_and_bathymetry_cost"
                 },
                 "X": {
                     "Type": 3.0,
@@ -1583,7 +1583,7 @@
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 1263.0
+                    "Integer": 693.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -1649,7 +1649,7 @@
                 },
                 "TabOrder": {
                     "Type": 3.0,
-                    "Integer": 34.0
+                    "Integer": 18.0
                 }
             }
         },
@@ -1658,15 +1658,15 @@
             "ObjectProperties": {
                 "Name": {
                     "Type": 5.0,
-                    "String": "initial_engineering_cost"
+                    "String": "incentives_cost"
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 339.0
+                    "Integer": 468.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 423.0
+                    "Integer": 1263.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -1732,7 +1732,7 @@
                 },
                 "TabOrder": {
                     "Type": 3.0,
-                    "Integer": 11.0
+                    "Integer": 34.0
                 }
             }
         },
@@ -1741,7 +1741,7 @@
             "ObjectProperties": {
                 "Name": {
                     "Type": 5.0,
-                    "String": "initial_engineering_cost_total"
+                    "String": "initial_engineering_cost"
                 },
                 "X": {
                     "Type": 3.0,
@@ -1815,7 +1815,7 @@
                 },
                 "TabOrder": {
                     "Type": 3.0,
-                    "Integer": -1.0
+                    "Integer": 11.0
                 }
             }
         },
@@ -1824,15 +1824,15 @@
             "ObjectProperties": {
                 "Name": {
                     "Type": 5.0,
-                    "String": "interconnection_and_power_marketing_cost"
+                    "String": "initial_engineering_cost_rvalue"
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 339.0
+                    "Integer": 468.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 753.0
+                    "Integer": 453.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -1860,11 +1860,11 @@
                 },
                 "Decimals": {
                     "Type": 3.0,
-                    "Integer": 0.0
+                    "Integer": 3.0
                 },
                 "Prefix": {
                     "Type": 5.0,
-                    "String": "$"
+                    "String": ""
                 },
                 "Suffix": {
                     "Type": 5.0,
@@ -1898,7 +1898,7 @@
                 },
                 "TabOrder": {
                     "Type": 3.0,
-                    "Integer": 20.0
+                    "Integer": -1.0
                 }
             }
         },
@@ -1907,7 +1907,7 @@
             "ObjectProperties": {
                 "Name": {
                     "Type": 5.0,
-                    "String": "interconnection_and_power_marketing_cost_total"
+                    "String": "initial_engineering_cost_total"
                 },
                 "X": {
                     "Type": 3.0,
@@ -1915,7 +1915,7 @@
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 753.0
+                    "Integer": 423.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -1990,15 +1990,15 @@
             "ObjectProperties": {
                 "Name": {
                     "Type": 5.0,
-                    "String": "interconnection_studies_and_fees_cost"
+                    "String": "interconnection_and_power_marketing_cost"
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 468.0
+                    "Integer": 339.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 813.0
+                    "Integer": 753.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -2064,7 +2064,7 @@
                 },
                 "TabOrder": {
                     "Type": 3.0,
-                    "Integer": 21.0
+                    "Integer": 20.0
                 }
             }
         },
@@ -2073,7 +2073,7 @@
             "ObjectProperties": {
                 "Name": {
                     "Type": 5.0,
-                    "String": "lease_acquisition_activities_cost"
+                    "String": "interconnection_and_power_marketing_cost_rvalue"
                 },
                 "X": {
                     "Type": 3.0,
@@ -2081,7 +2081,7 @@
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 333.0
+                    "Integer": 783.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -2109,11 +2109,11 @@
                 },
                 "Decimals": {
                     "Type": 3.0,
-                    "Integer": 0.0
+                    "Integer": 3.0
                 },
                 "Prefix": {
                     "Type": 5.0,
-                    "String": "$"
+                    "String": ""
                 },
                 "Suffix": {
                     "Type": 5.0,
@@ -2147,7 +2147,7 @@
                 },
                 "TabOrder": {
                     "Type": 3.0,
-                    "Integer": 8.0
+                    "Integer": -1.0
                 }
             }
         },
@@ -2156,15 +2156,15 @@
             "ObjectProperties": {
                 "Name": {
                     "Type": 5.0,
-                    "String": "legal_support_cost"
+                    "String": "interconnection_and_power_marketing_cost_total"
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 468.0
+                    "Integer": 339.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 1323.0
+                    "Integer": 753.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -2230,28 +2230,28 @@
                 },
                 "TabOrder": {
                     "Type": 3.0,
-                    "Integer": 36.0
+                    "Integer": -1.0
                 }
             }
         },
-        "Label": {
+        "Numeric": {
             "Visible": 1.0,
             "ObjectProperties": {
                 "Name": {
                     "Type": 5.0,
-                    "String": "level_5_total_prime"
+                    "String": "interconnection_studies_and_fees_cost"
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 339.0
+                    "Integer": 468.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 33.0
+                    "Integer": 813.0
                 },
                 "Width": {
                     "Type": 3.0,
-                    "Integer": 120.0
+                    "Integer": 100.0
                 },
                 "Height": {
                     "Type": 3.0,
@@ -2261,11 +2261,39 @@
                     "Type": 5.0,
                     "String": ""
                 },
-                "Caption": {
+                "Value": {
+                    "Type": 1.0,
+                    "Double": 0.0
+                },
+                "Mode": {
+                    "Type": 3.0,
+                    "Integer": 1.0
+                },
+                "Format": {
+                    "Type": 3.0,
+                    "Integer": 0.0
+                },
+                "Decimals": {
+                    "Type": 3.0,
+                    "Integer": 0.0
+                },
+                "Prefix": {
                     "Type": 5.0,
-                    "String": "Category totals"
+                    "String": "$"
                 },
-                "TextColour": {
+                "Suffix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "ThousandsSep": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "Editable": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "ForeColour": {
                     "Type": 4.0,
                     "Color": {
                         "Red": 0.0,
@@ -2274,34 +2302,27 @@
                         "Alpha": 255.0
                     }
                 },
-                "Bold": {
-                    "Type": 2.0,
-                    "Boolean": 0.0
+                "BackColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 255.0,
+                        "Green": 255.0,
+                        "Blue": 255.0,
+                        "Alpha": 255.0
+                    }
                 },
-                "FontSize": {
+                "TabOrder": {
                     "Type": 3.0,
-                    "Integer": 0.0
-                },
-                "WordWrap": {
-                    "Type": 2.0,
-                    "Boolean": 0.0
-                },
-                "AlignRight": {
-                    "Type": 2.0,
-                    "Boolean": 0.0
-                },
-                "AlignTop": {
-                    "Type": 2.0,
-                    "Boolean": 0.0
+                    "Integer": 21.0
                 }
             }
         },
-        "Label": {
+        "Numeric": {
             "Visible": 1.0,
             "ObjectProperties": {
                 "Name": {
                     "Type": 5.0,
-                    "String": "level_5_total_prime50"
+                    "String": "lease_acquisition_activities_cost"
                 },
                 "X": {
                     "Type": 3.0,
@@ -2309,11 +2330,11 @@
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 33.0
+                    "Integer": 333.0
                 },
                 "Width": {
                     "Type": 3.0,
-                    "Integer": 174.0
+                    "Integer": 100.0
                 },
                 "Height": {
                     "Type": 3.0,
@@ -2323,11 +2344,239 @@
                     "Type": 5.0,
                     "String": ""
                 },
-                "Caption": {
+                "Value": {
+                    "Type": 1.0,
+                    "Double": 0.0
+                },
+                "Mode": {
+                    "Type": 3.0,
+                    "Integer": 1.0
+                },
+                "Format": {
+                    "Type": 3.0,
+                    "Integer": 0.0
+                },
+                "Decimals": {
+                    "Type": 3.0,
+                    "Integer": 0.0
+                },
+                "Prefix": {
                     "Type": 5.0,
-                    "String": "Sub-category totals"
+                    "String": "$"
                 },
-                "TextColour": {
+                "Suffix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "ThousandsSep": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "Editable": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "ForeColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 0.0,
+                        "Green": 0.0,
+                        "Blue": 0.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "BackColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 255.0,
+                        "Green": 255.0,
+                        "Blue": 255.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "TabOrder": {
+                    "Type": 3.0,
+                    "Integer": 8.0
+                }
+            }
+        },
+        "Numeric": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "legal_support_cost"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 468.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 1323.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 100.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 24.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Value": {
+                    "Type": 1.0,
+                    "Double": 0.0
+                },
+                "Mode": {
+                    "Type": 3.0,
+                    "Integer": 1.0
+                },
+                "Format": {
+                    "Type": 3.0,
+                    "Integer": 0.0
+                },
+                "Decimals": {
+                    "Type": 3.0,
+                    "Integer": 0.0
+                },
+                "Prefix": {
+                    "Type": 5.0,
+                    "String": "$"
+                },
+                "Suffix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "ThousandsSep": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "Editable": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "ForeColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 0.0,
+                        "Green": 0.0,
+                        "Blue": 0.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "BackColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 255.0,
+                        "Green": 255.0,
+                        "Blue": 255.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "TabOrder": {
+                    "Type": 3.0,
+                    "Integer": 36.0
+                }
+            }
+        },
+        "Label": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "level_5_total_prime"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 339.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 33.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 120.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 24.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Caption": {
+                    "Type": 5.0,
+                    "String": "Category totals"
+                },
+                "TextColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 0.0,
+                        "Green": 0.0,
+                        "Blue": 0.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "Bold": {
+                    "Type": 2.0,
+                    "Boolean": 0.0
+                },
+                "FontSize": {
+                    "Type": 3.0,
+                    "Integer": 0.0
+                },
+                "WordWrap": {
+                    "Type": 2.0,
+                    "Boolean": 0.0
+                },
+                "AlignRight": {
+                    "Type": 2.0,
+                    "Boolean": 0.0
+                },
+                "AlignTop": {
+                    "Type": 2.0,
+                    "Boolean": 0.0
+                }
+            }
+        },
+        "Label": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "level_5_total_prime50"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 468.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 33.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 174.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 24.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Caption": {
+                    "Type": 5.0,
+                    "String": "Sub-category totals"
+                },
+                "TextColour": {
                     "Type": 4.0,
                     "Color": {
                         "Red": 0.0,
@@ -4898,7 +5147,339 @@
                 },
                 "TabOrder": {
                     "Type": 3.0,
-                    "Integer": 9.0
+                    "Integer": 9.0
+                }
+            }
+        },
+        "Numeric": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "other_project_management_cost"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 468.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 1143.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 100.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 24.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Value": {
+                    "Type": 1.0,
+                    "Double": 0.0
+                },
+                "Mode": {
+                    "Type": 3.0,
+                    "Integer": 1.0
+                },
+                "Format": {
+                    "Type": 3.0,
+                    "Integer": 0.0
+                },
+                "Decimals": {
+                    "Type": 3.0,
+                    "Integer": 0.0
+                },
+                "Prefix": {
+                    "Type": 5.0,
+                    "String": "$"
+                },
+                "Suffix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "ThousandsSep": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "Editable": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "ForeColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 0.0,
+                        "Green": 0.0,
+                        "Blue": 0.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "BackColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 255.0,
+                        "Green": 255.0,
+                        "Blue": 255.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "TabOrder": {
+                    "Type": 3.0,
+                    "Integer": 31.0
+                }
+            }
+        },
+        "Numeric": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "other_site_characterization_cost"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 468.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 723.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 100.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 24.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Value": {
+                    "Type": 1.0,
+                    "Double": 0.0
+                },
+                "Mode": {
+                    "Type": 3.0,
+                    "Integer": 1.0
+                },
+                "Format": {
+                    "Type": 3.0,
+                    "Integer": 0.0
+                },
+                "Decimals": {
+                    "Type": 3.0,
+                    "Integer": 0.0
+                },
+                "Prefix": {
+                    "Type": 5.0,
+                    "String": "$"
+                },
+                "Suffix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "ThousandsSep": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "Editable": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "ForeColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 0.0,
+                        "Green": 0.0,
+                        "Blue": 0.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "BackColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 255.0,
+                        "Green": 255.0,
+                        "Blue": 255.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "TabOrder": {
+                    "Type": 3.0,
+                    "Integer": 19.0
+                }
+            }
+        },
+        "Numeric": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "other_site_selection_cost"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 468.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 213.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 100.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 24.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Value": {
+                    "Type": 1.0,
+                    "Double": 0.0
+                },
+                "Mode": {
+                    "Type": 3.0,
+                    "Integer": 1.0
+                },
+                "Format": {
+                    "Type": 3.0,
+                    "Integer": 0.0
+                },
+                "Decimals": {
+                    "Type": 3.0,
+                    "Integer": 0.0
+                },
+                "Prefix": {
+                    "Type": 5.0,
+                    "String": "$"
+                },
+                "Suffix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "ThousandsSep": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "Editable": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "ForeColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 0.0,
+                        "Green": 0.0,
+                        "Blue": 0.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "BackColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 255.0,
+                        "Green": 255.0,
+                        "Blue": 255.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "TabOrder": {
+                    "Type": 3.0,
+                    "Integer": 5.0
+                }
+            }
+        },
+        "Numeric": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "permit_acquisition_activities_cost"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 468.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 303.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 100.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 24.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Value": {
+                    "Type": 1.0,
+                    "Double": 0.0
+                },
+                "Mode": {
+                    "Type": 3.0,
+                    "Integer": 1.0
+                },
+                "Format": {
+                    "Type": 3.0,
+                    "Integer": 0.0
+                },
+                "Decimals": {
+                    "Type": 3.0,
+                    "Integer": 0.0
+                },
+                "Prefix": {
+                    "Type": 5.0,
+                    "String": "$"
+                },
+                "Suffix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "ThousandsSep": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "Editable": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "ForeColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 0.0,
+                        "Green": 0.0,
+                        "Blue": 0.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "BackColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 255.0,
+                        "Green": 255.0,
+                        "Blue": 255.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "TabOrder": {
+                    "Type": 3.0,
+                    "Integer": 7.0
                 }
             }
         },
@@ -4907,15 +5488,15 @@
             "ObjectProperties": {
                 "Name": {
                     "Type": 5.0,
-                    "String": "other_project_management_cost"
+                    "String": "permitting_and_leasing_cost"
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 468.0
+                    "Integer": 339.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 1143.0
+                    "Integer": 243.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -4981,7 +5562,7 @@
                 },
                 "TabOrder": {
                     "Type": 3.0,
-                    "Integer": 31.0
+                    "Integer": 6.0
                 }
             }
         },
@@ -4990,7 +5571,7 @@
             "ObjectProperties": {
                 "Name": {
                     "Type": 5.0,
-                    "String": "other_site_characterization_cost"
+                    "String": "permitting_and_leasing_cost_rvalue"
                 },
                 "X": {
                     "Type": 3.0,
@@ -4998,7 +5579,7 @@
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 723.0
+                    "Integer": 273.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -5026,11 +5607,11 @@
                 },
                 "Decimals": {
                     "Type": 3.0,
-                    "Integer": 0.0
+                    "Integer": 3.0
                 },
                 "Prefix": {
                     "Type": 5.0,
-                    "String": "$"
+                    "String": ""
                 },
                 "Suffix": {
                     "Type": 5.0,
@@ -5064,7 +5645,7 @@
                 },
                 "TabOrder": {
                     "Type": 3.0,
-                    "Integer": 19.0
+                    "Integer": -1.0
                 }
             }
         },
@@ -5073,15 +5654,15 @@
             "ObjectProperties": {
                 "Name": {
                     "Type": 5.0,
-                    "String": "other_site_selection_cost"
+                    "String": "permitting_and_leasing_cost_total"
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 468.0
+                    "Integer": 339.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 213.0
+                    "Integer": 243.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -5147,7 +5728,7 @@
                 },
                 "TabOrder": {
                     "Type": 3.0,
-                    "Integer": 5.0
+                    "Integer": -1.0
                 }
             }
         },
@@ -5156,7 +5737,7 @@
             "ObjectProperties": {
                 "Name": {
                     "Type": 5.0,
-                    "String": "permit_acquisition_activities_cost"
+                    "String": "power_marketing_cost"
                 },
                 "X": {
                     "Type": 3.0,
@@ -5164,7 +5745,7 @@
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 303.0
+                    "Integer": 873.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -5230,7 +5811,7 @@
                 },
                 "TabOrder": {
                     "Type": 3.0,
-                    "Integer": 7.0
+                    "Integer": 23.0
                 }
             }
         },
@@ -5239,15 +5820,15 @@
             "ObjectProperties": {
                 "Name": {
                     "Type": 5.0,
-                    "String": "permitting_and_leasing_cost"
+                    "String": "pre_feed_cost"
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 339.0
+                    "Integer": 468.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 243.0
+                    "Integer": 183.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -5313,7 +5894,7 @@
                 },
                 "TabOrder": {
                     "Type": 3.0,
-                    "Integer": 6.0
+                    "Integer": 4.0
                 }
             }
         },
@@ -5322,15 +5903,15 @@
             "ObjectProperties": {
                 "Name": {
                     "Type": 5.0,
-                    "String": "permitting_and_leasing_cost_total"
+                    "String": "procurement_cost"
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 339.0
+                    "Integer": 468.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 243.0
+                    "Integer": 993.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -5396,7 +5977,7 @@
                 },
                 "TabOrder": {
                     "Type": 3.0,
-                    "Integer": -1.0
+                    "Integer": 26.0
                 }
             }
         },
@@ -5405,15 +5986,15 @@
             "ObjectProperties": {
                 "Name": {
                     "Type": 5.0,
-                    "String": "power_marketing_cost"
+                    "String": "professional_advisory_services_cost"
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 468.0
+                    "Integer": 339.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 873.0
+                    "Integer": 393.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -5479,7 +6060,7 @@
                 },
                 "TabOrder": {
                     "Type": 3.0,
-                    "Integer": 23.0
+                    "Integer": 10.0
                 }
             }
         },
@@ -5488,7 +6069,7 @@
             "ObjectProperties": {
                 "Name": {
                     "Type": 5.0,
-                    "String": "pre_feed_cost"
+                    "String": "profit_cost"
                 },
                 "X": {
                     "Type": 3.0,
@@ -5496,7 +6077,7 @@
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 183.0
+                    "Integer": 1113.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -5562,7 +6143,7 @@
                 },
                 "TabOrder": {
                     "Type": 3.0,
-                    "Integer": 4.0
+                    "Integer": 30.0
                 }
             }
         },
@@ -5571,15 +6152,15 @@
             "ObjectProperties": {
                 "Name": {
                     "Type": 5.0,
-                    "String": "procurement_cost"
+                    "String": "project_management_during_development_cost"
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 468.0
+                    "Integer": 339.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 993.0
+                    "Integer": 933.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -5645,7 +6226,7 @@
                 },
                 "TabOrder": {
                     "Type": 3.0,
-                    "Integer": 26.0
+                    "Integer": 25.0
                 }
             }
         },
@@ -5654,15 +6235,15 @@
             "ObjectProperties": {
                 "Name": {
                     "Type": 5.0,
-                    "String": "professional_advisory_services_cost"
+                    "String": "project_management_during_development_cost_rvalue"
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 339.0
+                    "Integer": 468.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 393.0
+                    "Integer": 963.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -5690,11 +6271,11 @@
                 },
                 "Decimals": {
                     "Type": 3.0,
-                    "Integer": 0.0
+                    "Integer": 3.0
                 },
                 "Prefix": {
                     "Type": 5.0,
-                    "String": "$"
+                    "String": ""
                 },
                 "Suffix": {
                     "Type": 5.0,
@@ -5728,7 +6309,7 @@
                 },
                 "TabOrder": {
                     "Type": 3.0,
-                    "Integer": 10.0
+                    "Integer": -1.0
                 }
             }
         },
@@ -5737,15 +6318,15 @@
             "ObjectProperties": {
                 "Name": {
                     "Type": 5.0,
-                    "String": "profit_cost"
+                    "String": "project_management_during_development_cost_total"
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 468.0
+                    "Integer": 339.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 1113.0
+                    "Integer": 933.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -5811,7 +6392,7 @@
                 },
                 "TabOrder": {
                     "Type": 3.0,
-                    "Integer": 30.0
+                    "Integer": -1.0
                 }
             }
         },
@@ -5820,15 +6401,15 @@
             "ObjectProperties": {
                 "Name": {
                     "Type": 5.0,
-                    "String": "project_management_during_development_cost"
+                    "String": "resource_and_metocean_assessment_cost"
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 339.0
+                    "Integer": 468.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 933.0
+                    "Integer": 663.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -5894,7 +6475,7 @@
                 },
                 "TabOrder": {
                     "Type": 3.0,
-                    "Integer": 25.0
+                    "Integer": 17.0
                 }
             }
         },
@@ -5903,15 +6484,15 @@
             "ObjectProperties": {
                 "Name": {
                     "Type": 5.0,
-                    "String": "project_management_during_development_cost_total"
+                    "String": "resource_assessment_cost"
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 339.0
+                    "Integer": 468.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 933.0
+                    "Integer": 123.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -5977,7 +6558,7 @@
                 },
                 "TabOrder": {
                     "Type": 3.0,
-                    "Integer": -1.0
+                    "Integer": 2.0
                 }
             }
         },
@@ -5986,7 +6567,7 @@
             "ObjectProperties": {
                 "Name": {
                     "Type": 5.0,
-                    "String": "resource_and_metocean_assessment_cost"
+                    "String": "salaries_cost"
                 },
                 "X": {
                     "Type": 3.0,
@@ -5994,7 +6575,7 @@
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 663.0
+                    "Integer": 1023.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -6060,7 +6641,7 @@
                 },
                 "TabOrder": {
                     "Type": 3.0,
-                    "Integer": 17.0
+                    "Integer": 27.0
                 }
             }
         },
@@ -6069,7 +6650,7 @@
             "ObjectProperties": {
                 "Name": {
                     "Type": 5.0,
-                    "String": "resource_assessment_cost"
+                    "String": "sales_general_and_administrative_cost"
                 },
                 "X": {
                     "Type": 3.0,
@@ -6077,7 +6658,7 @@
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 123.0
+                    "Integer": 1053.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -6143,7 +6724,7 @@
                 },
                 "TabOrder": {
                     "Type": 3.0,
-                    "Integer": 2.0
+                    "Integer": 28.0
                 }
             }
         },
@@ -6152,15 +6733,15 @@
             "ObjectProperties": {
                 "Name": {
                     "Type": 5.0,
-                    "String": "salaries_cost"
+                    "String": "site_characterization_cost"
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 468.0
+                    "Integer": 339.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 1023.0
+                    "Integer": 573.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -6226,7 +6807,7 @@
                 },
                 "TabOrder": {
                     "Type": 3.0,
-                    "Integer": 27.0
+                    "Integer": 15.0
                 }
             }
         },
@@ -6235,7 +6816,7 @@
             "ObjectProperties": {
                 "Name": {
                     "Type": 5.0,
-                    "String": "sales_general_and_administrative_cost"
+                    "String": "site_characterization_cost_rvalue"
                 },
                 "X": {
                     "Type": 3.0,
@@ -6243,7 +6824,7 @@
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 1053.0
+                    "Integer": 603.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -6271,11 +6852,11 @@
                 },
                 "Decimals": {
                     "Type": 3.0,
-                    "Integer": 0.0
+                    "Integer": 3.0
                 },
                 "Prefix": {
                     "Type": 5.0,
-                    "String": "$"
+                    "String": ""
                 },
                 "Suffix": {
                     "Type": 5.0,
@@ -6309,7 +6890,7 @@
                 },
                 "TabOrder": {
                     "Type": 3.0,
-                    "Integer": 28.0
+                    "Integer": -1.0
                 }
             }
         },
@@ -6318,7 +6899,7 @@
             "ObjectProperties": {
                 "Name": {
                     "Type": 5.0,
-                    "String": "site_characterization_cost"
+                    "String": "site_characterization_cost_total"
                 },
                 "X": {
                     "Type": 3.0,
@@ -6392,7 +6973,7 @@
                 },
                 "TabOrder": {
                     "Type": 3.0,
-                    "Integer": 15.0
+                    "Integer": -1.0
                 }
             }
         },
@@ -6401,7 +6982,7 @@
             "ObjectProperties": {
                 "Name": {
                     "Type": 5.0,
-                    "String": "site_characterization_cost_total"
+                    "String": "site_selection_cost"
                 },
                 "X": {
                     "Type": 3.0,
@@ -6409,7 +6990,7 @@
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 573.0
+                    "Integer": 63.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -6475,7 +7056,7 @@
                 },
                 "TabOrder": {
                     "Type": 3.0,
-                    "Integer": -1.0
+                    "Integer": 1.0
                 }
             }
         },
@@ -6484,15 +7065,15 @@
             "ObjectProperties": {
                 "Name": {
                     "Type": 5.0,
-                    "String": "site_selection_cost"
+                    "String": "site_selection_cost_rvalue"
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 339.0
+                    "Integer": 468.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 63.0
+                    "Integer": 93.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -6520,11 +7101,11 @@
                 },
                 "Decimals": {
                     "Type": 3.0,
-                    "Integer": 0.0
+                    "Integer": 3.0
                 },
                 "Prefix": {
                     "Type": 5.0,
-                    "String": "$"
+                    "String": ""
                 },
                 "Suffix": {
                     "Type": 5.0,
@@ -6558,7 +7139,7 @@
                 },
                 "TabOrder": {
                     "Type": 3.0,
-                    "Integer": 1.0
+                    "Integer": -1.0
                 }
             }
         },
@@ -7085,7 +7666,7 @@
             "IndexLabels": "",
             "Flags": 3.0,
             "DefaultValue": 0.0,
-            "UIObject": "CheckBox",
+            "UIObject": "Choice",
             "sscVariableName": "",
             "sscVariableValue": ""
         },
@@ -7098,7 +7679,7 @@
             "IndexLabels": "",
             "Flags": 3.0,
             "DefaultValue": 0.0,
-            "UIObject": "CheckBox",
+            "UIObject": "Choice",
             "sscVariableName": "",
             "sscVariableValue": ""
         },
@@ -7111,7 +7692,7 @@
             "IndexLabels": "",
             "Flags": 3.0,
             "DefaultValue": 0.0,
-            "UIObject": "CheckBox",
+            "UIObject": "Choice",
             "sscVariableName": "",
             "sscVariableValue": ""
         },
@@ -7124,7 +7705,7 @@
             "IndexLabels": "",
             "Flags": 3.0,
             "DefaultValue": 0.0,
-            "UIObject": "CheckBox",
+            "UIObject": "Choice",
             "sscVariableName": "",
             "sscVariableValue": ""
         },
@@ -7137,7 +7718,7 @@
             "IndexLabels": "",
             "Flags": 3.0,
             "DefaultValue": 0.0,
-            "UIObject": "CheckBox",
+            "UIObject": "Choice",
             "sscVariableName": "",
             "sscVariableValue": ""
         },
@@ -7150,7 +7731,7 @@
             "IndexLabels": "",
             "Flags": 3.0,
             "DefaultValue": 0.0,
-            "UIObject": "CheckBox",
+            "UIObject": "Choice",
             "sscVariableName": "",
             "sscVariableValue": ""
         },
@@ -7284,6 +7865,19 @@
             "sscVariableName": "",
             "sscVariableValue": ""
         },
+        "financing_and_incentives_cost_rvalue": {
+            "Version": 4.0,
+            "Type": 1.0,
+            "Label": "Financing and incentives array scaling R-value",
+            "Units": "",
+            "Group": "ME Costs - Development",
+            "IndexLabels": "",
+            "Flags": 2.0,
+            "DefaultValue": 0.0,
+            "UIObject": "Default",
+            "sscVariableName": "",
+            "sscVariableValue": ""
+        },
         "financing_and_incentives_cost_total": {
             "Version": 4.0,
             "Type": 1.0,
@@ -7349,6 +7943,19 @@
             "sscVariableName": "",
             "sscVariableValue": ""
         },
+        "initial_engineering_cost_rvalue": {
+            "Version": 4.0,
+            "Type": 1.0,
+            "Label": "Initial engineering array scaling R-value",
+            "Units": "",
+            "Group": "ME Costs - Development",
+            "IndexLabels": "",
+            "Flags": 0.0,
+            "DefaultValue": 0.0,
+            "UIObject": "Default",
+            "sscVariableName": "",
+            "sscVariableValue": ""
+        },
         "initial_engineering_cost_total": {
             "Version": 4.0,
             "Type": 1.0,
@@ -7388,6 +7995,19 @@
             "sscVariableName": "",
             "sscVariableValue": ""
         },
+        "interconnection_and_power_marketing_cost_rvalue": {
+            "Version": 4.0,
+            "Type": 1.0,
+            "Label": "Interconnection and power marketing array scaling R-value",
+            "Units": "",
+            "Group": "ME Costs - Development",
+            "IndexLabels": "",
+            "Flags": 2.0,
+            "DefaultValue": 0.0,
+            "UIObject": "Default",
+            "sscVariableName": "",
+            "sscVariableValue": ""
+        },
         "interconnection_and_power_marketing_cost_total": {
             "Version": 4.0,
             "Type": 1.0,
@@ -7479,19 +8099,6 @@
             "sscVariableName": "",
             "sscVariableValue": ""
         },
-        "level_value": {
-            "Version": 4.0,
-            "Type": 1.0,
-            "Label": " ",
-            "Units": " ",
-            "Group": "ME Costs - Development",
-            "IndexLabels": "",
-            "Flags": 8.0,
-            "DefaultValue": 0.0,
-            "UIObject": "Default",
-            "sscVariableName": "",
-            "sscVariableValue": ""
-        },
         "onshore_interconnection_rights_cost": {
             "Version": 4.0,
             "Type": 1.0,
@@ -7635,6 +8242,19 @@
             "sscVariableName": "",
             "sscVariableValue": ""
         },
+        "permitting_and_leasing_cost_rvalue": {
+            "Version": 4.0,
+            "Type": 1.0,
+            "Label": "Permitting and leasing array scaling R-value",
+            "Units": "",
+            "Group": "ME Costs - Development",
+            "IndexLabels": "",
+            "Flags": 2.0,
+            "DefaultValue": 0.0,
+            "UIObject": "Default",
+            "sscVariableName": "",
+            "sscVariableValue": ""
+        },
         "permitting_and_leasing_cost_total": {
             "Version": 4.0,
             "Type": 1.0,
@@ -7739,6 +8359,19 @@
             "sscVariableName": "",
             "sscVariableValue": ""
         },
+        "project_management_during_development_cost_rvalue": {
+            "Version": 4.0,
+            "Type": 1.0,
+            "Label": "Project management during development array scaling R-value",
+            "Units": "",
+            "Group": "ME Costs - Development",
+            "IndexLabels": "",
+            "Flags": 2.0,
+            "DefaultValue": 0.0,
+            "UIObject": "Default",
+            "sscVariableName": "",
+            "sscVariableValue": ""
+        },
         "project_management_during_development_cost_total": {
             "Version": 4.0,
             "Type": 1.0,
@@ -7830,6 +8463,19 @@
             "sscVariableName": "",
             "sscVariableValue": ""
         },
+        "site_characterization_cost_rvalue": {
+            "Version": 4.0,
+            "Type": 1.0,
+            "Label": "Site characterization array scaling R-value",
+            "Units": "",
+            "Group": "ME Costs - Development",
+            "IndexLabels": "",
+            "Flags": 2.0,
+            "DefaultValue": 0.0,
+            "UIObject": "Default",
+            "sscVariableName": "",
+            "sscVariableValue": ""
+        },
         "site_characterization_cost_total": {
             "Version": 4.0,
             "Type": 1.0,
@@ -7869,6 +8515,19 @@
             "sscVariableName": "",
             "sscVariableValue": ""
         },
+        "site_selection_cost_rvalue": {
+            "Version": 4.0,
+            "Type": 1.0,
+            "Label": "Site selection array scaling R-value",
+            "Units": "",
+            "Group": "ME Costs - Development",
+            "IndexLabels": "",
+            "Flags": 2.0,
+            "DefaultValue": 0.0,
+            "UIObject": "Default",
+            "sscVariableName": "",
+            "sscVariableValue": ""
+        },
         "site_selection_cost_total": {
             "Version": 4.0,
             "Type": 1.0,
@@ -7920,9 +8579,14 @@
         "\t{",
         "\t\treturn ${site_selection_cost};",
         "\t}",
-        "\telse",
+        "\telse if (${detailed_cost_choice_site_selection}==1)",
         "\t{",
         "\t\treturn ${site_selection_cost_total};",
+        "\t}\r",
+        "\telse {\r",
+        "\t\tb = -log(1-${site_selection_cost_rvalue})/log(2);\r",
+        "\t\treturn (${site_selection_cost}*pow(${number_devices},-b))*${number_devices};\r",
+        "\r",
         "\t}",
         "};",
         "",
@@ -7936,9 +8600,14 @@
         "\t{",
         "\t\treturn ${permitting_and_leasing_cost};",
         "\t}",
-        "\telse",
+        "\telse if (${detailed_cost_choice_permitting_leasing}==1)",
         "\t{",
         "\t\treturn ${permitting_and_leasing_cost_total};",
+        "\t}\r",
+        "\telse {\r",
+        "\t\tb = -log(1-${permitting_and_leasing_cost_rvalue})/log(2);\r",
+        "\t\treturn (${permitting_and_leasing_cost}*pow(${number_devices},-b))*${number_devices};\r",
+        "\r",
         "\t}",
         "};",
         "",
@@ -7952,9 +8621,14 @@
         "\t{",
         "\t\treturn ${initial_engineering_cost};",
         "\t}",
-        "\telse",
+        "\telse if (${detailed_cost_choice_initial_engineering}==1)",
         "\t{",
         "\t\treturn ${initial_engineering_cost_total};",
+        "\t}\r",
+        "\telse {\r",
+        "\t\tb = -log(1-${initial_engineering_cost_rvalue})/log(2);\r",
+        "\t\treturn (${initial_engineering_cost}*pow(${number_devices},-b))*${number_devices};\r",
+        "\r",
         "\t}",
         "};",
         "",
@@ -7968,9 +8642,14 @@
         "\t{",
         "\t\treturn ${site_characterization_cost};",
         "\t}",
-        "\telse",
+        "\telse if (${detailed_cost_choice_site_characterization}==1)",
         "\t{",
         "\t\treturn ${site_characterization_cost_total};",
+        "\t}\r",
+        "\telse {\r",
+        "\t\tb = -log(1-${site_characterization_cost_rvalue})/log(2);\r",
+        "\t\treturn (${site_characterization_cost}*pow(${number_devices},-b))*${number_devices};\r",
+        "\r",
         "\t}",
         "};",
         "",
@@ -7984,9 +8663,14 @@
         "\t{",
         "\t\treturn ${interconnection_and_power_marketing_cost};",
         "\t}",
-        "\telse",
+        "\telse if (${detailed_cost_choice_interconnection}==1)",
         "\t{",
         "\t\treturn ${interconnection_and_power_marketing_cost_total};",
+        "\t}\r",
+        "\telse {\r",
+        "\t\tb = -log(1-${interconnection_and_power_marketing_cost_rvalue})/log(2);\r",
+        "\t\treturn (${interconnection_and_power_marketing_cost}*pow(${number_devices},-b))*${number_devices};\r",
+        "\r",
         "\t}",
         "};",
         "",
@@ -8001,9 +8685,14 @@
         "\t{",
         "\t\treturn ${project_management_during_development_cost};",
         "\t}",
-        "\telse",
+        "\telse if (${detailed_cost_choice_project_management}==1)",
         "\t{",
         "\t\treturn ${project_management_during_development_cost_total};",
+        "\t}\r",
+        "\telse {\r",
+        "\t\tb = -log(1-${project_management_during_development_cost_rvalue})/log(2);\r",
+        "\t\treturn (${project_management_during_development_cost}*pow(${number_devices},-b))*${number_devices};\r",
+        "\r",
         "\t}",
         "};",
         "",
@@ -8017,9 +8706,14 @@
         "\t{",
         "\t\treturn ${financing_and_incentives_cost};",
         "\t}",
-        "\telse",
+        "\telse if (${detailed_cost_choice_financing_incentive}==1)",
         "\t{",
         "\t\treturn ${financing_and_incentives_cost_total};",
+        "\t}\r",
+        "\telse {\r",
+        "\t\tb = -log(1-${financing_and_incentives_cost_rvalue})/log(2);\r",
+        "\t\treturn (${financing_and_incentives_cost}*pow(${number_devices},-b))*${number_devices};\r",
+        "\r",
         "\t}",
         "};",
         "",
@@ -8040,7 +8734,8 @@
         "\t\t\t\t\t0,",
         "\t\t\t\t\t0,",
         "\t\t\t\t\t2,",
-        "\t\t\t\t\t1",
+        "\t\t\t\t\t1,\r",
+        "\t\t\t\t\t3",
         "\t\t\t\t];",
         "\t}",
         "\telse",
@@ -8050,23 +8745,17 @@
         "};",
         "",
         "equations {'development_cost'} = define() {",
+        "\tarray_scaling_b_value = -log(1-${development_cost_rvalue})/log(2);\r",
         "\treturn ?${development_cost_method}",
         "\t\t\t[",
         "\t\t\t\t${development_cost_input}*${system_capacity},",
         "\t\t\t\t${development_cost_input},",
         "\t\t\t\t${development_cost_modeled},",
-        "\t\t\t\t${development_cost_total}",
+        "\t\t\t\t${development_cost_total},\r",
+        "\t\t\t\t(${development_cost_input}*pow(${number_devices},-array_scaling_b_value))*${number_devices}",
         "\t\t\t];",
         "};",
         "",
-        "equations {'level_value'} = define() {",
-        "\treturn ?${level_check}",
-        "\t\t\t[",
-        "\t\t\t\t0,",
-        "\t\t\t\t1,",
-        "\t\t\t\t2",
-        "\t\t\t];",
-        "};",
         "",
         "equations {'development_override'} = define() {",
         "\treturn ${balance_of_system_cost_override};};",
@@ -8075,26 +8764,25 @@
     ],
     "Callbacks": [
         "on_load{'Marine Costs - Development'} = define() {",
-        "\ton_change{'itemized_check_development'};",
-        "\ton_change{'level_value'};",
+        "\ton_change{'itemized_check_development'}();",
         "\tenable_itemized_development();",
-        "\ton_change{'detailed_cost_choice_site_selection'};",
+        "\ton_change{'detailed_cost_choice_site_selection'}();",
         "\tdetailed_cost_site_selection();",
-        "\ton_change{'detailed_cost_choice_permitting_leasing'};",
+        "\ton_change{'detailed_cost_choice_permitting_leasing'}();",
         "\tdetailed_cost_permitting_leasing();",
-        "\ton_change{'detailed_cost_choice_initial_engineering'};",
+        "\ton_change{'detailed_cost_choice_initial_engineering'}();",
         "\tdetailed_cost_initial_engineering();",
-        "\ton_change{'detailed_cost_choice_site_characterization'};",
+        "\ton_change{'detailed_cost_choice_site_characterization'}();",
         "\tdetailed_cost_site_characterization();",
-        "\ton_change{'detailed_cost_choice_interconnection'};",
+        "\ton_change{'detailed_cost_choice_interconnection'}();",
         "\tdetailed_cost_interconnection();",
-        "\ton_change{'detailed_cost_choice_project_management'};",
+        "\ton_change{'detailed_cost_choice_project_management'}();",
         "\tdetailed_cost_project_management();",
-        "\ton_change{'detailed_cost_choice_financing_incentive'};",
+        "\ton_change{'detailed_cost_choice_financing_incentive'}();",
         "\tdetailed_cost_financing_incentive();",
         "\t//enable_itemized_level();",
         "\tcheck_override_development();",
-        "\ton_change{'development_override'};",
+        "\ton_change{'development_override'}();",
         "};",
         "",
         "on_change{'development_override'} = define() {",
@@ -8120,15 +8808,16 @@
         "\tif (value('itemized_check_development')==1)",
         "\t{",
         "\t\tdetailed_value = value('detailed_cost_choice_financing_incentive');",
-        "\t\tenable('financing_and_incentives_cost',detailed_value==0);",
-        "\t\tshow('financing_and_incentives_cost',detailed_value==0);",
-        "\t\tenable('financing_and_incentives_cost_total',detailed_value);",
-        "\t\tshow('financing_and_incentives_cost_total',detailed_value);",
-        "\t\tenable('due_diligence_cost',detailed_value);",
-        "\t\tenable('incentives_cost',detailed_value);",
-        "\t\tenable('closing_costs_cost',detailed_value);",
-        "\t\tenable('legal_support_cost',detailed_value);",
-        "\t\tenable('other_financing_cost',detailed_value);",
+        "\t\tenable('financing_and_incentives_cost',detailed_value!=1);",
+        "\t\tshow('financing_and_incentives_cost',detailed_value!=1);",
+        "\t\tenable('financing_and_incentives_cost_total',detailed_value==1);",
+        "\t\tshow('financing_and_incentives_cost_total',detailed_value==1);",
+        "\t\tenable('due_diligence_cost',detailed_value==1);",
+        "\t\tenable('incentives_cost',detailed_value==1);",
+        "\t\tenable('closing_costs_cost',detailed_value==1);",
+        "\t\tenable('legal_support_cost',detailed_value==1);",
+        "\t\tenable('other_financing_cost',detailed_value==1);\r",
+        "\t\tenable('financing_and_incentives_cost_rvalue',detailed_value==2);",
         "\t\t",
         "\t\trefresh();",
         "\t}",
@@ -8143,16 +8832,17 @@
         "\tif (value('itemized_check_development')==1)",
         "\t{",
         "\t\tdetailed_value = value('detailed_cost_choice_project_management');",
-        "\t\tenable('project_management_during_development_cost',detailed_value==0);",
-        "\t\tshow('project_management_during_development_cost',detailed_value==0);",
-        "\t\tenable('project_management_during_development_cost_total',detailed_value);",
-        "\t\tshow('project_management_during_development_cost_total',detailed_value);",
-        "\t\tenable('procurement_cost',detailed_value);",
-        "\t\tenable('salaries_cost',detailed_value);",
-        "\t\tenable('sales_general_and_administrative_cost',detailed_value);",
-        "\t\tenable('stakeholder_outreach_cost',detailed_value);",
-        "\t\tenable('profit_cost',detailed_value);",
-        "\t\tenable('other_project_management_cost',detailed_value);",
+        "\t\tenable('project_management_during_development_cost',detailed_value!=1);",
+        "\t\tshow('project_management_during_development_cost',detailed_value!=1);",
+        "\t\tenable('project_management_during_development_cost_total',detailed_value==1);",
+        "\t\tshow('project_management_during_development_cost_total',detailed_value==1);",
+        "\t\tenable('procurement_cost',detailed_value==1);",
+        "\t\tenable('salaries_cost',detailed_value==1);",
+        "\t\tenable('sales_general_and_administrative_cost',detailed_value==1);",
+        "\t\tenable('stakeholder_outreach_cost',detailed_value==1);",
+        "\t\tenable('profit_cost',detailed_value==1);",
+        "\t\tenable('other_project_management_cost',detailed_value==1);\r",
+        "\t\tenable('project_management_during_development_cost_rvalue',detailed_value==2);",
         "\t\t",
         "\t\trefresh();",
         "\t}",
@@ -8167,14 +8857,15 @@
         "\tif (value('itemized_check_development')==1)",
         "\t{",
         "\t\tdetailed_value = value('detailed_cost_choice_interconnection');",
-        "\t\tenable('interconnection_and_power_marketing_cost',detailed_value==0);",
-        "\t\tshow('interconnection_and_power_marketing_cost',detailed_value==0);",
-        "\t\tenable('interconnection_and_power_marketing_cost_total',detailed_value);",
-        "\t\tshow('interconnection_and_power_marketing_cost_total',detailed_value);",
-        "\t\tenable('interconnection_studies_and_fees_cost',detailed_value);",
-        "\t\tenable('onshore_interconnection_rights_cost',detailed_value);",
-        "\t\tenable('power_marketing_cost',detailed_value);",
-        "\t\tenable('other_interconnection_cost',detailed_value);",
+        "\t\tenable('interconnection_and_power_marketing_cost',detailed_value!=1);",
+        "\t\tshow('interconnection_and_power_marketing_cost',detailed_value!=1);",
+        "\t\tenable('interconnection_and_power_marketing_cost_total',detailed_value==1);",
+        "\t\tshow('interconnection_and_power_marketing_cost_total',detailed_value==1);",
+        "\t\tenable('interconnection_studies_and_fees_cost',detailed_value==1);",
+        "\t\tenable('onshore_interconnection_rights_cost',detailed_value==1);",
+        "\t\tenable('power_marketing_cost',detailed_value==1);",
+        "\t\tenable('other_interconnection_cost',detailed_value==1);\r",
+        "\t\tenable('interconnection_and_power_marketing_cost_rvalue',detailed_value==2);",
         "\t\t",
         "\t\trefresh();",
         "\t}",
@@ -8189,14 +8880,15 @@
         "\tif (value('itemized_check_development')==1)",
         "\t{",
         "\t\tdetailed_value = value('detailed_cost_choice_site_characterization');",
-        "\t\tenable('site_characterization_cost',detailed_value==0);",
-        "\t\tshow('site_characterization_cost',detailed_value==0);",
-        "\t\tenable('site_characterization_cost_total',detailed_value);",
-        "\t\tshow('site_characterization_cost_total',detailed_value);",
-        "\t\tenable('environmental_surveys_cost',detailed_value);",
-        "\t\tenable('resource_and_metocean_assessment_cost',detailed_value);",
-        "\t\tenable('geological_and_bathymetry_cost',detailed_value);",
-        "\t\tenable('other_site_characterization_cost',detailed_value);",
+        "\t\tenable('site_characterization_cost',detailed_value!=1);",
+        "\t\tshow('site_characterization_cost',detailed_value!=1);",
+        "\t\tenable('site_characterization_cost_total',detailed_value==1);",
+        "\t\tshow('site_characterization_cost_total',detailed_value==1);",
+        "\t\tenable('environmental_surveys_cost',detailed_value==1);",
+        "\t\tenable('resource_and_metocean_assessment_cost',detailed_value==1);",
+        "\t\tenable('geological_and_bathymetry_cost',detailed_value==1);",
+        "\t\tenable('other_site_characterization_cost',detailed_value==1);\r",
+        "\t\tenable('site_characterization_cost_rvalue',detailed_value==2);",
         "\t\t",
         "\t\trefresh();",
         "\t}",
@@ -8211,13 +8903,14 @@
         "\tif (value('itemized_check_development')==1)",
         "\t{",
         "\t\tdetailed_value = value('detailed_cost_choice_initial_engineering');",
-        "\t\tenable('initial_engineering_cost',detailed_value==0);",
-        "\t\tshow('initial_engineering_cost',detailed_value==0);",
-        "\t\tenable('initial_engineering_cost_total',detailed_value);",
-        "\t\tshow('initial_engineering_cost_total',detailed_value);",
-        "\t\tenable('feed_cost',detailed_value);",
-        "\t\tenable('engineering_certification_cost',detailed_value);",
-        "\t\tenable('other_initial_engineering_cost',detailed_value);",
+        "\t\tenable('initial_engineering_cost',detailed_value!=1);",
+        "\t\tshow('initial_engineering_cost',detailed_value!=1);",
+        "\t\tenable('initial_engineering_cost_total',detailed_value==1);",
+        "\t\tshow('initial_engineering_cost_total',detailed_value==1);",
+        "\t\tenable('feed_cost',detailed_value==1);",
+        "\t\tenable('engineering_certification_cost',detailed_value==1);",
+        "\t\tenable('other_initial_engineering_cost',detailed_value==1);\r",
+        "\t\tenable('initial_engineering_cost_rvalue',detailed_value==2);",
         "\t\t",
         "\t\trefresh();",
         "\t}",
@@ -8232,13 +8925,14 @@
         "\tif (value('itemized_check_development')==1)",
         "\t{",
         "\t\tdetailed_value = value('detailed_cost_choice_permitting_leasing');",
-        "\t\tenable('permitting_and_leasing_cost',detailed_value==0);",
-        "\t\tshow('permitting_and_leasing_cost',detailed_value==0);",
-        "\t\tenable('permitting_and_leasing_cost_total',detailed_value);",
-        "\t\tshow('permitting_and_leasing_cost_total',detailed_value);",
-        "\t\tenable('permit_acquisition_activities_cost',detailed_value);",
-        "\t\tenable('lease_acquisition_activities_cost',detailed_value);",
-        "\t\tenable('other_permitting_and_leasing_cost',detailed_value);",
+        "\t\tenable('permitting_and_leasing_cost',detailed_value!=1);",
+        "\t\tshow('permitting_and_leasing_cost',detailed_value!=1);",
+        "\t\tenable('permitting_and_leasing_cost_total',detailed_value==1);",
+        "\t\tshow('permitting_and_leasing_cost_total',detailed_value==1);",
+        "\t\tenable('permit_acquisition_activities_cost',detailed_value==1);",
+        "\t\tenable('lease_acquisition_activities_cost',detailed_value==1);",
+        "\t\tenable('other_permitting_and_leasing_cost',detailed_value==1);\r",
+        "\t\tenable('permitting_and_leasing_cost_rvalue',detailed_value==2);",
         "\t\t",
         "\t\trefresh();",
         "\t}",
@@ -8253,14 +8947,15 @@
         "\tif (value('itemized_check_development')==1)",
         "\t{",
         "\t\tdetailed_value = value('detailed_cost_choice_site_selection');",
-        "\t\tenable('site_selection_cost',detailed_value==0);",
-        "\t\tshow('site_selection_cost',detailed_value==0);",
-        "\t\tenable('site_selection_cost_total',detailed_value);",
-        "\t\tshow('site_selection_cost_total',detailed_value);",
-        "\t\tenable('resource_assessment_cost',detailed_value);",
-        "\t\tenable('environmental_scoping_cost',detailed_value);",
-        "\t\tenable('pre_feed_cost',detailed_value);",
-        "\t\tenable('other_site_selection_cost',detailed_value);",
+        "\t\tenable('site_selection_cost',detailed_value!=1);",
+        "\t\tshow('site_selection_cost',detailed_value!=1);",
+        "\t\tenable('site_selection_cost_total',detailed_value==1);",
+        "\t\tshow('site_selection_cost_total',detailed_value==1);",
+        "\t\tenable('resource_assessment_cost',detailed_value==1);",
+        "\t\tenable('environmental_scoping_cost',detailed_value==1);",
+        "\t\tenable('pre_feed_cost',detailed_value==1);",
+        "\t\tenable('other_site_selection_cost',detailed_value==1);\r",
+        "\t\tenable('site_selection_cost_rvalue',detailed_value==2);",
         "\t\t",
         "\t\trefresh();",
         "\t}",
@@ -8270,23 +8965,22 @@
         "\tenable_itemized_development();",
         "};",
         "\t",
-        "on_change{'level_value'} = define() {",
-        "\tenable_itemized_level();",
-        "};",
         "",
         "function enable_itemized_development()",
         "{",
         "\titemized_value = value('itemized_check_development');",
         "\tenable('site_selection_cost',itemized_value==1);",
         "\tenable('site_selection_cost_total',itemized_value==1);",
-        "\tenable('detailed_cost_choice_site_selection',itemized_value==1);",
+        "\tenable('detailed_cost_choice_site_selection',itemized_value==1);\r",
+        "\tenable('site_selection_cost_rvalue',itemized_value==1);",
         "\tenable('resource_assessment_cost',itemized_value==1);",
         "\tenable('environmental_scoping_cost',itemized_value==1);",
         "\tenable('pre_feed_cost',itemized_value==1);",
         "\tenable('other_site_selection_cost',itemized_value==1);",
         "\tenable('permitting_and_leasing_cost',itemized_value==1);",
         "\tenable('permitting_and_leasing_cost_total',itemized_value==1);",
-        "\tenable('detailed_cost_choice_permitting_leasing',itemized_value==1);",
+        "\tenable('detailed_cost_choice_permitting_leasing',itemized_value==1);\r",
+        "\tenable('permitting_and_leasing_cost_rvalue',itemized_value==1);",
         "\tenable('permit_acquisition_activities_cost',itemized_value==1);",
         "\tenable('lease_acquisition_activities_cost',itemized_value==1);",
         "\tenable('other_permitting_and_leasing_cost',itemized_value==1);",
@@ -8294,12 +8988,14 @@
         "\tenable('initial_engineering_cost',itemized_value==1);",
         "\tenable('initial_engineering_cost_total',itemized_value==1);",
         "\tenable('detailed_cost_choice_initial_engineering',itemized_value==1);",
+        "\tenable('initial_engineering_cost_rvalue',itemized_value==1);\r",
         "\tenable('feed_cost',itemized_value==1);",
         "\tenable('engineering_certification_cost',itemized_value==1);",
         "\tenable('other_initial_engineering_cost',itemized_value==1);",
         "\tenable('site_characterization_cost',itemized_value==1);",
         "\tenable('site_characterization_cost_total',itemized_value==1);",
         "\tenable('detailed_cost_choice_site_characterization',itemized_value==1);",
+        "\tenable('site_characterization_cost_rvalue',itemized_value==1);\r",
         "\tenable('environmental_surveys_cost',itemized_value==1);",
         "\tenable('resource_and_metocean_assessment_cost',itemized_value==1);",
         "\tenable('geological_and_bathymetry_cost',itemized_value==1);",
@@ -8307,13 +9003,15 @@
         "\tenable('interconnection_and_power_marketing_cost',itemized_value==1);",
         "\tenable('interconnection_and_power_marketing_cost_total',itemized_value==1);",
         "\tenable('detailed_cost_choice_interconnection',itemized_value==1);",
+        "\tenable('interconnection_and_power_marketing_cost_rvalue',itemized_value==1);\r",
         "\tenable('interconnection_studies_and_fees_cost',itemized_value==1);",
         "\tenable('onshore_interconnection_rights_cost',itemized_value==1);",
         "\tenable('power_marketing_cost',itemized_value==1);",
         "\tenable('other_interconnection_cost',itemized_value==1);",
         "\tenable('project_management_during_development_cost',itemized_value==1);",
         "\tenable('project_management_during_development_cost_total',itemized_value==1);",
-        "\tenable('detailed_cost_choice_project_management',itemized_value==1);",
+        "\tenable('detailed_cost_choice_project_management',itemized_value==1);\r",
+        "\tenable('project_management_during_development_cost_rvalue',itemized_value==1);",
         "\tenable('procurement_cost',itemized_value==1);",
         "\tenable('salaries_cost',itemized_value==1);",
         "\tenable('sales_general_and_administrative_cost',itemized_value==1);",
@@ -8322,7 +9020,8 @@
         "\tenable('other_project_management_cost',itemized_value==1);",
         "\tenable('financing_and_incentives_cost',itemized_value==1);",
         "\tenable('financing_and_incentives_cost_total',itemized_value==1);",
-        "\tenable('detailed_cost_choice_financing_incentive',itemized_value==1);",
+        "\tenable('detailed_cost_choice_financing_incentive',itemized_value==1);\r",
+        "\tenable('financing_and_incentives_cost_rvalue',itemized_value==1);",
         "\tenable('due_diligence_cost',itemized_value==1);",
         "\tenable('incentives_cost',itemized_value==1);",
         "\tenable('closing_costs_cost',itemized_value==1);",
@@ -8330,7 +9029,8 @@
         "\tenable('other_financing_cost',itemized_value==1);",
         "\tenable('other_development_cost',itemized_value==1);",
         "\tenable('level_check',itemized_value==1);",
-        "\tenable('development_cost_input',itemized_value!=2);",
+        "\tenable('development_cost_input',itemized_value==0 || itemized_value==3);\r",
+        "\tenable('development_cost_rvalue',itemized_value==3);",
         "\tshow('development_cost_input',itemized_value!=1);",
         "\t//show('development_cost_input_label',itemized_value!=1);",
         "\tshow('development_cost_total',itemized_value==1);",
diff --git a/deploy/runtime/ui/Marine Costs - Device Costs.json b/deploy/runtime/ui/Marine Costs - Device Costs.json
index 486d58a9a9..a3534b7198 100644
--- a/deploy/runtime/ui/Marine Costs - Device Costs.json	
+++ b/deploy/runtime/ui/Marine Costs - Device Costs.json	
@@ -12,7 +12,7 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 735.0
+                    "Integer": 861.0
                 },
                 "Y": {
                     "Type": 3.0,
@@ -86,6 +86,68 @@
                 }
             }
         },
+        "Label": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "device_cost_modeled_lbl"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 480.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 168.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 107.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 24.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Caption": {
+                    "Type": 5.0,
+                    "String": "Modeled value"
+                },
+                "TextColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 0.0,
+                        "Green": 0.0,
+                        "Blue": 0.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "Bold": {
+                    "Type": 2.0,
+                    "Boolean": 0.0
+                },
+                "FontSize": {
+                    "Type": 3.0,
+                    "Integer": 0.0
+                },
+                "WordWrap": {
+                    "Type": 2.0,
+                    "Boolean": 0.0
+                },
+                "AlignRight": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "AlignTop": {
+                    "Type": 2.0,
+                    "Boolean": 0.0
+                }
+            }
+        },
         "CheckBox": {
             "Visible": 1.0,
             "ObjectProperties": {
@@ -95,7 +157,7 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 636.0
+                    "Integer": 762.0
                 },
                 "Y": {
                     "Type": 3.0,
@@ -136,7 +198,7 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 735.0
+                    "Integer": 861.0
                 },
                 "Y": {
                     "Type": 3.0,
@@ -405,7 +467,7 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 735.0
+                    "Integer": 861.0
                 },
                 "Y": {
                     "Type": 3.0,
@@ -591,7 +653,7 @@
                 },
                 "Items": {
                     "Type": 6.0,
-                    "StringList": "Enter in $/kW|Enter in $|Use Modeled Value ($)|Use Cost Breakdown ($)"
+                    "StringList": "Enter in $/kW|Enter in $|Use Modeled Value ($)|Use Cost Breakdown ($)|Use Array Scaling"
                 },
                 "Selection": {
                     "Type": 3.0,
@@ -686,6 +748,89 @@
                 }
             }
         },
+        "Numeric": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "mooring_found_substruc_cost_rvalue"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 738.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 267.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 100.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 24.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Value": {
+                    "Type": 1.0,
+                    "Double": 0.0
+                },
+                "Mode": {
+                    "Type": 3.0,
+                    "Integer": 1.0
+                },
+                "Format": {
+                    "Type": 3.0,
+                    "Integer": 0.0
+                },
+                "Decimals": {
+                    "Type": 3.0,
+                    "Integer": 3.0
+                },
+                "Prefix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Suffix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "ThousandsSep": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "Editable": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "ForeColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 0.0,
+                        "Green": 0.0,
+                        "Blue": 0.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "BackColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 255.0,
+                        "Green": 255.0,
+                        "Blue": 255.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "TabOrder": {
+                    "Type": 3.0,
+                    "Integer": -1.0
+                }
+            }
+        },
         "Numeric": {
             "Visible": 1.0,
             "ObjectProperties": {
@@ -778,7 +923,7 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 699.0
+                    "Integer": 807.0
                 },
                 "Y": {
                     "Type": 3.0,
@@ -836,7 +981,7 @@
                 },
                 "Width": {
                     "Type": 3.0,
-                    "Integer": 900.0
+                    "Integer": 975.0
                 },
                 "Height": {
                     "Type": 3.0,
@@ -1042,68 +1187,6 @@
                 }
             }
         },
-        "Label": {
-            "Visible": 1.0,
-            "ObjectProperties": {
-                "Name": {
-                    "Type": 5.0,
-                    "String": "object 72145"
-                },
-                "X": {
-                    "Type": 3.0,
-                    "Integer": 480.0
-                },
-                "Y": {
-                    "Type": 3.0,
-                    "Integer": 168.0
-                },
-                "Width": {
-                    "Type": 3.0,
-                    "Integer": 107.0
-                },
-                "Height": {
-                    "Type": 3.0,
-                    "Integer": 24.0
-                },
-                "Tool Tip": {
-                    "Type": 5.0,
-                    "String": ""
-                },
-                "Caption": {
-                    "Type": 5.0,
-                    "String": "Modeled value"
-                },
-                "TextColour": {
-                    "Type": 4.0,
-                    "Color": {
-                        "Red": 0.0,
-                        "Green": 0.0,
-                        "Blue": 0.0,
-                        "Alpha": 255.0
-                    }
-                },
-                "Bold": {
-                    "Type": 2.0,
-                    "Boolean": 0.0
-                },
-                "FontSize": {
-                    "Type": 3.0,
-                    "Integer": 0.0
-                },
-                "WordWrap": {
-                    "Type": 2.0,
-                    "Boolean": 0.0
-                },
-                "AlignRight": {
-                    "Type": 2.0,
-                    "Boolean": 1.0
-                },
-                "AlignTop": {
-                    "Type": 2.0,
-                    "Boolean": 0.0
-                }
-            }
-        },
         "Label": {
             "Visible": 1.0,
             "ObjectProperties": {
@@ -1113,7 +1196,7 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 726.0
+                    "Integer": 852.0
                 },
                 "Y": {
                     "Type": 3.0,
@@ -1361,7 +1444,7 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 522.0
+                    "Integer": 648.0
                 },
                 "Y": {
                     "Type": 3.0,
@@ -1423,7 +1506,7 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 735.0
+                    "Integer": 861.0
                 },
                 "Y": {
                     "Type": 3.0,
@@ -1609,7 +1692,7 @@
                 },
                 "Items": {
                     "Type": 6.0,
-                    "StringList": "Enter in $/kW|Enter in $|Use Modeled Value ($)|Use Cost Breakdown ($)"
+                    "StringList": "Enter in $/kW|Enter in $|Use Modeled Value ($)|Use Cost Breakdown ($)|Use Array Scaling"
                 },
                 "Selection": {
                     "Type": 3.0,
@@ -1704,6 +1787,89 @@
                 }
             }
         },
+        "Numeric": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "power_takeoff_system_cost_rvalue"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 738.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 231.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 100.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 24.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Value": {
+                    "Type": 1.0,
+                    "Double": 0.0
+                },
+                "Mode": {
+                    "Type": 3.0,
+                    "Integer": 1.0
+                },
+                "Format": {
+                    "Type": 3.0,
+                    "Integer": 0.0
+                },
+                "Decimals": {
+                    "Type": 3.0,
+                    "Integer": 3.0
+                },
+                "Prefix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Suffix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "ThousandsSep": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "Editable": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "ForeColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 0.0,
+                        "Green": 0.0,
+                        "Blue": 0.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "BackColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 255.0,
+                        "Green": 255.0,
+                        "Blue": 255.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "TabOrder": {
+                    "Type": 3.0,
+                    "Integer": -1.0
+                }
+            }
+        },
         "Numeric": {
             "Visible": 1.0,
             "ObjectProperties": {
@@ -1787,6 +1953,68 @@
                 }
             }
         },
+        "Label": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "rvalue_label"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 720.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 168.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 120.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 24.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Caption": {
+                    "Type": 5.0,
+                    "String": "Array scaling R-value"
+                },
+                "TextColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 0.0,
+                        "Green": 0.0,
+                        "Blue": 0.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "Bold": {
+                    "Type": 2.0,
+                    "Boolean": 0.0
+                },
+                "FontSize": {
+                    "Type": 3.0,
+                    "Integer": 0.0
+                },
+                "WordWrap": {
+                    "Type": 2.0,
+                    "Boolean": 0.0
+                },
+                "AlignRight": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "AlignTop": {
+                    "Type": 2.0,
+                    "Boolean": 0.0
+                }
+            }
+        },
         "Label": {
             "Visible": 1.0,
             "ObjectProperties": {
@@ -1796,7 +2024,7 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 606.0
+                    "Integer": 591.0
                 },
                 "Y": {
                     "Type": 3.0,
@@ -1804,7 +2032,7 @@
                 },
                 "Width": {
                     "Type": 3.0,
-                    "Integer": 105.0
+                    "Integer": 120.0
                 },
                 "Height": {
                     "Type": 3.0,
@@ -1858,7 +2086,7 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 735.0
+                    "Integer": 861.0
                 },
                 "Y": {
                     "Type": 3.0,
@@ -2044,7 +2272,7 @@
                 },
                 "Items": {
                     "Type": 6.0,
-                    "StringList": "Enter in $/kW|Enter in $|Use Modeled Value ($)|Use Cost Breakdown ($)"
+                    "StringList": "Enter in $/kW|Enter in $|Use Modeled Value ($)|Use Cost Breakdown ($)|Use Array Scaling"
                 },
                 "Selection": {
                     "Type": 3.0,
@@ -2139,6 +2367,89 @@
                 }
             }
         },
+        "Numeric": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "structural_assembly_cost_rvalue"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 738.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 195.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 100.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 24.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Value": {
+                    "Type": 1.0,
+                    "Double": 0.0
+                },
+                "Mode": {
+                    "Type": 3.0,
+                    "Integer": 1.0
+                },
+                "Format": {
+                    "Type": 3.0,
+                    "Integer": 0.0
+                },
+                "Decimals": {
+                    "Type": 3.0,
+                    "Integer": 3.0
+                },
+                "Prefix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Suffix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "ThousandsSep": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "Editable": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "ForeColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 0.0,
+                        "Green": 0.0,
+                        "Blue": 0.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "BackColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 255.0,
+                        "Green": 255.0,
+                        "Blue": 255.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "TabOrder": {
+                    "Type": 3.0,
+                    "Integer": -1.0
+                }
+            }
+        },
         "Numeric": {
             "Visible": 1.0,
             "ObjectProperties": {
@@ -2288,6 +2599,45 @@
             "UIObject": "Default",
             "sscVariableName": "",
             "sscVariableValue": ""
+        },
+        "mooring_found_substruc_cost_rvalue": {
+            "Version": 4.0,
+            "Type": 1.0,
+            "Label": "Mooring and foundation cost rvalue",
+            "Units": "",
+            "Group": "ME Costs - Device",
+            "IndexLabels": "",
+            "Flags": 3.0,
+            "DefaultValue": 0.0,
+            "UIObject": "Default",
+            "sscVariableName": "",
+            "sscVariableValue": ""
+        },
+        "power_takeoff_system_cost_rvalue": {
+            "Version": 4.0,
+            "Type": 1.0,
+            "Label": "Power takeoff system cost rvalue",
+            "Units": "",
+            "Group": "ME Costs - Device",
+            "IndexLabels": "",
+            "Flags": 3.0,
+            "DefaultValue": 0.0,
+            "UIObject": "Default",
+            "sscVariableName": "",
+            "sscVariableValue": ""
+        },
+        "structural_assembly_cost_rvalue": {
+            "Version": 4.0,
+            "Type": 1.0,
+            "Label": "Structural Assembly R-value",
+            "Units": "",
+            "Group": "ME Costs - Device",
+            "IndexLabels": "",
+            "Flags": 3.0,
+            "DefaultValue": 0.0,
+            "UIObject": "Default",
+            "sscVariableName": "",
+            "sscVariableValue": ""
         }
     },
     "Equations": [
@@ -2364,23 +2714,25 @@
         "\t//Structural assembly",
         "\t//show('struct_level_total_label',0);",
         "\tshow('structural_assembly_cost_total',value('structural_assembly_cost_method')==3);",
-        "\tshow('structural_assembly_cost_input',value('structural_assembly_cost_method')!=3);",
-        "\tenable('structural_assembly_cost_input',value('structural_assembly_cost_method')!=2);",
-        "",
+        "\t//show('structural_assembly_cost_input',value('structural_assembly_cost_method')!=3 && value('structural_assembly_cost_method')!=2);",
+        "\tenable('structural_assembly_cost_input',value('structural_assembly_cost_method')<2 || value('structural_assembly_cost_method')==4);\r",
+        "\tenable('structural_assembly_cost_rvalue', value('structural_assembly_cost_method')==4);\r",
         "\t",
         "\t//PTO",
         "\t//show('power_takeoff_system_total_label',0);",
         "\tshow('power_takeoff_system_cost_total',value('power_takeoff_system_cost_method')==3);",
         "\tshow('power_takeoff_system_cost_input',value('power_takeoff_system_cost_method')!=3);",
-        "\tenable('power_takeoff_system_cost_input',value('power_takeoff_system_cost_method')!=2);",
-        "\t",
+        "\tenable('power_takeoff_system_cost_input',value('power_takeoff_system_cost_method')<2 || value('power_takeoff_system_cost_method')==4);",
+        "\tenable('power_takeoff_system_cost_rvalue', value('power_takeoff_system_cost_method')==4);\r",
+        "",
         "\t",
         "\t//Mooring",
         "\t//show('mooring_cost_label',0);",
         "\tshow('mooring_found_substruc_cost_total',value('mooring_found_substruc_cost_method')==3);",
         "\tshow('mooring_found_substruc_cost_input',value('mooring_found_substruc_cost_method')!=3);",
         "\tenable('mooring_found_substruc_cost_input',value('mooring_found_substruc_cost_method')!=2);",
-        "\t",
+        "\tenable('mooring_found_substruc_cost_rvalue', value('mooring_found_substruc_cost_method')<2 || value('mooring_found_substruc_cost_method')==4);\r",
+        "",
         "\ton_change{'device_cost_override'};",
         "\toverride_device_cost();",
         "\t",
diff --git a/deploy/runtime/ui/Marine Costs - E&M.json b/deploy/runtime/ui/Marine Costs - E&M.json
index 947aa34c79..57813e8e99 100644
--- a/deploy/runtime/ui/Marine Costs - E&M.json	
+++ b/deploy/runtime/ui/Marine Costs - E&M.json	
@@ -1,7 +1,7 @@
 {
     "Name": "Marine Costs - E&M",
-    "Width": 920.0,
-    "Height": 530.0,
+    "Width": 919.0,
+    "Height": 575.0,
     "FormObjects": {
         "Label": {
             "Visible": 1.0,
@@ -86,7 +86,7 @@
                 },
                 "Height": {
                     "Type": 3.0,
-                    "Integer": 511.0
+                    "Integer": 550.0
                 },
                 "Tool Tip": {
                     "Type": 5.0,
@@ -115,7 +115,7 @@
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 456.0
+                    "Integer": 462.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -177,7 +177,7 @@
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 426.0
+                    "Integer": 432.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -433,6 +433,89 @@
                 }
             }
         },
+        "Numeric": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "construction_management_cost_rvalue"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 468.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 162.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 100.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 24.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Value": {
+                    "Type": 1.0,
+                    "Double": 0.0
+                },
+                "Mode": {
+                    "Type": 3.0,
+                    "Integer": 1.0
+                },
+                "Format": {
+                    "Type": 3.0,
+                    "Integer": 0.0
+                },
+                "Decimals": {
+                    "Type": 3.0,
+                    "Integer": 3.0
+                },
+                "Prefix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Suffix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "ThousandsSep": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "Editable": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "ForeColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 0.0,
+                        "Green": 0.0,
+                        "Blue": 0.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "BackColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 255.0,
+                        "Green": 255.0,
+                        "Blue": 255.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "TabOrder": {
+                    "Type": 3.0,
+                    "Integer": -1.0
+                }
+            }
+        },
         "Numeric": {
             "Visible": 1.0,
             "ObjectProperties": {
@@ -516,7 +599,7 @@
                 }
             }
         },
-        "CheckBox": {
+        "Choice": {
             "Visible": 1.0,
             "ObjectProperties": {
                 "Name": {
@@ -525,15 +608,15 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 336.0
+                    "Integer": 477.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 156.0
+                    "Integer": 126.0
                 },
                 "Width": {
                     "Type": 3.0,
-                    "Integer": 192.0
+                    "Integer": 177.0
                 },
                 "Height": {
                     "Type": 3.0,
@@ -543,13 +626,13 @@
                     "Type": 5.0,
                     "String": ""
                 },
-                "Caption": {
-                    "Type": 5.0,
-                    "String": "Enter detailed costs"
+                "Items": {
+                    "Type": 6.0,
+                    "StringList": "Enter cost|Enter itemized costs|Array scaling costs"
                 },
-                "State": {
-                    "Type": 2.0,
-                    "Boolean": 0.0
+                "Selection": {
+                    "Type": 3.0,
+                    "Integer": -1.0
                 },
                 "TabOrder": {
                     "Type": 3.0,
@@ -557,7 +640,7 @@
                 }
             }
         },
-        "CheckBox": {
+        "Choice": {
             "Visible": 1.0,
             "ObjectProperties": {
                 "Name": {
@@ -566,15 +649,15 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 336.0
+                    "Integer": 483.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 366.0
+                    "Integer": 342.0
                 },
                 "Width": {
                     "Type": 3.0,
-                    "Integer": 192.0
+                    "Integer": 177.0
                 },
                 "Height": {
                     "Type": 3.0,
@@ -584,13 +667,13 @@
                     "Type": 5.0,
                     "String": ""
                 },
-                "Caption": {
-                    "Type": 5.0,
-                    "String": "Enter detailed costs"
+                "Items": {
+                    "Type": 6.0,
+                    "StringList": "Enter cost|Enter itemized costs|Array scaling costs"
                 },
-                "State": {
-                    "Type": 2.0,
-                    "Boolean": 0.0
+                "Selection": {
+                    "Type": 3.0,
+                    "Integer": -1.0
                 },
                 "TabOrder": {
                     "Type": 3.0,
@@ -694,7 +777,7 @@
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 174.0
+                    "Integer": 204.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -818,7 +901,7 @@
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 426.0
+                    "Integer": 432.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -901,7 +984,7 @@
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 396.0
+                    "Integer": 402.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -984,7 +1067,7 @@
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 336.0
+                    "Integer": 342.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -1054,6 +1137,89 @@
                 }
             }
         },
+        "Numeric": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "health_safety_and_environmental_monitoring_cost_rvalue"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 468.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 372.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 100.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 24.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Value": {
+                    "Type": 1.0,
+                    "Double": 0.0
+                },
+                "Mode": {
+                    "Type": 3.0,
+                    "Integer": 1.0
+                },
+                "Format": {
+                    "Type": 3.0,
+                    "Integer": 0.0
+                },
+                "Decimals": {
+                    "Type": 3.0,
+                    "Integer": 3.0
+                },
+                "Prefix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Suffix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "ThousandsSep": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "Editable": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "ForeColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 0.0,
+                        "Green": 0.0,
+                        "Blue": 0.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "BackColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 255.0,
+                        "Green": 255.0,
+                        "Blue": 255.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "TabOrder": {
+                    "Type": 3.0,
+                    "Integer": -1.0
+                }
+            }
+        },
         "Numeric": {
             "Visible": 1.0,
             "ObjectProperties": {
@@ -1067,7 +1233,7 @@
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 336.0
+                    "Integer": 342.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -1212,7 +1378,7 @@
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 486.0
+                    "Integer": 492.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -1274,7 +1440,7 @@
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 396.0
+                    "Integer": 402.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -1336,7 +1502,7 @@
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 306.0
+                    "Integer": 312.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -1398,7 +1564,7 @@
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 276.0
+                    "Integer": 282.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -1460,7 +1626,7 @@
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 216.0
+                    "Integer": 222.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -1522,7 +1688,7 @@
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 246.0
+                    "Integer": 252.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -1646,7 +1812,7 @@
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 186.0
+                    "Integer": 192.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -1708,7 +1874,7 @@
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 336.0
+                    "Integer": 342.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -1770,7 +1936,7 @@
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 276.0
+                    "Integer": 282.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -1853,7 +2019,7 @@
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 486.0
+                    "Integer": 492.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -1936,7 +2102,7 @@
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 456.0
+                    "Integer": 462.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -2102,7 +2268,7 @@
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 246.0
+                    "Integer": 252.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -2185,7 +2351,7 @@
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 306.0
+                    "Integer": 312.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -2268,7 +2434,7 @@
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 186.0
+                    "Integer": 192.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -2351,7 +2517,7 @@
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 216.0
+                    "Integer": 222.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -2508,7 +2674,7 @@
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 336.0
+                    "Integer": 342.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -2545,7 +2711,7 @@
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 486.0
+                    "Integer": 492.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -2619,7 +2785,7 @@
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 306.0
+                    "Integer": 312.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -2732,6 +2898,19 @@
             "sscVariableName": "",
             "sscVariableValue": ""
         },
+        "construction_management_cost_rvalue": {
+            "Version": 4.0,
+            "Type": 1.0,
+            "Label": "Construction management array scaling R-value",
+            "Units": "",
+            "Group": "ME Costs - Engineering Management",
+            "IndexLabels": "",
+            "Flags": 2.0,
+            "DefaultValue": 0.0,
+            "UIObject": "Default",
+            "sscVariableName": "",
+            "sscVariableValue": ""
+        },
         "construction_management_cost_total": {
             "Version": 4.0,
             "Type": 1.0,
@@ -2764,10 +2943,10 @@
             "Label": "Construction management detailed cost choice",
             "Units": " ",
             "Group": "ME Costs - Engineering Management",
-            "IndexLabels": "",
+            "IndexLabels": "Enter costs|Enter itemized costs|Array scaling costs",
             "Flags": 3.0,
             "DefaultValue": 0.0,
-            "UIObject": "CheckBox",
+            "UIObject": "Choice",
             "sscVariableName": "",
             "sscVariableValue": ""
         },
@@ -2780,7 +2959,7 @@
             "IndexLabels": "",
             "Flags": 3.0,
             "DefaultValue": 0.0,
-            "UIObject": "CheckBox",
+            "UIObject": "Choice",
             "sscVariableName": "",
             "sscVariableValue": ""
         },
@@ -2888,6 +3067,19 @@
             "sscVariableName": "",
             "sscVariableValue": ""
         },
+        "health_safety_and_environmental_monitoring_cost_rvalue": {
+            "Version": 4.0,
+            "Type": 1.0,
+            "Label": "Health, safety, and environmental monitoring array scaling R-value",
+            "Units": "",
+            "Group": "ME Costs - Engineering Management",
+            "IndexLabels": "",
+            "Flags": 0.0,
+            "DefaultValue": 0.0,
+            "UIObject": "Default",
+            "sscVariableName": "",
+            "sscVariableValue": ""
+        },
         "health_safety_and_environmental_monitoring_cost_total": {
             "Version": 4.0,
             "Type": 1.0,
@@ -3092,13 +3284,17 @@
         "};",
         "",
         "equations {'construction_management_cost_total_check'} = define() {",
+        "\tb = -log(1-${construction_management_cost_rvalue})/log(2);\r",
         "\tif (${detailed_cost_choice_construction_management}==0)",
         "\t{",
         "\t\treturn ${construction_management_cost};",
         "\t}",
-        "\telse",
+        "\telse if (${detailed_cost_choice_construction_management}==1)",
         "\t{",
         "\t\treturn ${construction_management_cost_total};",
+        "\t}\r",
+        "\telse {\r",
+        "\t\treturn (${construction_management_cost}*pow(${number_devices},-b))*${number_devices};\r",
         "\t}",
         "};",
         "",
@@ -3108,13 +3304,17 @@
         "};",
         "",
         "equations {'health_safety_and_environmental_monitoring_cost_total_check'} = define() {",
+        "\tb = -log(1-${health_safety_and_environmental_monitoring_cost_rvalue})/log(2);\r",
         "\tif (${detailed_cost_choice_health_safety}==0)",
         "\t{",
         "\t\treturn ${health_safety_and_environmental_monitoring_cost};",
         "\t}",
-        "\telse",
+        "\telse if (${detailed_cost_choice_health_safety}==1)",
         "\t{",
         "\t\treturn ${health_safety_and_environmental_monitoring_cost_total};",
+        "\t}\r",
+        "\telse {\r",
+        "\t\treturn (${health_safety_and_environmental_monitoring_cost}*pow(${number_devices},-b))*${number_devices};\r",
         "\t}",
         "};",
         "",
@@ -3125,12 +3325,14 @@
         "};",
         "",
         "equations {'eng_and_mgmt_cost'} = define() {",
+        "\tarray_scaling_b_value = -log(1-${eng_and_mgmt_cost_rvalue}) / log(2);\r",
         "\treturn ?${eng_and_mgmt_cost_method}",
         "\t\t\t[",
         "\t\t\t\t${eng_and_mgmt_cost_input}*${system_capacity},",
         "\t\t\t\t${eng_and_mgmt_cost_input},",
         "\t\t\t\t${eng_and_mgmt_cost_modeled},",
-        "\t\t\t\t${eng_and_mgmt_cost_total}",
+        "\t\t\t\t${eng_and_mgmt_cost_total},\r",
+        "\t\t\t\t(${eng_and_mgmt_cost_input}*pow(${number_devices},-array_scaling_b_value))*${number_devices}",
         "\t\t\t];",
         "};",
         "",
@@ -3142,7 +3344,8 @@
         "\t\t\t\t\t0,",
         "\t\t\t\t\t0,",
         "\t\t\t\t\t2,",
-        "\t\t\t\t\t1",
+        "\t\t\t\t\t1,\r",
+        "\t\t\t\t\t3",
         "\t\t\t\t];",
         "\t}",
         "\telse",
@@ -3159,16 +3362,16 @@
     ],
     "Callbacks": [
         "on_load{'Marine Costs - E&M'} = define() {",
-        "\ton_change{'itemized_check_eng'};",
+        "\ton_change{'itemized_check_eng'}();",
         "\t//on_change{'level_eng'};",
         "\tenable_itemized_eng();",
         "\t//enable_itemized_level();",
-        "\ton_change{'detailed_cost_choice_construction_management'};",
-        "\ton_change{'detailed_cost_choice_health_safety'};",
+        "\ton_change{'detailed_cost_choice_construction_management'}();",
+        "\ton_change{'detailed_cost_choice_health_safety'}();",
         "\tdetailed_cost_construction_management();",
         "\tdetailed_cost_health_safety();",
         "\tcheck_override_eng_mgmt();",
-        "\ton_change{'eng_and_mgmt_override'};",
+        "\ton_change{'eng_and_mgmt_override'}();",
         "};",
         "",
         "on_change{'eng_and_mgmt_override'} = define() {",
@@ -3194,14 +3397,16 @@
         "\tif (value('itemized_check_eng')==1)",
         "\t{",
         "\t\tdetailed_value = value('detailed_cost_choice_construction_management');",
-        "\t\tenable('construction_management_cost',detailed_value==0);",
-        "\t\tshow('construction_management_cost',detailed_value==0);",
-        "\t\tenable('construction_management_cost_total',detailed_value);",
-        "\t\tshow('construction_management_cost_total',detailed_value);",
-        "\t\tenable('salaries_eng_cost',detailed_value);",
-        "\t\tenable('sales_general_and_administrative_eng_cost',detailed_value);",
-        "\t\tenable('profit_eng_cost',detailed_value);",
-        "\t\tenable('other_construction_management_cost',detailed_value);",
+        "\t\tenable('construction_management_cost',detailed_value==0 || detailed_value==2);",
+        "\t\tshow('construction_management_cost',detailed_value==0 || detailed_value==2);",
+        "\t\tenable('construction_management_cost_total',detailed_value==1);",
+        "\t\tshow('construction_management_cost_total',detailed_value==1);",
+        "\t\tenable('salaries_eng_cost',detailed_value==1);",
+        "\t\tenable('sales_general_and_administrative_eng_cost',detailed_value==1);",
+        "\t\tenable('profit_eng_cost',detailed_value==1);",
+        "\t\tenable('other_construction_management_cost',detailed_value==1);\r",
+        "\t\tenable('construction_management_cost_rvalue',detailed_value==2);\r",
+        "\t\t",
         "\t\t",
         "\t\trefresh();",
         "\t}",
@@ -3216,13 +3421,14 @@
         "\tif (value('itemized_check_eng')==1)",
         "\t{",
         "\t\tdetailed_value = value('detailed_cost_choice_health_safety');",
-        "\t\tenable('health_safety_and_environmental_monitoring_cost',detailed_value==0);",
-        "\t\tshow('health_safety_and_environmental_monitoring_cost',detailed_value==0);",
-        "\t\tenable('health_safety_and_environmental_monitoring_cost_total',detailed_value);",
-        "\t\tshow('health_safety_and_environmental_monitoring_cost_total',detailed_value);",
-        "\t\tenable('health_and_safety_monitoring_cost',detailed_value);",
-        "\t\tenable('environmental_monitoring_cost',detailed_value);",
-        "\t\tenable('other_health_and_safety_cost',detailed_value);",
+        "\t\tenable('health_safety_and_environmental_monitoring_cost',detailed_value!=1);",
+        "\t\tshow('health_safety_and_environmental_monitoring_cost',detailed_value!=1);",
+        "\t\tenable('health_safety_and_environmental_monitoring_cost_total',detailed_value==1);",
+        "\t\tshow('health_safety_and_environmental_monitoring_cost_total',detailed_value==1);",
+        "\t\tenable('health_and_safety_monitoring_cost',detailed_value==1);",
+        "\t\tenable('environmental_monitoring_cost',detailed_value==1);",
+        "\t\tenable('other_health_and_safety_cost',detailed_value==1);\r",
+        "\t\tenable('health_safety_and_environmental_monitoring_rvalue',detailed_value==2);",
         "\t\t",
         "\t\trefresh();",
         "\t}",
@@ -3244,14 +3450,17 @@
         "\tenable('procurement_management_cost',itemized_value==1);",
         "\tenable('construction_management_cost',itemized_value==1);",
         "\tenable('construction_management_cost_total',itemized_value==1);",
-        "\tenable('detailed_cost_choice_construction_management',itemized_value==1);",
-        "\tenable('sales_general_and_administrative_eng_cost',itemized_value==1);",
+        "\tenable('detailed_cost_choice_construction_management',itemized_value==1);\r",
+        "\tenable('construction_management_cost_rvalue', itemized_value==1);",
+        "\tenable('sales_general_and_administrative_eng_cost',itemized_value==1);\r",
+        "\tenable('construction_management_cost_rvalue',itemized_value==1);",
         "\tenable('salaries_eng_cost',itemized_value==1);",
         "\tenable('profit_eng_cost',itemized_value==1);",
         "\tenable('project_certification_cost',itemized_value==1);",
         "\tenable('health_safety_and_environmental_monitoring_cost',itemized_value==1);",
         "\tenable('health_safety_and_environmental_monitoring_cost_total',itemized_value==1);",
-        "\tenable('detailed_cost_choice_health_safety',itemized_value==1);",
+        "\tenable('detailed_cost_choice_health_safety',itemized_value==1);\r",
+        "\tenable('health_safety_and_environmental_monitoring_cost_rvalue',itemized_value==1);",
         "\tenable('health_and_safety_monitoring_cost',itemized_value==1);",
         "\tenable('environmental_monitoring_cost',itemized_value==1);",
         "\tenable('other_eng_cost',itemized_value==1);",
@@ -3259,10 +3468,11 @@
         "\tenable('other_health_and_safety_cost',itemized_value==1);",
         "\tshow('level_eng',itemized_value==1);",
         "\tshow('level_label',itemized_value==1);",
-        "\tenable('eng_and_mgmt_cost_input',itemized_value==0);",
+        "\tenable('eng_and_mgmt_cost_input',itemized_value != 2);\r",
+        "\tenable('eng_and_mgmt_cost_rvalue', itemized_value == 3);",
         "\tshow('eng_and_mgmt_cost_total',itemized_value==1);",
         "\tshow('level_input_label_eng',itemized_value==1);",
-        "\tshow('eng_and_mgmt_cost_input',(itemized_value==0 || itemized_value==2));",
+        "\tshow('eng_and_mgmt_cost_input',itemized_value != 1);",
         "\tshow('user_input_label_eng',(itemized_value==0 || itemized_value==2));",
         "\tshow('level_label',itemized_value==1);",
         "\tshow('level_line',itemized_value==1);",
diff --git a/deploy/runtime/ui/Marine Costs - Electrical Infrastructure.json b/deploy/runtime/ui/Marine Costs - Electrical Infrastructure.json
index c91fcd9041..f3b59ca9cf 100644
--- a/deploy/runtime/ui/Marine Costs - Electrical Infrastructure.json	
+++ b/deploy/runtime/ui/Marine Costs - Electrical Infrastructure.json	
@@ -1,7 +1,7 @@
 {
     "Name": "Marine Costs - Electrical Infrastructure",
-    "Width": 920.0,
-    "Height": 1431.0,
+    "Width": 915.0,
+    "Height": 1599.0,
     "FormObjects": {
         "Label": {
             "Visible": 1.0,
@@ -74,11 +74,11 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 147.0
+                    "Integer": 150.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 426.0
+                    "Integer": 495.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -136,11 +136,11 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 21.0
+                    "Integer": 27.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 876.0
+                    "Integer": 972.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -198,11 +198,11 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 21.0
+                    "Integer": 24.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 1143.0
+                    "Integer": 1263.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -264,7 +264,7 @@
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 696.0
+                    "Integer": 765.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -334,7 +334,7 @@
                 },
                 "Height": {
                     "Type": 3.0,
-                    "Integer": 1411.0
+                    "Integer": 1573.0
                 },
                 "Tool Tip": {
                     "Type": 5.0,
@@ -487,7 +487,7 @@
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 126.0
+                    "Integer": 156.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -570,7 +570,7 @@
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 156.0
+                    "Integer": 186.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -806,6 +806,89 @@
                 }
             }
         },
+        "Numeric": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "array_cable_system_cost_rvalue"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 468.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 96.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 100.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 24.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Value": {
+                    "Type": 1.0,
+                    "Double": 0.0
+                },
+                "Mode": {
+                    "Type": 3.0,
+                    "Integer": 1.0
+                },
+                "Format": {
+                    "Type": 3.0,
+                    "Integer": 0.0
+                },
+                "Decimals": {
+                    "Type": 3.0,
+                    "Integer": 3.0
+                },
+                "Prefix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Suffix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "ThousandsSep": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "Editable": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "ForeColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 0.0,
+                        "Green": 0.0,
+                        "Blue": 0.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "BackColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 255.0,
+                        "Green": 255.0,
+                        "Blue": 255.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "TabOrder": {
+                    "Type": 3.0,
+                    "Integer": -1.0
+                }
+            }
+        },
         "Numeric": {
             "Visible": 1.0,
             "ObjectProperties": {
@@ -902,7 +985,7 @@
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 186.0
+                    "Integer": 216.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -985,7 +1068,7 @@
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 96.0
+                    "Integer": 126.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -1064,11 +1147,11 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 468.0
+                    "Integer": 471.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 576.0
+                    "Integer": 645.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -1147,11 +1230,11 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 468.0
+                    "Integer": 471.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 606.0
+                    "Integer": 675.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -1230,11 +1313,11 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 465.0
+                    "Integer": 468.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 1059.0
+                    "Integer": 1176.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -1313,11 +1396,11 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 468.0
+                    "Integer": 471.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 516.0
+                    "Integer": 585.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -1396,11 +1479,11 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 339.0
+                    "Integer": 342.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 426.0
+                    "Integer": 495.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -1470,6 +1553,89 @@
                 }
             }
         },
+        "Numeric": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "cable_protection_cost_rvalue"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 471.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 525.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 100.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 24.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Value": {
+                    "Type": 1.0,
+                    "Double": 0.0
+                },
+                "Mode": {
+                    "Type": 3.0,
+                    "Integer": 1.0
+                },
+                "Format": {
+                    "Type": 3.0,
+                    "Integer": 0.0
+                },
+                "Decimals": {
+                    "Type": 3.0,
+                    "Integer": 3.0
+                },
+                "Prefix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Suffix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "ThousandsSep": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "Editable": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "ForeColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 0.0,
+                        "Green": 0.0,
+                        "Blue": 0.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "BackColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 255.0,
+                        "Green": 255.0,
+                        "Blue": 255.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "TabOrder": {
+                    "Type": 3.0,
+                    "Integer": -1.0
+                }
+            }
+        },
         "Numeric": {
             "Visible": 1.0,
             "ObjectProperties": {
@@ -1479,11 +1645,11 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 339.0
+                    "Integer": 342.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 426.0
+                    "Integer": 495.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -1562,11 +1728,11 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 465.0
+                    "Integer": 468.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 1089.0
+                    "Integer": 1206.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -1636,7 +1802,7 @@
                 }
             }
         },
-        "CheckBox": {
+        "Choice": {
             "Visible": 1.0,
             "ObjectProperties": {
                 "Name": {
@@ -1645,15 +1811,15 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 369.0
+                    "Integer": 477.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 456.0
+                    "Integer": 495.0
                 },
                 "Width": {
                     "Type": 3.0,
-                    "Integer": 213.0
+                    "Integer": 177.0
                 },
                 "Height": {
                     "Type": 3.0,
@@ -1663,13 +1829,13 @@
                     "Type": 5.0,
                     "String": ""
                 },
-                "Caption": {
-                    "Type": 5.0,
-                    "String": "Enter detailed costs"
+                "Items": {
+                    "Type": 6.0,
+                    "StringList": "Enter cost|Enter itemized costs|Array scaling costs"
                 },
-                "State": {
-                    "Type": 2.0,
-                    "Boolean": 0.0
+                "Selection": {
+                    "Type": 3.0,
+                    "Integer": -1.0
                 },
                 "TabOrder": {
                     "Type": 3.0,
@@ -1677,7 +1843,7 @@
                 }
             }
         },
-        "CheckBox": {
+        "Choice": {
             "Visible": 1.0,
             "ObjectProperties": {
                 "Name": {
@@ -1686,15 +1852,15 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 369.0
+                    "Integer": 477.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 1173.0
+                    "Integer": 1263.0
                 },
                 "Width": {
                     "Type": 3.0,
-                    "Integer": 255.0
+                    "Integer": 177.0
                 },
                 "Height": {
                     "Type": 3.0,
@@ -1704,13 +1870,13 @@
                     "Type": 5.0,
                     "String": ""
                 },
-                "Caption": {
-                    "Type": 5.0,
-                    "String": "Enter detailed costs"
+                "Items": {
+                    "Type": 6.0,
+                    "StringList": "Enter cost|Enter itemized costs|Array scaling costs"
                 },
-                "State": {
-                    "Type": 2.0,
-                    "Boolean": 0.0
+                "Selection": {
+                    "Type": 3.0,
+                    "Integer": -1.0
                 },
                 "TabOrder": {
                     "Type": 3.0,
@@ -1747,7 +1913,7 @@
                 },
                 "Items": {
                     "Type": 6.0,
-                    "StringList": "Enter in $|Enter detailed costs|Use modeled value"
+                    "StringList": "Enter in $|Enter detailed costs|Use modeled value|Array scaling costs"
                 },
                 "Selection": {
                     "Type": 3.0,
@@ -1768,11 +1934,11 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 477.0
+                    "Integer": 474.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 246.0
+                    "Integer": 282.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -1788,7 +1954,7 @@
                 },
                 "Items": {
                     "Type": 6.0,
-                    "StringList": "Enter in $|Enter detailed costs|Use modeled value"
+                    "StringList": "Enter in $|Enter detailed costs|Use modeled value|Array scaling costs"
                 },
                 "Selection": {
                     "Type": 3.0,
@@ -1813,7 +1979,7 @@
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 696.0
+                    "Integer": 765.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -1850,11 +2016,11 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 480.0
+                    "Integer": 486.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 876.0
+                    "Integer": 972.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -1891,11 +2057,11 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 480.0
+                    "Integer": 483.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 1386.0
+                    "Integer": 1506.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -1911,7 +2077,7 @@
                 },
                 "Items": {
                     "Type": 6.0,
-                    "StringList": "Enter in $|Use modeled value ($)"
+                    "StringList": "Enter in $|Use modeled value ($)|Array scaling costs"
                 },
                 "Selection": {
                     "Type": 3.0,
@@ -1932,11 +2098,11 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 468.0
+                    "Integer": 471.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 546.0
+                    "Integer": 615.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -2143,7 +2309,7 @@
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 786.0
+                    "Integer": 885.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -2222,11 +2388,11 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 465.0
+                    "Integer": 468.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 1002.0
+                    "Integer": 1119.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -2305,11 +2471,11 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 468.0
+                    "Integer": 465.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 306.0
+                    "Integer": 375.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -2388,11 +2554,11 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 468.0
+                    "Integer": 465.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 336.0
+                    "Integer": 405.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -2471,11 +2637,11 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 339.0
+                    "Integer": 336.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 246.0
+                    "Integer": 282.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -2554,11 +2720,11 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 339.0
+                    "Integer": 336.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 246.0
+                    "Integer": 282.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -2633,15 +2799,15 @@
             "ObjectProperties": {
                 "Name": {
                     "Type": 5.0,
-                    "String": "export_cable_system_cost_total"
+                    "String": "export_cable_system_cost_rvalue"
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 339.0
+                    "Integer": 465.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 246.0
+                    "Integer": 315.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -2669,11 +2835,11 @@
                 },
                 "Decimals": {
                     "Type": 3.0,
-                    "Integer": 0.0
+                    "Integer": 3.0
                 },
                 "Prefix": {
                     "Type": 5.0,
-                    "String": "$"
+                    "String": ""
                 },
                 "Suffix": {
                     "Type": 5.0,
@@ -2716,15 +2882,15 @@
             "ObjectProperties": {
                 "Name": {
                     "Type": 5.0,
-                    "String": "export_cable_system_transportation_cost"
+                    "String": "export_cable_system_cost_total"
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 468.0
+                    "Integer": 336.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 366.0
+                    "Integer": 282.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -2790,7 +2956,7 @@
                 },
                 "TabOrder": {
                     "Type": 3.0,
-                    "Integer": 11.0
+                    "Integer": -1.0
                 }
             }
         },
@@ -2799,15 +2965,98 @@
             "ObjectProperties": {
                 "Name": {
                     "Type": 5.0,
-                    "String": "export_cables_cost"
+                    "String": "export_cable_system_transportation_cost"
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 468.0
+                    "Integer": 465.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 276.0
+                    "Integer": 435.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 100.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 24.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Value": {
+                    "Type": 1.0,
+                    "Double": 0.0
+                },
+                "Mode": {
+                    "Type": 3.0,
+                    "Integer": 1.0
+                },
+                "Format": {
+                    "Type": 3.0,
+                    "Integer": 0.0
+                },
+                "Decimals": {
+                    "Type": 3.0,
+                    "Integer": 0.0
+                },
+                "Prefix": {
+                    "Type": 5.0,
+                    "String": "$"
+                },
+                "Suffix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "ThousandsSep": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "Editable": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "ForeColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 0.0,
+                        "Green": 0.0,
+                        "Blue": 0.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "BackColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 255.0,
+                        "Green": 255.0,
+                        "Blue": 255.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "TabOrder": {
+                    "Type": 3.0,
+                    "Integer": 11.0
+                }
+            }
+        },
+        "Numeric": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "export_cables_cost"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 465.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 345.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -2890,7 +3139,7 @@
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 816.0
+                    "Integer": 915.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -2969,11 +3218,11 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 465.0
+                    "Integer": 468.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 969.0
+                    "Integer": 1089.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -3052,11 +3301,11 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 468.0
+                    "Integer": 471.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 636.0
+                    "Integer": 705.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -3135,11 +3384,11 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 468.0
+                    "Integer": 471.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 1206.0
+                    "Integer": 1326.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -3218,11 +3467,11 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 465.0
+                    "Integer": 468.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 906.0
+                    "Integer": 1026.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -3305,7 +3554,7 @@
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 126.0
+                    "Integer": 156.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -3363,11 +3612,11 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 210.0
+                    "Integer": 213.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 666.0
+                    "Integer": 735.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -3425,11 +3674,11 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 288.0
+                    "Integer": 291.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 576.0
+                    "Integer": 645.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -3487,11 +3736,11 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 288.0
+                    "Integer": 291.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 546.0
+                    "Integer": 615.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -3549,11 +3798,11 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 288.0
+                    "Integer": 291.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 516.0
+                    "Integer": 585.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -3611,11 +3860,11 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 288.0
+                    "Integer": 291.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 486.0
+                    "Integer": 555.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -3673,11 +3922,11 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 288.0
+                    "Integer": 291.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 636.0
+                    "Integer": 705.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -3735,11 +3984,11 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 288.0
+                    "Integer": 291.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 606.0
+                    "Integer": 675.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -3797,11 +4046,11 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 24.0
+                    "Integer": 27.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 1359.0
+                    "Integer": 1479.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -3859,11 +4108,11 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 309.0
+                    "Integer": 312.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 1296.0
+                    "Integer": 1416.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -3921,11 +4170,11 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 306.0
+                    "Integer": 309.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 1002.0
+                    "Integer": 1119.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -3983,11 +4232,11 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 21.0
+                    "Integer": 24.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 1116.0
+                    "Integer": 1233.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -4045,11 +4294,11 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 21.0
+                    "Integer": 24.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 1089.0
+                    "Integer": 1206.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -4111,7 +4360,7 @@
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 846.0
+                    "Integer": 945.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -4173,7 +4422,7 @@
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 816.0
+                    "Integer": 915.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -4231,11 +4480,11 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 24.0
+                    "Integer": 27.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 1329.0
+                    "Integer": 1449.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -4293,11 +4542,11 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 21.0
+                    "Integer": 24.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 1059.0
+                    "Integer": 1176.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -4355,11 +4604,11 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 204.0
+                    "Integer": 207.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 1032.0
+                    "Integer": 1149.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -4417,11 +4666,11 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 75.0
+                    "Integer": 78.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 1266.0
+                    "Integer": 1386.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -4479,11 +4728,11 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 72.0
+                    "Integer": 75.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 969.0
+                    "Integer": 1089.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -4545,7 +4794,7 @@
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 786.0
+                    "Integer": 885.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -4603,11 +4852,11 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 183.0
+                    "Integer": 186.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 1236.0
+                    "Integer": 1356.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -4669,7 +4918,7 @@
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 756.0
+                    "Integer": 855.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -4727,11 +4976,11 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 180.0
+                    "Integer": 183.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 936.0
+                    "Integer": 1056.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -4789,11 +5038,11 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 315.0
+                    "Integer": 318.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 1206.0
+                    "Integer": 1326.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -4851,11 +5100,11 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 312.0
+                    "Integer": 315.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 906.0
+                    "Integer": 1026.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -4917,7 +5166,7 @@
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 726.0
+                    "Integer": 825.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -4975,11 +5224,11 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 189.0
+                    "Integer": 186.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 366.0
+                    "Integer": 435.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -5037,11 +5286,11 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 186.0
+                    "Integer": 183.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 396.0
+                    "Integer": 465.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -5099,11 +5348,11 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 192.0
+                    "Integer": 189.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 336.0
+                    "Integer": 405.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -5161,11 +5410,11 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 318.0
+                    "Integer": 315.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 276.0
+                    "Integer": 345.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -5223,11 +5472,11 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 141.0
+                    "Integer": 138.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 246.0
+                    "Integer": 282.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -5289,7 +5538,7 @@
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 216.0
+                    "Integer": 246.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -5351,7 +5600,7 @@
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 186.0
+                    "Integer": 216.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -5413,7 +5662,7 @@
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 96.0
+                    "Integer": 126.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -5475,7 +5724,7 @@
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 156.0
+                    "Integer": 186.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -5533,11 +5782,11 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 213.0
+                    "Integer": 210.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 306.0
+                    "Integer": 375.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -5580,30 +5829,341 @@
                     "Type": 2.0,
                     "Boolean": 1.0
                 },
-                "AlignTop": {
-                    "Type": 2.0,
-                    "Boolean": 0.0
+                "AlignTop": {
+                    "Type": 2.0,
+                    "Boolean": 0.0
+                }
+            }
+        },
+        "Label": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "object45"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 24.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 1506.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 318.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 24.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Caption": {
+                    "Type": 5.0,
+                    "String": "Other electrical infrastructure costs"
+                },
+                "TextColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 0.0,
+                        "Green": 0.0,
+                        "Blue": 0.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "Bold": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "FontSize": {
+                    "Type": 3.0,
+                    "Integer": 0.0
+                },
+                "WordWrap": {
+                    "Type": 2.0,
+                    "Boolean": 0.0
+                },
+                "AlignRight": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "AlignTop": {
+                    "Type": 2.0,
+                    "Boolean": 0.0
+                }
+            }
+        },
+        "Numeric": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "offshore_substation_cost"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 339.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 765.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 100.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 24.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Value": {
+                    "Type": 1.0,
+                    "Double": 0.0
+                },
+                "Mode": {
+                    "Type": 3.0,
+                    "Integer": 1.0
+                },
+                "Format": {
+                    "Type": 3.0,
+                    "Integer": 0.0
+                },
+                "Decimals": {
+                    "Type": 3.0,
+                    "Integer": 0.0
+                },
+                "Prefix": {
+                    "Type": 5.0,
+                    "String": "$"
+                },
+                "Suffix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "ThousandsSep": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "Editable": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "ForeColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 0.0,
+                        "Green": 0.0,
+                        "Blue": 0.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "BackColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 255.0,
+                        "Green": 255.0,
+                        "Blue": 255.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "TabOrder": {
+                    "Type": 3.0,
+                    "Integer": 21.0
+                }
+            }
+        },
+        "Numeric": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "offshore_substation_cost_modeled"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 339.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 765.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 100.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 24.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Value": {
+                    "Type": 1.0,
+                    "Double": 0.0
+                },
+                "Mode": {
+                    "Type": 3.0,
+                    "Integer": 1.0
+                },
+                "Format": {
+                    "Type": 3.0,
+                    "Integer": 0.0
+                },
+                "Decimals": {
+                    "Type": 3.0,
+                    "Integer": 0.0
+                },
+                "Prefix": {
+                    "Type": 5.0,
+                    "String": "$"
+                },
+                "Suffix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "ThousandsSep": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "Editable": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "ForeColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 0.0,
+                        "Green": 0.0,
+                        "Blue": 0.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "BackColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 255.0,
+                        "Green": 255.0,
+                        "Blue": 255.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "TabOrder": {
+                    "Type": 3.0,
+                    "Integer": 21.0
+                }
+            }
+        },
+        "Numeric": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "offshore_substation_cost_rvalue"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 468.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 795.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 100.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 24.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Value": {
+                    "Type": 1.0,
+                    "Double": 0.0
+                },
+                "Mode": {
+                    "Type": 3.0,
+                    "Integer": 1.0
+                },
+                "Format": {
+                    "Type": 3.0,
+                    "Integer": 0.0
+                },
+                "Decimals": {
+                    "Type": 3.0,
+                    "Integer": 3.0
+                },
+                "Prefix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Suffix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "ThousandsSep": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "Editable": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "ForeColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 0.0,
+                        "Green": 0.0,
+                        "Blue": 0.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "BackColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 255.0,
+                        "Green": 255.0,
+                        "Blue": 255.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "TabOrder": {
+                    "Type": 3.0,
+                    "Integer": -1.0
                 }
             }
         },
-        "Label": {
+        "Numeric": {
             "Visible": 1.0,
             "ObjectProperties": {
                 "Name": {
                     "Type": 5.0,
-                    "String": "object45"
+                    "String": "offshore_substation_cost_total"
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 21.0
+                    "Integer": 339.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 1386.0
+                    "Integer": 765.0
                 },
                 "Width": {
                     "Type": 3.0,
-                    "Integer": 318.0
+                    "Integer": 100.0
                 },
                 "Height": {
                     "Type": 3.0,
@@ -5613,11 +6173,39 @@
                     "Type": 5.0,
                     "String": ""
                 },
-                "Caption": {
+                "Value": {
+                    "Type": 1.0,
+                    "Double": 0.0
+                },
+                "Mode": {
+                    "Type": 3.0,
+                    "Integer": 1.0
+                },
+                "Format": {
+                    "Type": 3.0,
+                    "Integer": 0.0
+                },
+                "Decimals": {
+                    "Type": 3.0,
+                    "Integer": 0.0
+                },
+                "Prefix": {
                     "Type": 5.0,
-                    "String": "Other electrical infrastructure costs"
+                    "String": "$"
                 },
-                "TextColour": {
+                "Suffix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "ThousandsSep": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "Editable": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "ForeColour": {
                     "Type": 4.0,
                     "Color": {
                         "Red": 0.0,
@@ -5626,25 +6214,18 @@
                         "Alpha": 255.0
                     }
                 },
-                "Bold": {
-                    "Type": 2.0,
-                    "Boolean": 1.0
+                "BackColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 255.0,
+                        "Green": 255.0,
+                        "Blue": 255.0,
+                        "Alpha": 255.0
+                    }
                 },
-                "FontSize": {
+                "TabOrder": {
                     "Type": 3.0,
-                    "Integer": 0.0
-                },
-                "WordWrap": {
-                    "Type": 2.0,
-                    "Boolean": 0.0
-                },
-                "AlignRight": {
-                    "Type": 2.0,
-                    "Boolean": 1.0
-                },
-                "AlignTop": {
-                    "Type": 2.0,
-                    "Boolean": 0.0
+                    "Integer": -1.0
                 }
             }
         },
@@ -5653,15 +6234,15 @@
             "ObjectProperties": {
                 "Name": {
                     "Type": 5.0,
-                    "String": "offshore_substation_cost"
+                    "String": "onshore_substation_cost"
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 339.0
+                    "Integer": 345.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 696.0
+                    "Integer": 972.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -5727,7 +6308,7 @@
                 },
                 "TabOrder": {
                     "Type": 3.0,
-                    "Integer": 21.0
+                    "Integer": -1.0
                 }
             }
         },
@@ -5736,15 +6317,15 @@
             "ObjectProperties": {
                 "Name": {
                     "Type": 5.0,
-                    "String": "offshore_substation_cost_modeled"
+                    "String": "onshore_substation_cost_modeled"
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 339.0
+                    "Integer": 345.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 696.0
+                    "Integer": 972.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -5810,7 +6391,7 @@
                 },
                 "TabOrder": {
                     "Type": 3.0,
-                    "Integer": 21.0
+                    "Integer": -1.0
                 }
             }
         },
@@ -5819,15 +6400,15 @@
             "ObjectProperties": {
                 "Name": {
                     "Type": 5.0,
-                    "String": "offshore_substation_cost_total"
+                    "String": "onshore_substation_cost_rvalue"
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 339.0
+                    "Integer": 468.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 696.0
+                    "Integer": 999.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -5855,11 +6436,11 @@
                 },
                 "Decimals": {
                     "Type": 3.0,
-                    "Integer": 0.0
+                    "Integer": 3.0
                 },
                 "Prefix": {
                     "Type": 5.0,
-                    "String": "$"
+                    "String": ""
                 },
                 "Suffix": {
                     "Type": 5.0,
@@ -5902,15 +6483,15 @@
             "ObjectProperties": {
                 "Name": {
                     "Type": 5.0,
-                    "String": "onshore_substation_cost"
+                    "String": "onshore_substation_cost_total"
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 339.0
+                    "Integer": 345.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 876.0
+                    "Integer": 972.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -5985,15 +6566,15 @@
             "ObjectProperties": {
                 "Name": {
                     "Type": 5.0,
-                    "String": "onshore_substation_cost_modeled"
+                    "String": "onshore_transmission_infrastructure_cost"
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 339.0
+                    "Integer": 342.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 876.0
+                    "Integer": 1263.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -6059,7 +6640,7 @@
                 },
                 "TabOrder": {
                     "Type": 3.0,
-                    "Integer": -1.0
+                    "Integer": 27.0
                 }
             }
         },
@@ -6068,15 +6649,15 @@
             "ObjectProperties": {
                 "Name": {
                     "Type": 5.0,
-                    "String": "onshore_substation_cost_total"
+                    "String": "onshore_transmission_infrastructure_cost_rvalue"
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 339.0
+                    "Integer": 471.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 876.0
+                    "Integer": 1293.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -6104,11 +6685,11 @@
                 },
                 "Decimals": {
                     "Type": 3.0,
-                    "Integer": 0.0
+                    "Integer": 3.0
                 },
                 "Prefix": {
                     "Type": 5.0,
-                    "String": "$"
+                    "String": ""
                 },
                 "Suffix": {
                     "Type": 5.0,
@@ -6151,15 +6732,15 @@
             "ObjectProperties": {
                 "Name": {
                     "Type": 5.0,
-                    "String": "onshore_transmission_infrastructure_cost"
+                    "String": "onshore_transmission_infrastructure_cost_total"
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 339.0
+                    "Integer": 342.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 1143.0
+                    "Integer": 1263.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -6234,15 +6815,15 @@
             "ObjectProperties": {
                 "Name": {
                     "Type": 5.0,
-                    "String": "onshore_transmission_infrastructure_cost_total"
+                    "String": "onshore_transmission_infrastructure_cost_total89"
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 339.0
+                    "Integer": 342.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 1143.0
+                    "Integer": 1263.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -6308,7 +6889,7 @@
                 },
                 "TabOrder": {
                     "Type": 3.0,
-                    "Integer": 27.0
+                    "Integer": -1.0
                 }
             }
         },
@@ -6317,15 +6898,15 @@
             "ObjectProperties": {
                 "Name": {
                     "Type": 5.0,
-                    "String": "onshore_transmission_infrastructure_cost_total89"
+                    "String": "onshore_transmission_infrastructure_transportation_cost"
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 339.0
+                    "Integer": 471.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 1143.0
+                    "Integer": 1449.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -6391,7 +6972,7 @@
                 },
                 "TabOrder": {
                     "Type": 3.0,
-                    "Integer": -1.0
+                    "Integer": 33.0
                 }
             }
         },
@@ -6400,7 +6981,7 @@
             "ObjectProperties": {
                 "Name": {
                     "Type": 5.0,
-                    "String": "onshore_transmission_infrastructure_transportation_cost"
+                    "String": "other_array_cable_system_cost"
                 },
                 "X": {
                     "Type": 3.0,
@@ -6408,7 +6989,7 @@
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 1329.0
+                    "Integer": 246.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -6474,7 +7055,7 @@
                 },
                 "TabOrder": {
                     "Type": 3.0,
-                    "Integer": 33.0
+                    "Integer": 6.0
                 }
             }
         },
@@ -6483,15 +7064,15 @@
             "ObjectProperties": {
                 "Name": {
                     "Type": 5.0,
-                    "String": "other_array_cable_system_cost"
+                    "String": "other_cable_protection_cost"
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 468.0
+                    "Integer": 471.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 216.0
+                    "Integer": 735.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -6557,7 +7138,7 @@
                 },
                 "TabOrder": {
                     "Type": 3.0,
-                    "Integer": 6.0
+                    "Integer": 20.0
                 }
             }
         },
@@ -6566,15 +7147,15 @@
             "ObjectProperties": {
                 "Name": {
                     "Type": 5.0,
-                    "String": "other_cable_protection_cost"
+                    "String": "other_elec_infra_cost"
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 468.0
+                    "Integer": 342.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 666.0
+                    "Integer": 1506.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -6640,7 +7221,7 @@
                 },
                 "TabOrder": {
                     "Type": 3.0,
-                    "Integer": 20.0
+                    "Integer": 35.0
                 }
             }
         },
@@ -6649,15 +7230,15 @@
             "ObjectProperties": {
                 "Name": {
                     "Type": 5.0,
-                    "String": "other_elec_infra_cost"
+                    "String": "other_elec_infra_cost_modeled"
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 339.0
+                    "Integer": 342.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 1386.0
+                    "Integer": 1506.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -6732,15 +7313,15 @@
             "ObjectProperties": {
                 "Name": {
                     "Type": 5.0,
-                    "String": "other_elec_infra_cost_modeled"
+                    "String": "other_elec_infra_cost_rvalue"
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 339.0
+                    "Integer": 471.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 1386.0
+                    "Integer": 1533.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -6768,11 +7349,11 @@
                 },
                 "Decimals": {
                     "Type": 3.0,
-                    "Integer": 0.0
+                    "Integer": 3.0
                 },
                 "Prefix": {
                     "Type": 5.0,
-                    "String": "$"
+                    "String": ""
                 },
                 "Suffix": {
                     "Type": 5.0,
@@ -6806,7 +7387,7 @@
                 },
                 "TabOrder": {
                     "Type": 3.0,
-                    "Integer": 35.0
+                    "Integer": -1.0
                 }
             }
         },
@@ -6819,11 +7400,11 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 468.0
+                    "Integer": 465.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 396.0
+                    "Integer": 465.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -6906,7 +7487,7 @@
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 846.0
+                    "Integer": 945.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -6985,11 +7566,11 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 465.0
+                    "Integer": 468.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 1116.0
+                    "Integer": 1233.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -7068,11 +7649,11 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 468.0
+                    "Integer": 471.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 1359.0
+                    "Integer": 1479.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -7151,11 +7732,11 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 468.0
+                    "Integer": 471.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 1296.0
+                    "Integer": 1416.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -7234,11 +7815,11 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 465.0
+                    "Integer": 468.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 1032.0
+                    "Integer": 1149.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -7317,11 +7898,11 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 468.0
+                    "Integer": 471.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 486.0
+                    "Integer": 555.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -7400,11 +7981,11 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 468.0
+                    "Integer": 471.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 1236.0
+                    "Integer": 1356.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -7487,7 +8068,7 @@
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 756.0
+                    "Integer": 855.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -7570,7 +8151,7 @@
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 726.0
+                    "Integer": 825.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -7649,11 +8230,11 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 468.0
+                    "Integer": 471.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 1266.0
+                    "Integer": 1386.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -7769,11 +8350,11 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 447.0
+                    "Integer": 450.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 426.0
+                    "Integer": 495.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -7806,11 +8387,11 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 447.0
+                    "Integer": 444.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 246.0
+                    "Integer": 282.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -7847,7 +8428,7 @@
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 696.0
+                    "Integer": 765.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -7880,11 +8461,11 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 447.0
+                    "Integer": 453.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 876.0
+                    "Integer": 972.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -7917,11 +8498,11 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 447.0
+                    "Integer": 450.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 1143.0
+                    "Integer": 1263.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -7954,11 +8535,11 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 447.0
+                    "Integer": 450.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 1386.0
+                    "Integer": 1506.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -7991,11 +8572,11 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 465.0
+                    "Integer": 468.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 936.0
+                    "Integer": 1056.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -8106,6 +8687,19 @@
             "sscVariableName": "",
             "sscVariableValue": ""
         },
+        "array_cable_system_cost_rvalue": {
+            "Version": 4.0,
+            "Type": 1.0,
+            "Label": "Array cable system array scaling R-value",
+            "Units": "",
+            "Group": "ME Costs - Electrical Infrastructure",
+            "IndexLabels": "",
+            "Flags": 0.0,
+            "DefaultValue": 0.0,
+            "UIObject": "Default",
+            "sscVariableName": "",
+            "sscVariableValue": ""
+        },
         "array_cable_system_cost_total": {
             "Version": 4.0,
             "Type": 1.0,
@@ -8236,6 +8830,19 @@
             "sscVariableName": "",
             "sscVariableValue": ""
         },
+        "cable_protection_cost_rvalue": {
+            "Version": 4.0,
+            "Type": 1.0,
+            "Label": "Cable protection array scaling R-value",
+            "Units": "",
+            "Group": "ME Costs - Electrical Infrastructure",
+            "IndexLabels": "",
+            "Flags": 2.0,
+            "DefaultValue": 0.0,
+            "UIObject": "Default",
+            "sscVariableName": "",
+            "sscVariableValue": ""
+        },
         "cable_protection_cost_total": {
             "Version": 4.0,
             "Type": 1.0,
@@ -8349,7 +8956,7 @@
             "IndexLabels": "",
             "Flags": 3.0,
             "DefaultValue": 0.0,
-            "UIObject": "Default",
+            "UIObject": "Choice",
             "sscVariableName": "",
             "sscVariableValue": ""
         },
@@ -8574,6 +9181,19 @@
             "sscVariableName": "",
             "sscVariableValue": ""
         },
+        "export_cable_system_cost_rvalue": {
+            "Version": 4.0,
+            "Type": 1.0,
+            "Label": "Export cable system array scaling R-value",
+            "Units": "",
+            "Group": "ME Costs - Electrical Infrastructure",
+            "IndexLabels": "",
+            "Flags": 2.0,
+            "DefaultValue": 0.0,
+            "UIObject": "Default",
+            "sscVariableName": "",
+            "sscVariableValue": ""
+        },
         "export_cable_system_cost_total": {
             "Version": 4.0,
             "Type": 1.0,
@@ -8717,6 +9337,19 @@
             "sscVariableName": "",
             "sscVariableValue": ""
         },
+        "offshore_substation_cost_rvalue": {
+            "Version": 4.0,
+            "Type": 1.0,
+            "Label": "Offshore substation array scaling R-value",
+            "Units": "",
+            "Group": "ME Costs - Electrical Infrastructure",
+            "IndexLabels": "",
+            "Flags": 2.0,
+            "DefaultValue": 0.0,
+            "UIObject": "Default",
+            "sscVariableName": "",
+            "sscVariableValue": ""
+        },
         "offshore_substation_cost_total": {
             "Version": 4.0,
             "Type": 1.0,
@@ -8769,6 +9402,19 @@
             "sscVariableName": "",
             "sscVariableValue": ""
         },
+        "onshore_substation_cost_rvalue": {
+            "Version": 4.0,
+            "Type": 1.0,
+            "Label": "Onshore substation array scaling R-value",
+            "Units": "",
+            "Group": "ME Costs - Electrical Infrastructure",
+            "IndexLabels": "",
+            "Flags": 2.0,
+            "DefaultValue": 0.0,
+            "UIObject": "Default",
+            "sscVariableName": "",
+            "sscVariableValue": ""
+        },
         "onshore_substation_cost_total": {
             "Version": 4.0,
             "Type": 1.0,
@@ -8821,6 +9467,19 @@
             "sscVariableName": "",
             "sscVariableValue": ""
         },
+        "onshore_transmission_infrastructure_cost_rvalue": {
+            "Version": 4.0,
+            "Type": 1.0,
+            "Label": "Onshore transmission infrastructure array scaling R-value",
+            "Units": "",
+            "Group": "ME Costs - Electrical Infrastructure",
+            "IndexLabels": "",
+            "Flags": 2.0,
+            "DefaultValue": 0.0,
+            "UIObject": "Default",
+            "sscVariableName": "",
+            "sscVariableValue": ""
+        },
         "onshore_transmission_infrastructure_cost_total": {
             "Version": 4.0,
             "Type": 1.0,
@@ -8899,6 +9558,19 @@
             "sscVariableName": "",
             "sscVariableValue": ""
         },
+        "other_elec_infra_cost_rvalue": {
+            "Version": 4.0,
+            "Type": 1.0,
+            "Label": "Other electrical infrastructure array scaling R-value",
+            "Units": "",
+            "Group": "ME Costs - Electrical Infrastructure",
+            "IndexLabels": "",
+            "Flags": 2.0,
+            "DefaultValue": 0.0,
+            "UIObject": "Default",
+            "sscVariableName": "",
+            "sscVariableValue": ""
+        },
         "other_elec_infra_cost_total": {
             "Version": 4.0,
             "Type": 1.0,
@@ -9104,9 +9776,14 @@
         "\t{",
         "\t\treturn ${array_cable_system_cost};",
         "\t}",
-        "\telse",
+        "\telse if (${detailed_cost_modeled_array_cables}==1)",
         "\t{",
         "\t\treturn ${array_cable_system_cost_total};",
+        "\t}\r",
+        "\telse {\r",
+        "\t\tb = -log(1-${array_cable_system_cost_rvalue})/log(2);\r",
+        "\t\treturn (${array_cable_system_cost}*pow(${number_devices},-b))*${number_devices};\r",
+        "\r",
         "\t}",
         "};",
         "",
@@ -9127,9 +9804,14 @@
         "\t{",
         "\t\treturn ${export_cable_system_cost};",
         "\t}",
-        "\telse",
+        "\telse if (${detailed_cost_modeled_export_cables}==1)",
         "\t{",
         "\t\treturn ${export_cable_system_cost_total};",
+        "\t}\r",
+        "\telse {\r",
+        "\t\tb = -log(1-${export_cable_system_cost_rvalue})/log(2);\r",
+        "\t\treturn (${export_cable_system_cost}*pow(${number_devices},-b))*${number_devices};\r",
+        "\r",
         "\t}",
         "\t",
         "};",
@@ -9145,9 +9827,14 @@
         "\t{",
         "\t\treturn ${cable_protection_cost};",
         "\t}",
-        "\telse",
+        "\telse if (${detailed_cost_choice_cable_protection}==1)",
         "\t{",
         "\t\treturn ${cable_protection_cost_total};",
+        "\t}\r",
+        "\telse {\r",
+        "\t\tb = -log(1-${cable_protection_cost_rvalue})/log(2);\r",
+        "\t\treturn (${cable_protection_cost}*pow(${number_devices},-b))*${number_devices};\r",
+        "\r",
         "\t}",
         "};",
         "",
@@ -9166,9 +9853,13 @@
         "\t{",
         "\t\treturn ${offshore_substation_cost};",
         "\t}",
-        "\telse",
+        "\telse if (${detailed_cost_modeled_offshore_substation}==1)",
         "\t{",
         "\t\treturn ${offshore_substation_cost_total};",
+        "\t}\r",
+        "\telse {\r",
+        "\t\tb = -log(1-${offshore_substation_cost_rvalue})/log(2);\r",
+        "\t\treturn (${offshore_substation_cost}*pow(${number_devices},-b))*${number_devices};\r",
         "\t}",
         "};",
         "",
@@ -9197,10 +9888,16 @@
         "\t{",
         "\t\treturn ${onshore_substation_cost_total};",
         "\t}",
-        "\telse ",
+        "\telse if (${detailed_cost_modeled_onshore_substation} == 2) ",
         "\t{",
         "\t\treturn ${onshore_substation_cost_modeled};",
-        "\t}",
+        "\t}\r",
+        "\telse {\r",
+        "\t\tb = -log(1-${onshore_substation_cost_rvalue})/log(2);\r",
+        "\t\treturn (${onshore_substation_cost}*pow(${number_devices},-b))*${number_devices};\r",
+        "\r",
+        "\t}\r",
+        "\t",
         "};",
         "",
         "equations {'onshore_transmission_infrastructure_cost_total'} = define() {",
@@ -9215,9 +9912,14 @@
         "\t{",
         "\t\treturn ${onshore_transmission_infrastructure_cost};",
         "\t}",
-        "\telse",
+        "\telse if (${detailed_cost_choice_onshore_transmission_infrastructure}==1)",
         "\t{",
         "\t\treturn ${onshore_transmission_infrastructure_cost_total};",
+        "\t}\r",
+        "\telse {\r",
+        "\t\tb = -log(1-${onshore_transmission_infrastructure_cost_rvalue})/log(2);\r",
+        "\t\treturn (${onshore_transmission_infrastructure_cost}*pow(${number_devices},-b))*${number_devices};\r",
+        "\r",
         "\t}",
         "};",
         "",
@@ -9236,12 +9938,14 @@
         "};",
         "",
         "equations {'elec_infras_cost'} = define() {",
+        "\tarray_scaling_b_value = -log(1 - ${elec_infras_cost_rvalue}) / log(2);\r",
         "\treturn ?${elec_infras_cost_method}",
         "\t\t\t[",
         "\t\t\t\t${elec_infras_cost_input}*${system_capacity},",
         "\t\t\t\t${elec_infras_cost_input},",
         "\t\t\t\t${elec_infras_cost_modeled},",
-        "\t\t\t\t${elec_infras_cost_total}",
+        "\t\t\t\t${elec_infras_cost_total},\r",
+        "\t\t\t\t(${elec_infras_cost_input}*pow(${number_devices},-array_scaling_b_value))*${number_devices}",
         "\t\t\t];",
         "};",
         "",
@@ -9253,7 +9957,8 @@
         "\t\t\t\t\t0,",
         "\t\t\t\t\t0,",
         "\t\t\t\t\t2,",
-        "\t\t\t\t\t1",
+        "\t\t\t\t\t1,\r",
+        "\t\t\t\t\t3",
         "\t\t\t\t];",
         "\t}",
         "\telse",
@@ -9276,22 +9981,22 @@
         "\t//on_change{'level_eng'};",
         "\tenable_itemized_elec_infras();",
         "\t//enable_itemized_level();",
-        "\ton_change{'detailed_cost_choice_cable_protection'};",
-        "\ton_change{'detailed_cost_choice_onshore_transmission_infrastructure'};",
+        "\ton_change{'detailed_cost_choice_cable_protection'}();",
+        "\ton_change{'detailed_cost_choice_onshore_transmission_infrastructure'}();",
         "\tdetailed_cost_array_cables();",
-        "\ton_change{'detailed_cost_modeled_array_cables'};",
+        "\ton_change{'detailed_cost_modeled_array_cables'}();",
         "\tdetailed_cost_export_cables();",
-        "\ton_change{'detailed_cost_modeled_export_cables'};",
+        "\ton_change{'detailed_cost_modeled_export_cables'}();",
         "\tdetailed_cost_cable_protection();",
         "\tdetailed_cost_offshore_substation();",
-        "\ton_change{'detailed_cost_modeled_offshore_substation'};",
+        "\ton_change{'detailed_cost_modeled_offshore_substation'}();",
         "\tdetailed_cost_onshore_substation();",
-        "\ton_change{'detailed_cost_modeled_onshore_substation'};",
+        "\ton_change{'detailed_cost_modeled_onshore_substation'}();",
         "\tdetailed_cost_onshore_transmission_infrastructure();",
-        "\ton_change{'detailed_cost_modeled_other_elec_infras'};",
+        "\ton_change{'detailed_cost_modeled_other_elec_infras'}();",
         "\tdetailed_cost_other_elec_infras();",
         "\tcheck_override_elec_infras();",
-        "\ton_change{'elec_infras_override'};",
+        "\ton_change{'elec_infras_override'}();",
         "};",
         "",
         "on_change{'elec_infras_override'} = define() {",
@@ -9318,8 +10023,8 @@
         "\tif (value('itemized_check_elec_infras')==1)",
         "\t{",
         "\t\tdetailed_value = value('detailed_cost_modeled_array_cables');",
-        "\t\tenable('array_cable_system_cost',detailed_value==0);",
-        "\t\tshow('array_cable_system_cost',detailed_value==0);",
+        "\t\tenable('array_cable_system_cost',detailed_value==0 || detailed_value==3);",
+        "\t\tshow('array_cable_system_cost',detailed_value==0 || detailed_value==3);",
         "\t\tenable('array_cable_system_cost_total',detailed_value==1);",
         "\t\tshow('array_cable_system_cost_total',detailed_value==1);",
         "\t\tenable('array_cable_system_cost_modeled',detailed_value==2);",
@@ -9328,7 +10033,8 @@
         "\t\tenable('array_cable_accessories_and_jointing_cost',detailed_value==1);",
         "\t\tenable('array_cable_system_commissioning_cost',detailed_value==1);",
         "\t\tenable('array_cable_system_transportation_cost',detailed_value==1);",
-        "\t\tenable('other_array_cable_system_cost',detailed_value==1);",
+        "\t\tenable('other_array_cable_system_cost',detailed_value==1);\r",
+        "\t\tenable('array_cable_system_cost_rvalue',detailed_value==3);",
         "\t\t",
         "\t\trefresh();",
         "\t}",
@@ -9344,8 +10050,8 @@
         "\tif (value('itemized_check_elec_infras')==1)",
         "\t{",
         "\t\tdetailed_value = value('detailed_cost_modeled_export_cables');",
-        "\t\tenable('export_cable_system_cost',detailed_value==0);",
-        "\t\tshow('export_cable_system_cost',detailed_value==0);",
+        "\t\tenable('export_cable_system_cost',detailed_value==0 || detailed_value==3);",
+        "\t\tshow('export_cable_system_cost',detailed_value==0 || detailed_value==3);",
         "\t\tenable('export_cable_system_cost_total',detailed_value==1);",
         "\t\tshow('export_cable_system_cost_total',detailed_value==1);",
         "\t\tenable('export_cable_system_cost_modeled',detailed_value==2);",
@@ -9354,7 +10060,8 @@
         "\t\tenable('export_cable_accessories_and_jointing_cost',detailed_value==1);",
         "\t\tenable('export_cable_commissioning_cost',detailed_value==1);",
         "\t\tenable('export_cable_system_transportation_cost',detailed_value==1);",
-        "\t\tenable('other_export_cable_system_cost',detailed_value==1);",
+        "\t\tenable('other_export_cable_system_cost',detailed_value==1);\r",
+        "\t\tenable('export_cable_system_cost_rvalue',detailed_value==3);",
         "\t\t",
         "\t\trefresh();",
         "\t}",
@@ -9369,17 +10076,18 @@
         "\tif (value('itemized_check_elec_infras')==1)",
         "\t{",
         "\t\tdetailed_value = value('detailed_cost_choice_cable_protection');",
-        "\t\tenable('cable_protection_cost',detailed_value==0);",
-        "\t\tshow('cable_protection_cost',detailed_value==0);",
-        "\t\tenable('cable_protection_cost_total',detailed_value);",
-        "\t\tshow('cable_protection_cost_total',detailed_value);",
-        "\t\tenable('scour_protection_elec_infras_cost',detailed_value);",
-        "\t\tenable('cable_mattresses_cost',detailed_value);",
-        "\t\tenable('ducting_system_cost',detailed_value);",
-        "\t\tenable('bend_restrictors_cost',detailed_value);",
-        "\t\tenable('bend_stiffeners_cost',detailed_value);",
-        "\t\tenable('jtube_seals_cost',detailed_value);",
-        "\t\tenable('other_cable_protection_cost',detailed_value);",
+        "\t\tenable('cable_protection_cost',detailed_value!=1);",
+        "\t\tshow('cable_protection_cost',detailed_value!=1);",
+        "\t\tenable('cable_protection_cost_total',detailed_value==1);",
+        "\t\tshow('cable_protection_cost_total',detailed_value==1);",
+        "\t\tenable('scour_protection_elec_infras_cost',detailed_value==1);",
+        "\t\tenable('cable_mattresses_cost',detailed_value==1);",
+        "\t\tenable('ducting_system_cost',detailed_value==1);",
+        "\t\tenable('bend_restrictors_cost',detailed_value==1);",
+        "\t\tenable('bend_stiffeners_cost',detailed_value==1);",
+        "\t\tenable('jtube_seals_cost',detailed_value==1);",
+        "\t\tenable('other_cable_protection_cost',detailed_value==1);\r",
+        "\t\tenable('cable_protection_cost_rvalue',detailed_value==2);",
         "\t\t",
         "\t\trefresh();",
         "\t}",
@@ -9395,8 +10103,8 @@
         "\tif (value('itemized_check_elec_infras')==1)",
         "\t{",
         "\t\tdetailed_value = value('detailed_cost_modeled_offshore_substation');",
-        "\t\tenable('offshore_substation_cost',detailed_value==0);",
-        "\t\tshow('offshore_substation_cost',detailed_value==0);",
+        "\t\tenable('offshore_substation_cost',detailed_value==0 || detailed_value==3);",
+        "\t\tshow('offshore_substation_cost',detailed_value==0 || detailed_value==3);",
         "\t\tenable('offshore_substation_cost_total',detailed_value==1);",
         "\t\tshow('offshore_substation_cost_total',detailed_value==1);",
         "\t\tenable('offshore_substation_cost_modeled',detailed_value==2);",
@@ -9405,7 +10113,8 @@
         "\t\tenable('substructure_and_foundation_cost',detailed_value==1);",
         "\t\tenable('electrical_conversion_equipment_cost',detailed_value==1);",
         "\t\tenable('facilities_and_ancillary_systems_cost',detailed_value==1);",
-        "\t\tenable('other_offshore_substation_cost',detailed_value==1);",
+        "\t\tenable('other_offshore_substation_cost',detailed_value==1);\r",
+        "\t\tenable('offshore_substation_cost_rvalue',detailed_value==3);",
         "\t\trefresh();",
         "\t}",
         "}",
@@ -9421,8 +10130,8 @@
         "\t{",
         "\t\t//detailed_value = value('detailed_cost_choice_onshore_substation');",
         "\t\tdetailed_value = value('detailed_cost_modeled_onshore_substation');",
-        "\t\tenable('onshore_substation_cost',detailed_value==0);",
-        "\t\tshow('onshore_substation_cost',detailed_value==0);",
+        "\t\tenable('onshore_substation_cost',detailed_value==0 || detailed_value==3);",
+        "\t\tshow('onshore_substation_cost',detailed_value==0 || detailed_value==3);",
         "\t\tenable('onshore_substation_cost_total',detailed_value==1);",
         "\t\tshow('onshore_substation_cost_total',detailed_value==1);",
         "\t\tshow('onshore_substation_cost_modeled',detailed_value==2);",
@@ -9434,7 +10143,8 @@
         "\t\tenable('protection_control_cost',detailed_value==1);",
         "\t\tenable('building_facilities_cost',detailed_value==1);",
         "\t\tenable('civil_infrastructure_cost',detailed_value==1);",
-        "\t\tenable('other_onshore_substation_cost',detailed_value==1);",
+        "\t\tenable('other_onshore_substation_cost',detailed_value==1);\r",
+        "\t\tenable('onshore_substation_cost_rvalue',detailed_value==3);",
         "\t\t",
         "\t\trefresh();",
         "\t}",
@@ -9449,17 +10159,17 @@
         "\tif (value('itemized_check_elec_infras')==1)",
         "\t{",
         "\t\tdetailed_value = value('detailed_cost_choice_onshore_transmission_infrastructure');",
-        "\t\tenable('onshore_transmission_infrastructure_cost',detailed_value==0);",
-        "\t\tshow('onshore_transmission_infrastructure_cost',detailed_value==0);",
-        "\t\tenable('onshore_transmission_infrastructure_cost_total',detailed_value);",
-        "\t\tshow('onshore_transmission_infrastructure_cost_total',detailed_value);",
-        "\t\tenable('land_leases_cost',detailed_value);",
-        "\t\tenable('structure_foundations_cost',detailed_value);",
-        "\t\tenable('transmission_towers_cost',detailed_value);",
-        "\t\tenable('overhead_lines_cost',detailed_value);",
-        "\t\tenable('onshore_transmission_infrastructure_transportation_cost',detailed_value);",
-        "\t\tenable('other_onshore_transmission_infrastructure_cost',detailed_value);",
-        "\t\t",
+        "\t\tenable('onshore_transmission_infrastructure_cost',detailed_value!=1);",
+        "\t\tshow('onshore_transmission_infrastructure_cost',detailed_value!=1);",
+        "\t\tenable('onshore_transmission_infrastructure_cost_total',detailed_value==1);",
+        "\t\tshow('onshore_transmission_infrastructure_cost_total',detailed_value==1);",
+        "\t\tenable('land_leases_cost',detailed_value==1);",
+        "\t\tenable('structure_foundations_cost',detailed_value==1);",
+        "\t\tenable('transmission_towers_cost',detailed_value==1);",
+        "\t\tenable('overhead_lines_cost',detailed_value==1);",
+        "\t\tenable('onshore_transmission_infrastructure_transportation_cost',detailed_value==1);",
+        "\t\tenable('other_onshore_transmission_infrastructure_cost',detailed_value==1);",
+        "\t\tenable('onshore_transmission_infrastructure_cost_rvalue',detailed_value==2);",
         "\t\trefresh();",
         "\t}",
         "}",
@@ -9473,10 +10183,11 @@
         "\tif (value('itemized_check_elec_infras')==1)",
         "\t{",
         "\t\tdetailed_value = value('detailed_cost_modeled_other_elec_infras');",
-        "\t\tenable('other_elec_infra_cost',detailed_value==0);",
-        "\t\tshow('other_elec_infra_cost',detailed_value==0);",
+        "\t\tenable('other_elec_infra_cost',detailed_value==0 || detailed_value==2);",
+        "\t\tshow('other_elec_infra_cost',detailed_value!=1);",
         "\t\tenable('other_elec_infra_cost_modeled',detailed_value==1);",
-        "\t\tshow('other_elec_infra_cost_modeled',detailed_value==1);",
+        "\t\tshow('other_elec_infra_cost_modeled',detailed_value==1);\r",
+        "\t\tenable('other_elec_infra_cost_rvalue',detailed_value==2);",
         "\t\trefresh();",
         "\t}",
         "}",
@@ -9491,7 +10202,8 @@
         "\tenable('array_cable_system_cost',itemized_value==1);",
         "\tenable('array_cable_system_cost_total',itemized_value==1);",
         "\tenable('array_cable_system_cost_modeled',itemized_value==1);",
-        "\tenable('detailed_cost_modeled_array_cables',itemized_value==1);",
+        "\tenable('detailed_cost_modeled_array_cables',itemized_value==1);\r",
+        "\tenable('array_cable_system_cost_rvalue',itemized_value==1);",
         "\tenable('array_cables_cost',itemized_value==1);",
         "\tenable('array_cable_accessories_and_jointing_cost',itemized_value==1);",
         "\tenable('array_cable_system_commissioning_cost',itemized_value==1);",
@@ -9500,7 +10212,8 @@
         "\tenable('export_cable_system_cost',itemized_value==1);",
         "\tenable('export_cable_system_cost_total',itemized_value==1);",
         "\tenable('export_cable_system_cost_modeled',itemized_value==1);",
-        "\tenable('detailed_cost_modeled_export_cables',itemized_value==1);",
+        "\tenable('detailed_cost_modeled_export_cables',itemized_value==1);\r",
+        "\tenable('export_cable_system_cost_rvalue',itemized_value==1);",
         "\tenable('export_cables_cost',itemized_value==1);",
         "\tenable('export_cable_accessories_and_jointing_cost',itemized_value==1);",
         "\tenable('export_cable_commissioning_cost',itemized_value==1);",
@@ -9508,7 +10221,8 @@
         "\tenable('other_export_cable_system_cost',itemized_value==1);",
         "\tenable('cable_protection_cost',itemized_value==1);",
         "\tenable('cable_protection_cost_total',itemized_value==1);",
-        "\tenable('detailed_cost_choice_cable_protection',itemized_value==1);",
+        "\tenable('detailed_cost_choice_cable_protection',itemized_value==1);\r",
+        "\tenable('cable_protection_cost_rvalue',itemized_value==1);",
         "\tenable('scour_protection_elec_infras_cost',itemized_value==1);",
         "\tenable('cable_mattresses_cost',itemized_value==1);",
         "\tenable('ducting_system_cost',itemized_value==1);",
@@ -9520,6 +10234,7 @@
         "\tenable('offshore_substation_cost_total',itemized_value==1);",
         "\tenable('offshore_substation_cost_modeled',itemized_value==1);",
         "\tenable('detailed_cost_modeled_offshore_substation',itemized_value==1);",
+        "\tenable('offshore_substation_cost_rvalue',itemized_value==1);\r",
         "\tenable('topside_cost',itemized_value==1);",
         "\tenable('substructure_and_foundation_cost',itemized_value==1);",
         "\tenable('electrical_conversion_equipment_cost',itemized_value==1);",
@@ -9529,6 +10244,7 @@
         "\tenable('onshore_substation_cost_total',itemized_value==1);",
         "\tenable('onshore_substation_cost_modeled',itemized_value==1);",
         "\tenable('detailed_cost_modeled_onshore_substation',itemized_value==1);",
+        "\tenable('onshore_substation_cost_rvalue',itemized_value==1);\r",
         "\tenable('land_leases_onshore_substation_cost',itemized_value==1);",
         "\tenable('foundation_onshore_substation_cost',itemized_value==1);",
         "\tenable('electrical_equipment_onshore_substation_cost',itemized_value==1);",
@@ -9539,6 +10255,7 @@
         "\tenable('onshore_transmission_infrastructure_cost',itemized_value==1);",
         "\tenable('onshore_transmission_infrastructure_cost_total',itemized_value==1);",
         "\tenable('detailed_cost_choice_onshore_transmission_infrastructure',itemized_value==1);",
+        "\tenable('onshore_transmission_infrastructure_cost_rvalue',itemized_value==1);\r",
         "\tenable('land_leases_cost',itemized_value==1);",
         "\tenable('underground_cable_system_cost',itemized_value==1);",
         "\tenable('structure_foundations_cost',itemized_value==1);",
@@ -9548,12 +10265,14 @@
         "\tenable('onshore_transmission_infrastructure_transportation_cost',itemized_value==1);",
         "\tenable('other_onshore_transmission_infrastructure_cost',itemized_value==1);",
         "\tenable('other_elec_infra_cost',itemized_value==1);",
-        "\tenable('other_elec_infra_cost_modeled',itemized_value==1);",
+        "\tenable('other_elec_infra_cost_modeled',itemized_value==1);\r",
+        "\tenable('other_elec_infra_cost_rvalue',itemized_value==1);",
         "\tenable('detailed_cost_modeled_other_elec_infras',itemized_value==1);",
-        "\tenable('elec_infras_cost_input',itemized_value!=2);",
+        "\tenable('elec_infras_cost_input',itemized_value==0 || itemized_value==3);\r",
+        "\tenable('elec_infras_cost_rvalue',itemized_value==3);",
         "\tshow('elec_infras_cost_total',itemized_value==1);",
         "\tshow('level_input_label_elec',itemized_value==1);",
-        "\tshow('elec_infras_cost_input',(itemized_value==0 || itemized_value==2));",
+        "\tshow('elec_infras_cost_input',itemized_value != 1);",
         "\tshow('user_input_label_elec',(itemized_value==0 || itemized_value==2));",
         "\t",
         "\tif (itemized_value==1)",
diff --git a/deploy/runtime/ui/Marine Costs - Financial Itemized.json b/deploy/runtime/ui/Marine Costs - Financial Itemized.json
index b9aebd12df..ec659c90cd 100644
--- a/deploy/runtime/ui/Marine Costs - Financial Itemized.json	
+++ b/deploy/runtime/ui/Marine Costs - Financial Itemized.json	
@@ -1,7 +1,7 @@
 {
     "Name": "Marine Costs - Financial Itemized",
-    "Width": 923.0,
-    "Height": 208.0,
+    "Width": 922.0,
+    "Height": 421.0,
     "FormObjects": {
         "Label": {
             "Visible": 1.0,
@@ -12,11 +12,11 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 147.0
+                    "Integer": 141.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 252.0
+                    "Integer": 384.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -78,7 +78,7 @@
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 102.0
+                    "Integer": 132.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -148,6 +148,89 @@
                 }
             }
         },
+        "Numeric": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "debt_service_reserve_account_cost_rvalue"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 339.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 162.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 100.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 24.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Value": {
+                    "Type": 1.0,
+                    "Double": 0.0
+                },
+                "Mode": {
+                    "Type": 3.0,
+                    "Integer": 1.0
+                },
+                "Format": {
+                    "Type": 3.0,
+                    "Integer": 0.0
+                },
+                "Decimals": {
+                    "Type": 3.0,
+                    "Integer": 3.0
+                },
+                "Prefix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Suffix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "ThousandsSep": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "Editable": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "ForeColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 0.0,
+                        "Green": 0.0,
+                        "Blue": 0.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "BackColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 255.0,
+                        "Green": 255.0,
+                        "Blue": 255.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "TabOrder": {
+                    "Type": 3.0,
+                    "Integer": -1.0
+                }
+            }
+        },
         "Numeric": {
             "Visible": 1.0,
             "ObjectProperties": {
@@ -161,7 +244,7 @@
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 132.0
+                    "Integer": 192.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -231,6 +314,89 @@
                 }
             }
         },
+        "Numeric": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "decommissioning_reserve_account_cost_rvalue"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 339.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 222.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 100.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 24.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Value": {
+                    "Type": 1.0,
+                    "Double": 0.0
+                },
+                "Mode": {
+                    "Type": 3.0,
+                    "Integer": 1.0
+                },
+                "Format": {
+                    "Type": 3.0,
+                    "Integer": 0.0
+                },
+                "Decimals": {
+                    "Type": 3.0,
+                    "Integer": 3.0
+                },
+                "Prefix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Suffix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "ThousandsSep": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "Editable": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "ForeColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 0.0,
+                        "Green": 0.0,
+                        "Blue": 0.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "BackColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 255.0,
+                        "Green": 255.0,
+                        "Blue": 255.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "TabOrder": {
+                    "Type": 3.0,
+                    "Integer": -1.0
+                }
+            }
+        },
         "Label": {
             "Visible": 1.0,
             "ObjectProperties": {
@@ -240,11 +406,11 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 33.0
+                    "Integer": 27.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 249.0
+                    "Integer": 381.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -302,11 +468,11 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 537.0
+                    "Integer": 660.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 63.0
+                    "Integer": 57.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -364,11 +530,11 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 282.0
+                    "Integer": 276.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 255.0
+                    "Integer": 387.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -500,6 +666,89 @@
                 }
             }
         },
+        "Numeric": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "maintenance_reserve_account_cost_rvalue"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 339.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 102.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 100.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 24.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Value": {
+                    "Type": 1.0,
+                    "Double": 0.0
+                },
+                "Mode": {
+                    "Type": 3.0,
+                    "Integer": 1.0
+                },
+                "Format": {
+                    "Type": 3.0,
+                    "Integer": 0.0
+                },
+                "Decimals": {
+                    "Type": 3.0,
+                    "Integer": 3.0
+                },
+                "Prefix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Suffix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "ThousandsSep": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "Editable": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "ForeColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 0.0,
+                        "Green": 0.0,
+                        "Blue": 0.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "BackColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 255.0,
+                        "Green": 255.0,
+                        "Blue": 255.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "TabOrder": {
+                    "Type": 3.0,
+                    "Integer": -1.0
+                }
+            }
+        },
         "GroupBox": {
             "Visible": 1.0,
             "ObjectProperties": {
@@ -521,7 +770,7 @@
                 },
                 "Height": {
                     "Type": 3.0,
-                    "Integer": 186.0
+                    "Integer": 357.0
                 },
                 "Tool Tip": {
                     "Type": 5.0,
@@ -612,7 +861,7 @@
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 132.0
+                    "Integer": 192.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -674,7 +923,7 @@
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 102.0
+                    "Integer": 132.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -798,7 +1047,7 @@
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 162.0
+                    "Integer": 252.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -860,7 +1109,7 @@
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 162.0
+                    "Integer": 252.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -930,6 +1179,89 @@
                 }
             }
         },
+        "Numeric": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "other_reserve_account_cost_rvalue"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 339.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 285.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 100.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 24.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Value": {
+                    "Type": 1.0,
+                    "Double": 0.0
+                },
+                "Mode": {
+                    "Type": 3.0,
+                    "Integer": 1.0
+                },
+                "Format": {
+                    "Type": 3.0,
+                    "Integer": 0.0
+                },
+                "Decimals": {
+                    "Type": 3.0,
+                    "Integer": 3.0
+                },
+                "Prefix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Suffix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "ThousandsSep": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "Editable": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "ForeColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 0.0,
+                        "Green": 0.0,
+                        "Blue": 0.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "BackColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 255.0,
+                        "Green": 255.0,
+                        "Blue": 255.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "TabOrder": {
+                    "Type": 3.0,
+                    "Integer": -1.0
+                }
+            }
+        },
         "ToolTipCtrl": {
             "Visible": 1.0,
             "ObjectProperties": {
@@ -943,7 +1275,7 @@
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 102.0
+                    "Integer": 132.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -980,7 +1312,7 @@
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 132.0
+                    "Integer": 192.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -1054,7 +1386,7 @@
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 162.0
+                    "Integer": 252.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -1080,6 +1412,32 @@
         }
     },
     "VarDatabase": {
+        "debt_service_reserve_account_cost_rvalue": {
+            "Version": 4.0,
+            "Type": 1.0,
+            "Label": "Debt service reserve account cost scaling value",
+            "Units": "",
+            "Group": "ME Costs - Financial",
+            "IndexLabels": "",
+            "Flags": 0.0,
+            "DefaultValue": 0.0,
+            "UIObject": "Default",
+            "sscVariableName": "",
+            "sscVariableValue": ""
+        },
+        "decommissioning_reserve_account_cost_rvalue": {
+            "Version": 4.0,
+            "Type": 1.0,
+            "Label": "Decommissioning reserve account cost scaling value",
+            "Units": "",
+            "Group": "ME Costs - Financial",
+            "IndexLabels": "",
+            "Flags": 2.0,
+            "DefaultValue": 0.0,
+            "UIObject": "Default",
+            "sscVariableName": "",
+            "sscVariableValue": ""
+        },
         "financial_override_check": {
             "Version": 4.0,
             "Type": 1.0,
@@ -1106,6 +1464,32 @@
             "sscVariableName": "",
             "sscVariableValue": ""
         },
+        "maintenance_reserve_account_cost_rvalue": {
+            "Version": 4.0,
+            "Type": 1.0,
+            "Label": "Maintenance reserve account cost scaling value",
+            "Units": "",
+            "Group": "ME Costs - Financial",
+            "IndexLabels": "",
+            "Flags": 0.0,
+            "DefaultValue": 0.0,
+            "UIObject": "Default",
+            "sscVariableName": "",
+            "sscVariableValue": ""
+        },
+        "other_reserve_account_cost_rvalue": {
+            "Version": 4.0,
+            "Type": 1.0,
+            "Label": "Other reserve accounts cost scaling value",
+            "Units": "",
+            "Group": "ME Costs - Financial",
+            "IndexLabels": "",
+            "Flags": 0.0,
+            "DefaultValue": 0.0,
+            "UIObject": "Default",
+            "sscVariableName": "",
+            "sscVariableValue": ""
+        },
         "project_contingency_cost_modeled_ui": {
             "Version": 4.0,
             "Type": 1.0,
@@ -1135,11 +1519,13 @@
     },
     "Equations": [
         "equations {'project_contingency_budget_cost'} = define() {",
+        "\tarray_scaling_b_value = -log(1 - ${project_contingency_budget_cost_rvalue}) / log(2);\r",
         "\treturn ?${project_contingency_cost_method}",
         "\t\t\t[",
         "\t\t\t\t${project_contingency_cost_input}*${system_capacity},",
         "\t\t\t\t${project_contingency_cost_input},",
-        "\t\t\t\t${project_contingency_cost_modeled_ui}",
+        "\t\t\t\t${project_contingency_cost_modeled_ui},\r",
+        "\t\t\t\t(${project_contingency_cost_input}*pow(${number_devices},-array_scaling_b_value))*${number_devices}",
         "\t\t\t];",
         "};",
         "",
@@ -1148,16 +1534,19 @@
         "\t\t\t[",
         "\t\t\t\t0,",
         "\t\t\t\t0,",
-        "\t\t\t\t1",
+        "\t\t\t\t1,\r",
+        "\t\t\t\t3",
         "\t\t\t];",
         "};",
         "",
         "equations {'insurance_during_construction_cost'} = define() {",
+        "\tarray_scaling_b_value = -log(1 - ${insurance_during_construction_cost_rvalue}) / log(2);\r",
         "\treturn ?${insurance_during_construction_method}",
         "\t\t\t[",
         "\t\t\t\t${insurance_during_construction_cost_input}*${system_capacity},",
         "\t\t\t\t${insurance_during_construction_cost_input},",
-        "\t\t\t\t${insurance_during_construction_cost_modeled_ui}",
+        "\t\t\t\t${insurance_during_construction_cost_modeled_ui},\r",
+        "\t\t\t\t(${insurance_during_construction_cost_input}*pow(${number_devices},-array_scaling_b_value))*${number_devices}",
         "\t\t\t];",
         "};",
         "",
@@ -1166,7 +1555,8 @@
         "\t\t\t[",
         "\t\t\t\t0,",
         "\t\t\t\t0,",
-        "\t\t\t\t1",
+        "\t\t\t\t1,\r",
+        "\t\t\t\t3",
         "\t\t\t];",
         "};",
         "",
@@ -1176,12 +1566,14 @@
         "};",
         "",
         "equations {'reserve_accounts_cost'} = define() {",
+        "\tarray_scaling_b_value = -log(1 - ${reserve_accounts_cost_rvalue}) / log(2);\r",
         "\treturn ?${reserve_accounts_cost_method}",
         "\t\t\t[",
         "\t\t\t\t${reserve_accounts_cost_input}*${system_capacity},",
         "\t\t\t\t${reserve_accounts_cost_input},",
         "\t\t\t\t${reserve_accounts_cost_modeled_ui},",
-        "\t\t\t\t${reserve_accounts_cost_total}",
+        "\t\t\t\t${reserve_accounts_cost_total},\r",
+        "\t\t\t\t(${reserve_accounts_cost_input}*pow(${number_devices},-array_scaling_b_value))*${number_devices}",
         "\t\t\t];",
         "};",
         "",
@@ -1193,7 +1585,8 @@
         "\t\t\t\t\t0,",
         "\t\t\t\t\t0,",
         "\t\t\t\t\t2,",
-        "\t\t\t\t\t1",
+        "\t\t\t\t\t1,\r",
+        "\t\t\t\t\t3",
         "\t\t\t\t];",
         "\t}",
         "\telse",
@@ -1207,7 +1600,8 @@
         "\t\t\t[",
         "\t\t\t\t0,",
         "\t\t\t\t0,",
-        "\t\t\t\t1",
+        "\t\t\t\t1,\r",
+        "\t\t\t\t3",
         "\t\t\t];",
         "};",
         "",
@@ -1216,11 +1610,13 @@
         "};",
         "",
         "equations {'other_financial_cost'} = define() {",
+        "\tarray_scaling_b_value = -log(1 - ${other_financial_cost_rvalue}) / log(2);\r",
         "\treturn ?${other_financial_cost_method}",
         "\t\t\t[",
         "\t\t\t\t${other_financial_cost_input}*${system_capacity},",
         "\t\t\t\t${other_financial_cost_input},",
-        "\t\t\t\t${other_financial_cost_modeled}",
+        "\t\t\t\t${other_financial_cost_modeled}, \r",
+        "\t\t\t\t(${other_financial_cost_input}*pow(${number_devices},-array_scaling_b_value))*${number_devices}",
         "\t\t\t];",
         "};",
         "",
@@ -1232,15 +1628,15 @@
     ],
     "Callbacks": [
         "on_load{'Marine Costs - Financial Itemized'} = define() {",
-        "\ton_change{'itemized_check_contingency'};",
+        "\ton_change{'itemized_check_contingency'}();",
         "\tenable_contingency();",
-        "\ton_change{'itemized_check_construction_insurance'};",
+        "\ton_change{'itemized_check_construction_insurance'}();",
         "\tenable_construction_insurance();",
-        "\ton_change{'itemized_check_reserve_accounts'};",
+        "\ton_change{'itemized_check_reserve_accounts'}();",
         "\tenable_reserve_accounts();",
-        "\ton_change{'itemized_check_other_financial'};",
+        "\ton_change{'itemized_check_other_financial'}();",
         "\tenable_other_financial();",
-        "\ton_change{'financial_override_check'};",
+        "\ton_change{'financial_override_check'}();",
         "\tcheck_override_financial();",
         "};",
         "",
@@ -1270,7 +1666,9 @@
         "function enable_contingency() ",
         "{",
         "\titemized_value = value('itemized_check_contingency');",
-        "\tenable('project_contingency_cost_input',itemized_value!=1);",
+        "\tenable('project_contingency_cost_input',itemized_value!=1);\r",
+        "\t//show('project_contingency_cost_input',itemized_value==0 || itemized_value==3);\r",
+        "\tenable('project_contingency_budget_cost_rvalue',itemized_value==3);",
         "\toverride_financial_cost();",
         "\trefresh();",
         "}",
@@ -1283,6 +1681,8 @@
         "{",
         "\titemized_value_const = value('itemized_check_construction_insurance');",
         "\tenable('insurance_during_construction_cost_input',itemized_value_const!=1);",
+        "\tenable('insurance_during_construction_cost_input',itemized_value_const==0 || itemized_value_const==3);\r",
+        "\tenable('insurance_during_construction_cost_rvalue',itemized_value_const==3);\r",
         "\toverride_financial_cost();",
         "\trefresh();",
         "}",
@@ -1294,15 +1694,20 @@
         "function enable_reserve_accounts()",
         "{",
         "\titemized_value_reserve = value('itemized_check_reserve_accounts');",
-        "\tenable('maintenance_reserve_account_cost',itemized_value_reserve==1);",
+        "\tenable('maintenance_reserve_account_cost',itemized_value_reserve==1);\r",
+        "\tenable('maintenance_reserve_account_cost_rvalue',itemized_value_reserve==1);",
         "\tenable('detailed_cost_choice_reserve_accounts',itemized_value_reserve==1);",
-        "\tenable('debt_service_reserve_account_cost',itemized_value_reserve==1);",
-        "\tenable('decommissioning_reserve_account_cost',itemized_value_reserve==1);",
-        "\tenable('other_reserve_account_cost',itemized_value_reserve==1);",
-        "\tenable('reserve_accounts_cost_input',itemized_value_reserve!=2);",
+        "\tenable('debt_service_reserve_account_cost',itemized_value_reserve==1);\r",
+        "\tenable('debt_service_reserve_account_cost_rvalue',itemized_value_reserve==1);",
+        "\tenable('decommissioning_reserve_account_cost',itemized_value_reserve==1);\r",
+        "\tenable('decommissioning_reserve_account_cost_rvalue',itemized_value_reserve==1);",
+        "\tenable('other_reserve_account_cost',itemized_value_reserve==1);\r",
+        "\tenable('other_reserve_account_cost_rvalue',itemized_value_reserve==1);",
+        "\tenable('reserve_accounts_cost_input',itemized_value_reserve!=2);\r",
+        "\tenable('reserve_accounts_cost_rvalue', itemized_value_reserve==3);",
         "\tshow('reserve_accounts_cost_total',itemized_value_reserve==1);",
         "\tshow('reserve_total_label',itemized_value_reserve==1);",
-        "\tshow('reserve_accounts_cost_input',(itemized_value_reserve==0 || itemized_value_reserve==2));",
+        "\tshow('reserve_accounts_cost_input',itemized_value_reserve!= 1);",
         "\tshow('reserve_input_label',(itemized_value_reserve==0 || itemized_value_reserve==2));",
         "\t",
         "\toverride_financial_cost();",
@@ -1316,7 +1721,8 @@
         "function enable_other_financial() ",
         "{",
         "\titemized_value_other = value('itemized_check_other_financial');",
-        "\tenable('other_financial_cost_input',itemized_value_other!=1);",
+        "\tenable('other_financial_cost_input',itemized_value_other!=1);\r",
+        "\tenable('other_financial_cost_rvalue',itemized_value_other==3);",
         "\toverride_financial_cost();",
         "\trefresh();",
         "}",
diff --git a/deploy/runtime/ui/Marine Costs - Financial.json b/deploy/runtime/ui/Marine Costs - Financial.json
index 1286b3882b..461075103a 100644
--- a/deploy/runtime/ui/Marine Costs - Financial.json	
+++ b/deploy/runtime/ui/Marine Costs - Financial.json	
@@ -1,6 +1,6 @@
 {
     "Name": "Marine Costs - Financial",
-    "Width": 924.0,
+    "Width": 962.0,
     "Height": 448.0,
     "FormObjects": {
         "Label": {
@@ -260,11 +260,11 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 684.0
+                    "Integer": 810.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 366.0
+                    "Integer": 363.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -343,11 +343,11 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 576.0
+                    "Integer": 639.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 399.0
+                    "Integer": 393.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -384,11 +384,11 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 684.0
+                    "Integer": 810.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 366.0
+                    "Integer": 363.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -467,7 +467,7 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 684.0
+                    "Integer": 810.0
                 },
                 "Y": {
                     "Type": 3.0,
@@ -707,6 +707,89 @@
                 }
             }
         },
+        "Numeric": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "insurance_during_construction_cost_rvalue"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 690.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 258.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 100.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 24.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Value": {
+                    "Type": 1.0,
+                    "Double": 0.0
+                },
+                "Mode": {
+                    "Type": 3.0,
+                    "Integer": 1.0
+                },
+                "Format": {
+                    "Type": 3.0,
+                    "Integer": 0.0
+                },
+                "Decimals": {
+                    "Type": 3.0,
+                    "Integer": 3.0
+                },
+                "Prefix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Suffix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "ThousandsSep": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "Editable": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "ForeColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 0.0,
+                        "Green": 0.0,
+                        "Blue": 0.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "BackColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 255.0,
+                        "Green": 255.0,
+                        "Blue": 255.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "TabOrder": {
+                    "Type": 3.0,
+                    "Integer": -1.0
+                }
+            }
+        },
         "Choice": {
             "Visible": 1.0,
             "ObjectProperties": {
@@ -736,7 +819,7 @@
                 },
                 "Items": {
                     "Type": 6.0,
-                    "StringList": "Enter in $/kW|Enter in $|Use Modeled Value ($)"
+                    "StringList": "Enter in $/kW|Enter in $|Use Modeled Value ($)|Use Array Scaling"
                 },
                 "Selection": {
                     "Type": 3.0,
@@ -1005,7 +1088,7 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 648.0
+                    "Integer": 783.0
                 },
                 "Y": {
                     "Type": 3.0,
@@ -1013,7 +1096,7 @@
                 },
                 "Width": {
                     "Type": 3.0,
-                    "Integer": 171.0
+                    "Integer": 159.0
                 },
                 "Height": {
                     "Type": 3.0,
@@ -1063,7 +1146,7 @@
                 },
                 "Width": {
                     "Type": 3.0,
-                    "Integer": 900.0
+                    "Integer": 945.0
                 },
                 "Height": {
                     "Type": 3.0,
@@ -1216,11 +1299,11 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 438.0
+                    "Integer": 564.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 366.0
+                    "Integer": 363.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -1402,7 +1485,69 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 672.0
+                    "Integer": 678.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 198.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 114.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 24.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Caption": {
+                    "Type": 5.0,
+                    "String": "Array scaling R-value"
+                },
+                "TextColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 0.0,
+                        "Green": 0.0,
+                        "Blue": 0.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "Bold": {
+                    "Type": 2.0,
+                    "Boolean": 0.0
+                },
+                "FontSize": {
+                    "Type": 3.0,
+                    "Integer": 0.0
+                },
+                "WordWrap": {
+                    "Type": 2.0,
+                    "Boolean": 0.0
+                },
+                "AlignRight": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "AlignTop": {
+                    "Type": 2.0,
+                    "Boolean": 0.0
+                }
+            }
+        },
+        "Label": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "object 7322319"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 795.0
                 },
                 "Y": {
                     "Type": 3.0,
@@ -1464,7 +1609,7 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 684.0
+                    "Integer": 810.0
                 },
                 "Y": {
                     "Type": 3.0,
@@ -1650,7 +1795,7 @@
                 },
                 "Items": {
                     "Type": 6.0,
-                    "StringList": "Enter in $/kW|Enter in $|Use Modeled Value ($)"
+                    "StringList": "Enter in $/kW|Enter in $|Use Modeled Value ($)|Use Array Scaling"
                 },
                 "Selection": {
                     "Type": 3.0,
@@ -1745,6 +1890,89 @@
                 }
             }
         },
+        "Numeric": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "other_financial_cost_rvalue"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 690.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 324.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 100.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 24.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Value": {
+                    "Type": 1.0,
+                    "Double": 0.0
+                },
+                "Mode": {
+                    "Type": 3.0,
+                    "Integer": 1.0
+                },
+                "Format": {
+                    "Type": 3.0,
+                    "Integer": 0.0
+                },
+                "Decimals": {
+                    "Type": 3.0,
+                    "Integer": 3.0
+                },
+                "Prefix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Suffix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "ThousandsSep": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "Editable": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "ForeColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 0.0,
+                        "Green": 0.0,
+                        "Blue": 0.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "BackColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 255.0,
+                        "Green": 255.0,
+                        "Blue": 255.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "TabOrder": {
+                    "Type": 3.0,
+                    "Integer": -1.0
+                }
+            }
+        },
         "Numeric": {
             "Visible": 1.0,
             "ObjectProperties": {
@@ -1754,7 +1982,7 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 684.0
+                    "Integer": 810.0
                 },
                 "Y": {
                     "Type": 3.0,
@@ -1828,6 +2056,89 @@
                 }
             }
         },
+        "Numeric": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "project_contingency_budget_cost_rvalue"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 690.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 225.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 100.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 24.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Value": {
+                    "Type": 1.0,
+                    "Double": 0.0
+                },
+                "Mode": {
+                    "Type": 3.0,
+                    "Integer": 1.0
+                },
+                "Format": {
+                    "Type": 3.0,
+                    "Integer": 0.0
+                },
+                "Decimals": {
+                    "Type": 3.0,
+                    "Integer": 3.0
+                },
+                "Prefix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Suffix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "ThousandsSep": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "Editable": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "ForeColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 0.0,
+                        "Green": 0.0,
+                        "Blue": 0.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "BackColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 255.0,
+                        "Green": 255.0,
+                        "Blue": 255.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "TabOrder": {
+                    "Type": 3.0,
+                    "Integer": -1.0
+                }
+            }
+        },
         "Numeric": {
             "Visible": 1.0,
             "ObjectProperties": {
@@ -1940,7 +2251,7 @@
                 },
                 "Items": {
                     "Type": 6.0,
-                    "StringList": "Enter in $/kW|Enter in $|Use Modeled Value ($)"
+                    "StringList": "Enter in $/kW|Enter in $|Use Modeled Value ($)|Use Array Scaling"
                 },
                 "Selection": {
                     "Type": 3.0,
@@ -2044,7 +2355,7 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 684.0
+                    "Integer": 810.0
                 },
                 "Y": {
                     "Type": 3.0,
@@ -2230,7 +2541,7 @@
                 },
                 "Items": {
                     "Type": 6.0,
-                    "StringList": "Enter in $/kW|Enter in $|Use Modeled Value ($)|Use Cost Breakdown ($)"
+                    "StringList": "Enter in $/kW|Enter in $|Use Modeled Value ($)|Use Cost Breakdown ($)|Use Array Scaling"
                 },
                 "Selection": {
                     "Type": 3.0,
@@ -2325,6 +2636,89 @@
                 }
             }
         },
+        "Numeric": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "reserve_accounts_cost_rvalue"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 690.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 291.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 100.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 24.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Value": {
+                    "Type": 1.0,
+                    "Double": 0.0
+                },
+                "Mode": {
+                    "Type": 3.0,
+                    "Integer": 1.0
+                },
+                "Format": {
+                    "Type": 3.0,
+                    "Integer": 0.0
+                },
+                "Decimals": {
+                    "Type": 3.0,
+                    "Integer": 3.0
+                },
+                "Prefix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Suffix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "ThousandsSep": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "Editable": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "ForeColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 0.0,
+                        "Green": 0.0,
+                        "Blue": 0.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "BackColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 255.0,
+                        "Green": 255.0,
+                        "Blue": 255.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "TabOrder": {
+                    "Type": 3.0,
+                    "Integer": -1.0
+                }
+            }
+        },
         "Numeric": {
             "Visible": 1.0,
             "ObjectProperties": {
@@ -2417,7 +2811,7 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 789.0
+                    "Integer": 915.0
                 },
                 "Y": {
                     "Type": 3.0,
@@ -2454,7 +2848,7 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 786.0
+                    "Integer": 915.0
                 },
                 "Y": {
                     "Type": 3.0,
@@ -2491,7 +2885,7 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 789.0
+                    "Integer": 915.0
                 },
                 "Y": {
                     "Type": 3.0,
@@ -2713,13 +3107,26 @@
             "sscVariableName": "",
             "sscVariableValue": ""
         },
+        "insurance_during_construction_cost_rvalue": {
+            "Version": 4.0,
+            "Type": 1.0,
+            "Label": "Insurance during construction cost scaling value",
+            "Units": "",
+            "Group": "ME Costs - Financial",
+            "IndexLabels": "",
+            "Flags": 1.0,
+            "DefaultValue": 0.0,
+            "UIObject": "Default",
+            "sscVariableName": "",
+            "sscVariableValue": ""
+        },
         "insurance_during_construction_method": {
             "Version": 4.0,
             "Type": 1.0,
             "Label": "Insurance during construction cost method ",
             "Units": " ",
             "Group": "ME Costs - Financial",
-            "IndexLabels": "",
+            "IndexLabels": "Enter in $/kW|Enter in $| Use Modeled Costs ($)|Use Array Scaling",
             "Flags": 3.0,
             "DefaultValue": 2.0,
             "UIObject": "Choice",
@@ -2823,7 +3230,7 @@
             "Label": "Other financial cost method ",
             "Units": " ",
             "Group": "ME Costs - Financial",
-            "IndexLabels": "Enter in $/kW|Enter in $| Use Modeled Costs ($)|Use Cost Breakdown ($)",
+            "IndexLabels": "Enter in $/kW|Enter in $| Use Modeled Costs ($)|Use Array Scaling",
             "Flags": 3.0,
             "DefaultValue": 2.0,
             "UIObject": "Choice",
@@ -2843,6 +3250,19 @@
             "sscVariableName": "",
             "sscVariableValue": ""
         },
+        "other_financial_cost_rvalue": {
+            "Version": 4.0,
+            "Type": 1.0,
+            "Label": "Other financial costs scaling value",
+            "Units": "",
+            "Group": "ME Costs - Financial",
+            "IndexLabels": "",
+            "Flags": 1.0,
+            "DefaultValue": 0.0,
+            "UIObject": "Default",
+            "sscVariableName": "",
+            "sscVariableValue": ""
+        },
         "other_reserve_account_cost": {
             "Version": 4.0,
             "Type": 1.0,
@@ -2869,6 +3289,19 @@
             "sscVariableName": "",
             "sscVariableValue": ""
         },
+        "project_contingency_budget_cost_rvalue": {
+            "Version": 4.0,
+            "Type": 1.0,
+            "Label": "Project contingency budget cost scaling value",
+            "Units": "",
+            "Group": "ME Costs - Financial",
+            "IndexLabels": "",
+            "Flags": 1.0,
+            "DefaultValue": 0.0,
+            "UIObject": "Default",
+            "sscVariableName": "",
+            "sscVariableValue": ""
+        },
         "project_contingency_cost_input": {
             "Version": 4.0,
             "Type": 1.0,
@@ -2888,7 +3321,7 @@
             "Label": "Project contingency cost method ",
             "Units": " ",
             "Group": "ME Costs - Financial",
-            "IndexLabels": "",
+            "IndexLabels": "Enter in $/kW|Enter in $| Use Modeled Costs ($)|Use Array Scaling",
             "Flags": 3.0,
             "DefaultValue": 2.0,
             "UIObject": "Choice",
@@ -2927,13 +3360,26 @@
             "Label": "Reserve accounts cost method ",
             "Units": " ",
             "Group": "ME Costs - Financial",
-            "IndexLabels": "",
+            "IndexLabels": "Enter in $/kW|Enter in $| Use Modeled Costs ($)|Use Cost Breakdown ($)|Use Array Scaling",
             "Flags": 3.0,
             "DefaultValue": 2.0,
             "UIObject": "Choice",
             "sscVariableName": "",
             "sscVariableValue": ""
         },
+        "reserve_accounts_cost_rvalue": {
+            "Version": 4.0,
+            "Type": 1.0,
+            "Label": "Reserve accounts cost scaling value",
+            "Units": "",
+            "Group": "ME Costs - Financial",
+            "IndexLabels": "",
+            "Flags": 1.0,
+            "DefaultValue": 0.0,
+            "UIObject": "Default",
+            "sscVariableName": "",
+            "sscVariableValue": ""
+        },
         "reserve_accounts_cost_total": {
             "Version": 4.0,
             "Type": 1.0,
@@ -3077,22 +3523,25 @@
         "\tshow('project_contingency_cost_total',value('project_contingency_cost_method')==3);",
         "\tshow('project_contingency_cost_input',value('project_contingency_cost_method')!=3);",
         "\tenable('project_contingency_cost_input',value('project_contingency_cost_method')!=2);",
-        "\t",
+        "\tenable('project_contingency_budget_cost_rvalue', value('project_contingency_cost_method')==3);",
+        "\t\r",
         "\t//Insurance during Construction",
-        "\tshow('insurance_during_construction_cost_total',value('insurance_during_construction_method')==3);",
-        "\tshow('insurance_during_construction_cost_input',value('insurance_during_construction_method')!=3);",
-        "\tenable('insurance_during_construction_cost_input',value('insurance_during_construction_method')==0);",
-        "\t",
+        "\tshow('insurance_during_construction_cost_total',value('insurance_during_construction_method')==2);",
+        "\t//show('insurance_during_construction_cost_input',value('insurance_during_construction_method')!=2);",
+        "\tenable('insurance_during_construction_cost_input',value('insurance_during_construction_method')!=2);",
+        "\tenable('insurance_during_construction_cost_rvalue',value('insurance_during_construction_method')==3);",
+        "\t\r",
         "\t//Reserve Accounts",
         "\tshow('reserve_accounts_cost_total',value('reserve_accounts_cost_method')==3);",
         "\tshow('reserve_accounts_cost_input',value('reserve_accounts_cost_method')!=3);",
         "\tenable('reserve_accounts_cost_input',value('reserve_accounts_cost_method')!=2);",
-        "\t",
+        "\tenable('reserve_accounts_cost_rvalue',value('reserve_accounts_cost_method')==4);",
+        "\t\r",
         "\t//Other Financial Costs",
-        "\tshow('other_financial_cost_total',value('other_financial_cost_method')==3);",
-        "\tshow('other_financial_cost_input',value('other_financial_cost_method')!=3);",
+        "\tshow('other_financial_cost_total',value('other_financial_cost_method')==2);",
+        "\t//show('other_financial_cost_input',value('other_financial_cost_method')!=2);",
         "\tenable('other_financial_cost_input',value('other_financial_cost_method')!=2);",
-        "\t",
+        "\tenable('other_financial_cost_rvalue',value('other_financial_cost_method')==3);",
         "\ton_change{'financial_cost_override'};",
         "\toverride_financial_cost();",
         "\t",
diff --git a/deploy/runtime/ui/Marine Costs - Maintenance.json b/deploy/runtime/ui/Marine Costs - Maintenance.json
index c5441d1fb3..cd6e8eceae 100644
--- a/deploy/runtime/ui/Marine Costs - Maintenance.json	
+++ b/deploy/runtime/ui/Marine Costs - Maintenance.json	
@@ -355,7 +355,7 @@
                 }
             }
         },
-        "CheckBox": {
+        "Choice": {
             "Visible": 1.0,
             "ObjectProperties": {
                 "Name": {
@@ -364,15 +364,15 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 360.0
+                    "Integer": 477.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 132.0
+                    "Integer": 102.0
                 },
                 "Width": {
                     "Type": 3.0,
-                    "Integer": 213.0
+                    "Integer": 177.0
                 },
                 "Height": {
                     "Type": 3.0,
@@ -382,13 +382,13 @@
                     "Type": 5.0,
                     "String": ""
                 },
-                "Caption": {
-                    "Type": 5.0,
-                    "String": "Enter detailed costs"
+                "Items": {
+                    "Type": 6.0,
+                    "StringList": "Enter cost|Enter itemized costs|Array scaling costs"
                 },
-                "State": {
-                    "Type": 2.0,
-                    "Boolean": 0.0
+                "Selection": {
+                    "Type": 3.0,
+                    "Integer": -1.0
                 },
                 "TabOrder": {
                     "Type": 3.0,
@@ -396,7 +396,7 @@
                 }
             }
         },
-        "CheckBox": {
+        "Choice": {
             "Visible": 1.0,
             "ObjectProperties": {
                 "Name": {
@@ -405,15 +405,15 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 360.0
+                    "Integer": 477.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 282.0
+                    "Integer": 252.0
                 },
                 "Width": {
                     "Type": 3.0,
-                    "Integer": 249.0
+                    "Integer": 177.0
                 },
                 "Height": {
                     "Type": 3.0,
@@ -423,13 +423,13 @@
                     "Type": 5.0,
                     "String": ""
                 },
-                "Caption": {
-                    "Type": 5.0,
-                    "String": "Enter detailed costs"
+                "Items": {
+                    "Type": 6.0,
+                    "StringList": "Enter cost|Enter itemized costs|Array scaling costs"
                 },
-                "State": {
-                    "Type": 2.0,
-                    "Boolean": 0.0
+                "Selection": {
+                    "Type": 3.0,
+                    "Integer": -1.0
                 },
                 "TabOrder": {
                     "Type": 3.0,
@@ -1861,6 +1861,89 @@
                 }
             }
         },
+        "Numeric": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "scheduled_maintenance_cost_rvalue"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 468.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 132.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 100.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 24.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Value": {
+                    "Type": 1.0,
+                    "Double": 0.0
+                },
+                "Mode": {
+                    "Type": 3.0,
+                    "Integer": 1.0
+                },
+                "Format": {
+                    "Type": 3.0,
+                    "Integer": 0.0
+                },
+                "Decimals": {
+                    "Type": 3.0,
+                    "Integer": 3.0
+                },
+                "Prefix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Suffix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "ThousandsSep": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "Editable": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "ForeColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 0.0,
+                        "Green": 0.0,
+                        "Blue": 0.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "BackColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 255.0,
+                        "Green": 255.0,
+                        "Blue": 255.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "TabOrder": {
+                    "Type": 3.0,
+                    "Integer": -1.0
+                }
+            }
+        },
         "Numeric": {
             "Visible": 1.0,
             "ObjectProperties": {
@@ -2258,6 +2341,89 @@
                 }
             }
         },
+        "Numeric": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "unscheduled_maintenance_cost_rvalue"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 468.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 282.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 100.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 24.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Value": {
+                    "Type": 1.0,
+                    "Double": 0.0
+                },
+                "Mode": {
+                    "Type": 3.0,
+                    "Integer": 1.0
+                },
+                "Format": {
+                    "Type": 3.0,
+                    "Integer": 0.0
+                },
+                "Decimals": {
+                    "Type": 3.0,
+                    "Integer": 3.0
+                },
+                "Prefix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Suffix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "ThousandsSep": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "Editable": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "ForeColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 0.0,
+                        "Green": 0.0,
+                        "Blue": 0.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "BackColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 255.0,
+                        "Green": 255.0,
+                        "Blue": 255.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "TabOrder": {
+                    "Type": 3.0,
+                    "Integer": -1.0
+                }
+            }
+        },
         "Numeric": {
             "Visible": 1.0,
             "ObjectProperties": {
@@ -2346,11 +2512,11 @@
         "balance_of_system_scheduled_maintenance_cost": {
             "Version": 4.0,
             "Type": 1.0,
-            "Label": " ",
+            "Label": "Balance of system scheduled maintenance costs",
             "Units": " ",
             "Group": "ME Costs - Maintenance",
             "IndexLabels": "",
-            "Flags": 0.0,
+            "Flags": 1.0,
             "DefaultValue": 0.0,
             "UIObject": "Default",
             "sscVariableName": "",
@@ -2359,11 +2525,11 @@
         "balance_of_system_unscheduled_maintenance_cost": {
             "Version": 4.0,
             "Type": 1.0,
-            "Label": " ",
+            "Label": "Balance of system unscheduled maintenance costs",
             "Units": " ",
             "Group": "ME Costs - Maintenance",
             "IndexLabels": "",
-            "Flags": 0.0,
+            "Flags": 1.0,
             "DefaultValue": 0.0,
             "UIObject": "Default",
             "sscVariableName": "",
@@ -2378,7 +2544,7 @@
             "IndexLabels": "",
             "Flags": 3.0,
             "DefaultValue": 0.0,
-            "UIObject": "CheckBox",
+            "UIObject": "Choice",
             "sscVariableName": "",
             "sscVariableValue": ""
         },
@@ -2391,7 +2557,7 @@
             "IndexLabels": "",
             "Flags": 3.0,
             "DefaultValue": 0.0,
-            "UIObject": "CheckBox",
+            "UIObject": "Choice",
             "sscVariableName": "",
             "sscVariableValue": ""
         },
@@ -2489,11 +2655,11 @@
         "marine_energy_converter_scheduled_maintenance_cost": {
             "Version": 4.0,
             "Type": 1.0,
-            "Label": " ",
+            "Label": "Marine energy converter scheduled maintenance costs",
             "Units": " ",
             "Group": "ME Costs - Maintenance",
             "IndexLabels": "",
-            "Flags": 0.0,
+            "Flags": 1.0,
             "DefaultValue": 0.0,
             "UIObject": "Default",
             "sscVariableName": "",
@@ -2502,11 +2668,11 @@
         "marine_energy_converter_unscheduled_maintenance_cost": {
             "Version": 4.0,
             "Type": 1.0,
-            "Label": " ",
+            "Label": "Marine energy converter unscheduled maintenance costs",
             "Units": " ",
             "Group": "ME Costs - Maintenance",
             "IndexLabels": "",
-            "Flags": 0.0,
+            "Flags": 1.0,
             "DefaultValue": 0.0,
             "UIObject": "Default",
             "sscVariableName": "",
@@ -2528,11 +2694,11 @@
         "other_scheduled_maintenance_cost": {
             "Version": 4.0,
             "Type": 1.0,
-            "Label": " ",
+            "Label": "Other scheduled maintenance costs",
             "Units": " ",
             "Group": "ME Costs - Maintenance",
             "IndexLabels": "",
-            "Flags": 0.0,
+            "Flags": 1.0,
             "DefaultValue": 0.0,
             "UIObject": "Default",
             "sscVariableName": "",
@@ -2541,11 +2707,11 @@
         "other_unscheduled_maintenance_cost": {
             "Version": 4.0,
             "Type": 1.0,
-            "Label": " ",
+            "Label": "Other unscheduled maintenance costs",
             "Units": " ",
             "Group": "ME Costs - Maintenance",
             "IndexLabels": "",
-            "Flags": 0.0,
+            "Flags": 1.0,
             "DefaultValue": 0.0,
             "UIObject": "Default",
             "sscVariableName": "",
@@ -2564,6 +2730,19 @@
             "sscVariableName": "",
             "sscVariableValue": ""
         },
+        "scheduled_maintenance_cost_rvalue": {
+            "Version": 4.0,
+            "Type": 1.0,
+            "Label": "Scheduled maintenance array scaling R-value",
+            "Units": "",
+            "Group": "ME Costs - Maintenance",
+            "IndexLabels": "",
+            "Flags": 2.0,
+            "DefaultValue": 0.0,
+            "UIObject": "Default",
+            "sscVariableName": "",
+            "sscVariableValue": ""
+        },
         "scheduled_maintenance_cost_total": {
             "Version": 4.0,
             "Type": 1.0,
@@ -2593,11 +2772,11 @@
         "unscheduled_maintenance_contingency_cost": {
             "Version": 4.0,
             "Type": 1.0,
-            "Label": " ",
+            "Label": "Unscheduled maintenance contingency costs",
             "Units": " ",
             "Group": "ME Costs - Maintenance",
             "IndexLabels": "",
-            "Flags": 0.0,
+            "Flags": 1.0,
             "DefaultValue": 0.0,
             "UIObject": "Default",
             "sscVariableName": "",
@@ -2616,6 +2795,19 @@
             "sscVariableName": "",
             "sscVariableValue": ""
         },
+        "unscheduled_maintenance_cost_rvalue": {
+            "Version": 4.0,
+            "Type": 1.0,
+            "Label": "Unscheduled maintenance array scaling R-value",
+            "Units": "",
+            "Group": "ME Costs - Maintenance",
+            "IndexLabels": "",
+            "Flags": 2.0,
+            "DefaultValue": 0.0,
+            "UIObject": "Default",
+            "sscVariableName": "",
+            "sscVariableValue": ""
+        },
         "unscheduled_maintenance_cost_total": {
             "Version": 4.0,
             "Type": 1.0,
@@ -2655,9 +2847,14 @@
         "\t{",
         "\t\treturn ${scheduled_maintenance_cost};",
         "\t}",
-        "\telse",
+        "\telse if (${detailed_cost_choice_scheduled_maintenance}==1)",
         "\t{",
         "\t\treturn ${scheduled_maintenance_cost_total};",
+        "\t}\r",
+        "\telse {\r",
+        "\t\tb = -log(1-${scheduled_maintenance_cost_rvalue})/log(2);\r",
+        "\t\treturn (${scheduled_maintenance_cost}*pow(${number_devices},-b))*${number_devices};\r",
+        "\r",
         "\t}",
         "};",
         "",
@@ -2673,9 +2870,14 @@
         "\t{",
         "\t\treturn ${unscheduled_maintenance_cost};",
         "\t}",
-        "\telse",
+        "\telse if (${detailed_cost_choice_unscheduled_maintenance}==1)",
         "\t{",
         "\t\treturn ${unscheduled_maintenance_cost_total};",
+        "\t}\r",
+        "\telse {\r",
+        "\t\tb = -log(1-${unscheduled_maintenance_cost_rvalue})/log(2);\r",
+        "\t\treturn (${unscheduled_maintenance_cost}*pow(${number_devices},-b))*${number_devices};\r",
+        "\r",
         "\t}",
         "};",
         "",
@@ -2690,17 +2892,20 @@
         "\t\t\t\t0,",
         "\t\t\t\t0,",
         "\t\t\t\t2,",
-        "\t\t\t\t1",
+        "\t\t\t\t1,\r",
+        "\t\t\t\t3",
         "\t\t\t];",
         "};",
         "",
         "equations {'maintenance_cost'} = define() {",
+        "\tarray_scaling_b_value = -log(1 - ${maintenance_cost_rvalue}) / log(2);\r",
         "\treturn ?${maintenance_cost_method}",
         "\t\t\t[",
         "\t\t\t\t${maintenance_cost_input}*${system_capacity},",
         "\t\t\t\t${maintenance_cost_input},",
         "\t\t\t\t${maintenance_cost_modeled},",
-        "\t\t\t\t${maintenance_cost_total}",
+        "\t\t\t\t${maintenance_cost_total},\r",
+        "\t\t\t\t(${maintenance_cost_input}*pow(${number_devices},-array_scaling_b_value))*${number_devices}",
         "\t\t\t];",
         "};",
         "",
@@ -2713,13 +2918,13 @@
     ],
     "Callbacks": [
         "on_load{'Marine Costs - Maintenance'} = define() {",
-        "\ton_change{'detailed_cost_choice_scheduled_maintenance'};",
+        "\ton_change{'detailed_cost_choice_scheduled_maintenance'}();",
         "\tdetailed_cost_scheduled_maintenance();",
-        "\ton_change{'detailed_cost_choice_unscheduled_maintenance'};",
+        "\ton_change{'detailed_cost_choice_unscheduled_maintenance'}();",
         "\tdetailed_cost_unscheduled_maintenance();",
-        "\ton_change{'itemized_check_maintenance'};",
+        "\ton_change{'itemized_check_maintenance'}();",
         "\tenable_itemized_maintenance();",
-        "\ton_change{'maintenance_override_check'};",
+        "\ton_change{'maintenance_override_check'}();",
         "\tcheck_override_maintenance();",
         "};",
         "",
@@ -2746,14 +2951,14 @@
         "\tif (value('itemized_check_maintenance')==1)",
         "\t{",
         "\t\tdetailed_value = value('detailed_cost_choice_scheduled_maintenance');",
-        "\t\tenable('scheduled_maintenance_cost',detailed_value==0);",
-        "\t\tshow('scheduled_maintenance_cost',detailed_value==0);",
-        "\t\tenable('scheduled_maintenance_cost_total',detailed_value);",
-        "\t\tshow('scheduled_maintenance_cost_total',detailed_value);",
-        "\t\tenable('marine_energy_converter_scheduled_maintenance_cost',detailed_value);",
-        "\t\tenable('balance_of_system_scheduled_maintenance_cost',detailed_value);",
-        "\t\tenable('other_scheduled_maintenance_cost',detailed_value);",
-        "\t\t",
+        "\t\tenable('scheduled_maintenance_cost',detailed_value!=1);",
+        "\t\tshow('scheduled_maintenance_cost',detailed_value!=1);",
+        "\t\tenable('scheduled_maintenance_cost_total',detailed_value==1);",
+        "\t\tshow('scheduled_maintenance_cost_total',detailed_value==1);",
+        "\t\tenable('marine_energy_converter_scheduled_maintenance_cost',detailed_value==1);",
+        "\t\tenable('balance_of_system_scheduled_maintenance_cost',detailed_value==1);",
+        "\t\tenable('other_scheduled_maintenance_cost',detailed_value==1);",
+        "\t\tenable('scheduled_maintenance_cost_rvalue',detailed_value==2);",
         "\t\trefresh();",
         "\t}",
         "}",
@@ -2767,15 +2972,15 @@
         "\tif (value('itemized_check_maintenance')==1)",
         "\t{",
         "\t\tdetailed_value = value('detailed_cost_choice_unscheduled_maintenance');",
-        "\t\tenable('unscheduled_maintenance_cost',detailed_value==0);",
-        "\t\tshow('unscheduled_maintenance_cost',detailed_value==0);",
-        "\t\tenable('unscheduled_maintenance_cost_total',detailed_value);",
-        "\t\tshow('unscheduled_maintenance_cost_total',detailed_value);",
-        "\t\tenable('marine_energy_converter_unscheduled_maintenance_cost',detailed_value);",
-        "\t\tenable('balance_of_system_unscheduled_maintenance_cost',detailed_value);",
-        "\t\tenable('unscheduled_maintenance_contingency_cost',detailed_value);",
-        "\t\tenable('other_unscheduled_maintenance_cost',detailed_value);",
-        "\t\t",
+        "\t\tenable('unscheduled_maintenance_cost',detailed_value!=1);",
+        "\t\tshow('unscheduled_maintenance_cost',detailed_value!=1);",
+        "\t\tenable('unscheduled_maintenance_cost_total',detailed_value==1);",
+        "\t\tshow('unscheduled_maintenance_cost_total',detailed_value==1);",
+        "\t\tenable('marine_energy_converter_unscheduled_maintenance_cost',detailed_value==1);",
+        "\t\tenable('balance_of_system_unscheduled_maintenance_cost',detailed_value==1);",
+        "\t\tenable('unscheduled_maintenance_contingency_cost',detailed_value==1);",
+        "\t\tenable('other_unscheduled_maintenance_cost',detailed_value==1);",
+        "\t\tenable('unscheduled_maintenance_cost_rvalue',detailed_value==2);",
         "\t\trefresh();",
         "\t}",
         "}",
@@ -2791,21 +2996,24 @@
         "\tenable('scheduled_maintenance_cost',itemized_value==1);",
         "\tenable('scheduled_maintenance_cost_total',itemized_value==1);",
         "\tenable('detailed_cost_choice_scheduled_maintenance',itemized_value==1);",
+        "\tenable('scheduled_maintenance_cost_rvalue',itemized_value==1);\r",
         "\tenable('marine_energy_converter_scheduled_maintenance_cost',itemized_value==1);",
         "\tenable('balance_of_system_scheduled_maintenance_cost',itemized_value==1);",
         "\tenable('other_scheduled_maintenance_cost',itemized_value==1);",
         "\tenable('unscheduled_maintenance_cost',itemized_value==1);",
         "\tenable('unscheduled_maintenance_cost_total',itemized_value==1);",
         "\tenable('detailed_cost_choice_unscheduled_maintenance',itemized_value==1);",
+        "\tenable('unscheduled_maintenance_cost_rvalue',itemized_value==1);\r",
         "\tenable('marine_energy_converter_unscheduled_maintenance_cost',itemized_value==1);",
         "\tenable('balance_of_system_unscheduled_maintenance_cost',itemized_value==1);",
         "\tenable('unscheduled_maintenance_contingency_cost',itemized_value==1);",
         "\tenable('other_unscheduled_maintenance_cost',itemized_value==1);",
         "\tenable('other_maintenance_cost',itemized_value==1);",
-        "\tenable('maintenance_cost_input',itemized_value!=2);",
+        "\tenable('maintenance_cost_input',itemized_value!=2);\r",
+        "\tenable('maintenance_cost_rvalue',itemized_value==3);",
         "\tshow('maintenance_cost_total',itemized_value==1);",
         "\tshow('maintenance_level_total_label',itemized_value==1);",
-        "\tshow('maintenance_cost_input',(itemized_value==0 || itemized_value==2));",
+        "\tshow('maintenance_cost_input',itemized_value!=1);",
         "\tif (itemized_value==1)",
         "\t{",
         "\t\tdetailed_cost_scheduled_maintenance();",
diff --git a/deploy/runtime/ui/Marine Costs - Mooring.json b/deploy/runtime/ui/Marine Costs - Mooring.json
index b7cbbe7b9f..5b0dc0847f 100644
--- a/deploy/runtime/ui/Marine Costs - Mooring.json	
+++ b/deploy/runtime/ui/Marine Costs - Mooring.json	
@@ -392,6 +392,89 @@
                 }
             }
         },
+        "Numeric": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "ancillary_marine_systems_cost_rvalue"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 468.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 513.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 100.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 24.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Value": {
+                    "Type": 1.0,
+                    "Double": 0.0
+                },
+                "Mode": {
+                    "Type": 3.0,
+                    "Integer": 1.0
+                },
+                "Format": {
+                    "Type": 3.0,
+                    "Integer": 0.0
+                },
+                "Decimals": {
+                    "Type": 3.0,
+                    "Integer": 3.0
+                },
+                "Prefix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Suffix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "ThousandsSep": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "Editable": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "ForeColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 0.0,
+                        "Green": 0.0,
+                        "Blue": 0.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "BackColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 255.0,
+                        "Green": 255.0,
+                        "Blue": 255.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "TabOrder": {
+                    "Type": 3.0,
+                    "Integer": -1.0
+                }
+            }
+        },
         "Numeric": {
             "Visible": 1.0,
             "ObjectProperties": {
@@ -890,7 +973,7 @@
                 }
             }
         },
-        "CheckBox": {
+        "Choice": {
             "Visible": 1.0,
             "ObjectProperties": {
                 "Name": {
@@ -899,15 +982,15 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 375.0
+                    "Integer": 477.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 513.0
+                    "Integer": 483.0
                 },
                 "Width": {
                     "Type": 3.0,
-                    "Integer": 198.0
+                    "Integer": 177.0
                 },
                 "Height": {
                     "Type": 3.0,
@@ -917,13 +1000,13 @@
                     "Type": 5.0,
                     "String": ""
                 },
-                "Caption": {
-                    "Type": 5.0,
-                    "String": "Enter detailed costs"
+                "Items": {
+                    "Type": 6.0,
+                    "StringList": "Enter cost|Enter itemized costs|Array scaling costs"
                 },
-                "State": {
-                    "Type": 2.0,
-                    "Boolean": 0.0
+                "Selection": {
+                    "Type": 3.0,
+                    "Integer": -1.0
                 },
                 "TabOrder": {
                     "Type": 3.0,
@@ -931,7 +1014,7 @@
                 }
             }
         },
-        "CheckBox": {
+        "Choice": {
             "Visible": 1.0,
             "ObjectProperties": {
                 "Name": {
@@ -940,15 +1023,15 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 387.0
+                    "Integer": 477.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 273.0
+                    "Integer": 243.0
                 },
                 "Width": {
                     "Type": 3.0,
-                    "Integer": 192.0
+                    "Integer": 177.0
                 },
                 "Height": {
                     "Type": 3.0,
@@ -958,13 +1041,13 @@
                     "Type": 5.0,
                     "String": ""
                 },
-                "Caption": {
-                    "Type": 5.0,
-                    "String": "Enter detailed costs"
+                "Items": {
+                    "Type": 6.0,
+                    "StringList": "Enter cost|Enter itemized costs|Array scaling costs"
                 },
-                "State": {
-                    "Type": 2.0,
-                    "Boolean": 0.0
+                "Selection": {
+                    "Type": 3.0,
+                    "Integer": -1.0
                 },
                 "TabOrder": {
                     "Type": 3.0,
@@ -3145,6 +3228,89 @@
                 }
             }
         },
+        "Numeric": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "outfitting_structure_cost_rvalue"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 468.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 273.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 100.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 24.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Value": {
+                    "Type": 1.0,
+                    "Double": 0.0
+                },
+                "Mode": {
+                    "Type": 3.0,
+                    "Integer": 1.0
+                },
+                "Format": {
+                    "Type": 3.0,
+                    "Integer": 0.0
+                },
+                "Decimals": {
+                    "Type": 3.0,
+                    "Integer": 3.0
+                },
+                "Prefix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Suffix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "ThousandsSep": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "Editable": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "ForeColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 0.0,
+                        "Green": 0.0,
+                        "Blue": 0.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "BackColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 255.0,
+                        "Green": 255.0,
+                        "Blue": 255.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "TabOrder": {
+                    "Type": 3.0,
+                    "Integer": -1.0
+                }
+            }
+        },
         "Numeric": {
             "Visible": 1.0,
             "ObjectProperties": {
@@ -4244,6 +4410,19 @@
             "sscVariableName": "",
             "sscVariableValue": ""
         },
+        "ancillary_marine_systems_cost_rvalue": {
+            "Version": 4.0,
+            "Type": 1.0,
+            "Label": "Ancillary marine systems array scaling R-value",
+            "Units": "",
+            "Group": "ME Costs - Mooring",
+            "IndexLabels": "",
+            "Flags": 0.0,
+            "DefaultValue": 0.0,
+            "UIObject": "Default",
+            "sscVariableName": "",
+            "sscVariableValue": ""
+        },
         "ancillary_marine_systems_cost_total": {
             "Version": 4.0,
             "Type": 1.0,
@@ -4273,11 +4452,11 @@
         "ballast_system_mooring_cost": {
             "Version": 4.0,
             "Type": 1.0,
-            "Label": " ",
+            "Label": "Ballast system mooring cost",
             "Units": " ",
             "Group": "ME Costs - Mooring",
             "IndexLabels": "",
-            "Flags": 0.0,
+            "Flags": 1.0,
             "DefaultValue": 0.0,
             "UIObject": "Default",
             "sscVariableName": "",
@@ -4286,11 +4465,11 @@
         "cathodic_protection_system_cost": {
             "Version": 4.0,
             "Type": 1.0,
-            "Label": " ",
+            "Label": "Cathodic protection system cost",
             "Units": " ",
             "Group": "ME Costs - Mooring",
             "IndexLabels": "",
-            "Flags": 0.0,
+            "Flags": 1.0,
             "DefaultValue": 0.0,
             "UIObject": "Default",
             "sscVariableName": "",
@@ -4299,11 +4478,11 @@
         "condition_monitoring_cost": {
             "Version": 4.0,
             "Type": 1.0,
-            "Label": " ",
+            "Label": "Condition monitoring cost",
             "Units": " ",
             "Group": "ME Costs - Mooring",
             "IndexLabels": "",
-            "Flags": 0.0,
+            "Flags": 1.0,
             "DefaultValue": 0.0,
             "UIObject": "Default",
             "sscVariableName": "",
@@ -4331,7 +4510,7 @@
             "IndexLabels": "",
             "Flags": 3.0,
             "DefaultValue": 0.0,
-            "UIObject": "CheckBox",
+            "UIObject": "Choice",
             "sscVariableName": "",
             "sscVariableValue": ""
         },
@@ -4344,7 +4523,7 @@
             "IndexLabels": "",
             "Flags": 3.0,
             "DefaultValue": 0.0,
-            "UIObject": "CheckBox",
+            "UIObject": "Choice",
             "sscVariableName": "",
             "sscVariableValue": ""
         },
@@ -4377,11 +4556,11 @@
         "ladders_cost": {
             "Version": 4.0,
             "Type": 1.0,
-            "Label": " ",
+            "Label": "Ladders cost",
             "Units": " ",
             "Group": "ME Costs - Mooring",
             "IndexLabels": "",
-            "Flags": 0.0,
+            "Flags": 1.0,
             "DefaultValue": 0.0,
             "UIObject": "Default",
             "sscVariableName": "",
@@ -4390,11 +4569,11 @@
         "marine_coatings_cost": {
             "Version": 4.0,
             "Type": 1.0,
-            "Label": " ",
+            "Label": "Marine coatings cost",
             "Units": " ",
             "Group": "ME Costs - Mooring",
             "IndexLabels": "",
-            "Flags": 0.0,
+            "Flags": 1.0,
             "DefaultValue": 0.0,
             "UIObject": "Default",
             "sscVariableName": "",
@@ -4517,6 +4696,19 @@
             "sscVariableName": "",
             "sscVariableValue": ""
         },
+        "outfitting_structure_cost_rvalue": {
+            "Version": 4.0,
+            "Type": 1.0,
+            "Label": "Outfitting structure array scaling R-value",
+            "Units": "",
+            "Group": "ME Costs - Mooring",
+            "IndexLabels": "",
+            "Flags": 0.0,
+            "DefaultValue": 0.0,
+            "UIObject": "Default",
+            "sscVariableName": "",
+            "sscVariableValue": ""
+        },
         "outfitting_structure_cost_total": {
             "Version": 4.0,
             "Type": 1.0,
@@ -4546,11 +4738,11 @@
         "personnel_access_system_mooring_cost": {
             "Version": 4.0,
             "Type": 1.0,
-            "Label": " ",
+            "Label": "Personnel access system mooring costs",
             "Units": " ",
             "Group": "ME Costs - Mooring",
             "IndexLabels": "",
-            "Flags": 0.0,
+            "Flags": 1.0,
             "DefaultValue": 0.0,
             "UIObject": "Default",
             "sscVariableName": "",
@@ -4559,11 +4751,11 @@
         "railings_cost": {
             "Version": 4.0,
             "Type": 1.0,
-            "Label": " ",
+            "Label": "Railings costs",
             "Units": " ",
             "Group": "ME Costs - Mooring",
             "IndexLabels": "",
-            "Flags": 0.0,
+            "Flags": 1.0,
             "DefaultValue": 0.0,
             "UIObject": "Default",
             "sscVariableName": "",
@@ -4624,11 +4816,11 @@
         "vessel_landing_cost": {
             "Version": 4.0,
             "Type": 1.0,
-            "Label": " ",
+            "Label": "Vessel landing costs",
             "Units": " ",
             "Group": "ME Costs - Mooring",
             "IndexLabels": "",
-            "Flags": 0.0,
+            "Flags": 1.0,
             "DefaultValue": 0.0,
             "UIObject": "Default",
             "sscVariableName": "",
@@ -4647,9 +4839,14 @@
         "\t{",
         "\t\treturn ${outfitting_structure_cost};",
         "\t}",
-        "\telse",
+        "\telse if (${detailed_cost_choice_outfitting_structure}==1)",
         "\t{",
         "\t\treturn ${outfitting_structure_cost_total};",
+        "\t}\r",
+        "\telse {\r",
+        "\t\tb = -log(1-${outfitting_structure_cost_rvalue})/log(2);\r",
+        "\t\treturn (${outfitting_structure_cost}*pow(${number_devices},-b))*${number_devices};\r",
+        "\r",
         "\t}",
         "};",
         "",
@@ -4665,9 +4862,14 @@
         "\t{",
         "\t\treturn ${ancillary_marine_systems_cost};",
         "\t}",
-        "\telse",
+        "\telse if (${detailed_cost_choice_ancillary_marine_systems}==1)",
         "\t{",
         "\t\treturn ${ancillary_marine_systems_cost_total};",
+        "\t}\r",
+        "\telse {\r",
+        "\t\tb = -log(1-${ancillary_marine_systems_cost_rvalue})/log(2);\r",
+        "\t\treturn (${ancillary_marine_systems_cost}*pow(${number_devices},-b))*${number_devices};\r",
+        "\r",
         "\t}",
         "};",
         "",
@@ -4687,7 +4889,8 @@
         "\t\t\t\t\t0,",
         "\t\t\t\t\t0,",
         "\t\t\t\t\t2,",
-        "\t\t\t\t\t1",
+        "\t\t\t\t\t1,\r",
+        "\t\t\t\t\t3",
         "\t\t\t\t];",
         "\t}",
         "\telse",
@@ -4696,13 +4899,15 @@
         "\t}",
         "};",
         "",
-        "equations {'mooring_found_substruc_cost'} = define() {",
+        "equations {'mooring_found_substruc_cost'} = define() {\r",
+        "\tarray_scaling_b_value = -log(1-${mooring_found_substruc_cost_rvalue})/log(2);",
         "\treturn ?${mooring_found_substruc_cost_method}",
         "\t\t\t[",
         "\t\t\t\t${mooring_found_substruc_cost_input}*${system_capacity},",
         "\t\t\t\t${mooring_found_substruc_cost_input},",
         "\t\t\t\t${mooring_found_substruc_cost_modeled},",
-        "\t\t\t\t${mooring_found_substruc_cost_total}",
+        "\t\t\t\t${mooring_found_substruc_cost_total},\r",
+        "\t\t\t\t(${mooring_found_substruc_cost_input}*pow(${number_devices},-array_scaling_b_value))*${number_devices}",
         "\t\t\t];",
         "};",
         "",
@@ -4716,11 +4921,11 @@
     "Callbacks": [
         "on_load{'Marine Costs - Mooring'} = define() {",
         "\tcheck_override_mooring();",
-        "\ton_change{'mooring_override'};",
-        "\ton_change{'itemized_check_mooring'};",
+        "\ton_change{'mooring_override'}();",
+        "\ton_change{'itemized_check_mooring'}();",
         "\tenable_itemized_mooring();",
-        "\ton_change{'detailed_cost_choice_outfitting_structure'};",
-        "\ton_change{'detailed_cost_choice_ancillary_marine_systems'};",
+        "\ton_change{'detailed_cost_choice_outfitting_structure'}();",
+        "\ton_change{'detailed_cost_choice_ancillary_marine_systems'}();",
         "\tdetailed_cost_outfitting_structure();",
         "\tdetailed_cost_ancillary_marine_systems();",
         "};",
@@ -4750,16 +4955,17 @@
         "\tif (value('itemized_check_mooring')==1)",
         "\t{",
         "\t\tdetailed_value = value('detailed_cost_choice_outfitting_structure');",
-        "\t\tenable('outfitting_structure_cost',detailed_value==0);",
-        "\t\tshow('outfitting_structure_cost',detailed_value==0);",
-        "\t\tenable('outfitting_structure_cost_total',detailed_value);",
-        "\t\tshow('outfitting_structure_cost_total',detailed_value);",
-        "\t\tenable('vessel_landing_cost',detailed_value);",
-        "\t\tenable('service_platforms_and_decks_cost',detailed_value);",
-        "\t\tenable('ladders_cost',detailed_value);",
-        "\t\tenable('railings_cost',detailed_value);",
-        "\t\tenable('marine_coatings_cost',detailed_value);",
-        "\t\tenable('other_outfitting_structure_cost',detailed_value);",
+        "\t\tenable('outfitting_structure_cost',detailed_value!=1);",
+        "\t\tshow('outfitting_structure_cost',detailed_value!=1);",
+        "\t\tenable('outfitting_structure_cost_total',detailed_value==1);",
+        "\t\tshow('outfitting_structure_cost_total',detailed_value==1);",
+        "\t\tenable('vessel_landing_cost',detailed_value==1);",
+        "\t\tenable('service_platforms_and_decks_cost',detailed_value==1);",
+        "\t\tenable('ladders_cost',detailed_value==1);",
+        "\t\tenable('railings_cost',detailed_value==1);",
+        "\t\tenable('marine_coatings_cost',detailed_value==1);",
+        "\t\tenable('other_outfitting_structure_cost',detailed_value==1);\r",
+        "\t\tenable('outfitting_structure_cost_rvalue',detailed_value==2);",
         "\t\t",
         "\t\trefresh();",
         "\t}",
@@ -4774,15 +4980,16 @@
         "\tif (value('itemized_check_mooring')==1)",
         "\t{",
         "\t\tdetailed_value = value('detailed_cost_choice_ancillary_marine_systems');",
-        "\t\tenable('ancillary_marine_systems_cost',detailed_value==0);",
-        "\t\tshow('ancillary_marine_systems_cost',detailed_value==0);",
-        "\t\tenable('ancillary_marine_systems_cost_total',detailed_value);",
-        "\t\tshow('ancillary_marine_systems_cost_total',detailed_value);",
-        "\t\tenable('cathodic_protection_system_cost',detailed_value);",
-        "\t\tenable('personnel_access_system_mooring_cost',detailed_value);",
-        "\t\tenable('ballast_system_mooring_cost',detailed_value);",
-        "\t\tenable('condition_monitoring_cost',detailed_value);",
-        "\t\tenable('other_ancillary_marine_system_cost',detailed_value);",
+        "\t\tenable('ancillary_marine_systems_cost',detailed_value!=1);",
+        "\t\tshow('ancillary_marine_systems_cost',detailed_value!=1);",
+        "\t\tenable('ancillary_marine_systems_cost_total',detailed_value==1);",
+        "\t\tshow('ancillary_marine_systems_cost_total',detailed_value==1);",
+        "\t\tenable('cathodic_protection_system_cost',detailed_value==1);",
+        "\t\tenable('personnel_access_system_mooring_cost',detailed_value==1);",
+        "\t\tenable('ballast_system_mooring_cost',detailed_value==1);",
+        "\t\tenable('condition_monitoring_cost',detailed_value==1);",
+        "\t\tenable('other_ancillary_marine_system_cost',detailed_value==1);\r",
+        "\t\tenable('ancillary_marine_systems_cost_rvalue',detailed_value==2);",
         "\t\t",
         "\t\trefresh();",
         "\t}",
@@ -4805,7 +5012,8 @@
         "\tenable('messenger_lines_and_buoys_cost',itemized_value==1);",
         "\tenable('scour_protection_cost',itemized_value==1);",
         "\tenable('outfitting_structure_cost',itemized_value==1);",
-        "\tenable('outfitting_structure_cost_total',itemized_value==1);",
+        "\tenable('outfitting_structure_cost_total',itemized_value==1);\r",
+        "\tenable('outfitting_structure_cost_rvalue',itemized_value==1);",
         "\tenable('vessel_landing_cost',itemized_value==1);",
         "\tenable('service_platforms_and_decks_cost',itemized_value==1);",
         "\tenable('ladders_cost',itemized_value==1);",
@@ -4813,7 +5021,8 @@
         "\tenable('marine_coatings_cost',itemized_value==1);",
         "\tenable('other_outfitting_structure_cost',itemized_value==1);",
         "\tenable('ancillary_marine_systems_cost',itemized_value==1);",
-        "\tenable('ancillary_marine_systems_cost_total',itemized_value==1);",
+        "\tenable('ancillary_marine_systems_cost_total',itemized_value==1);\r",
+        "\tenable('ancillary_marine_systems_cost_rvalue',itemized_value==1);",
         "\tenable('cathodic_protection_system_cost',itemized_value==1);",
         "\tenable('personnel_access_system_mooring_cost',itemized_value==1);",
         "\tenable('ballast_system_mooring_cost',itemized_value==1);",
@@ -4821,11 +5030,12 @@
         "\tenable('other_ancillary_marine_system_cost',itemized_value==1);",
         "\tenable('integration_assembly_testing_checkout_cost',itemized_value==1);",
         "\tenable('transportation_cost',itemized_value==1);",
-        "\tenable('other_mooring_cost',itemized_value==1);",
-        "\tenable('mooring_found_substruc_cost_input',itemized_value!=2);",
+        "\tenable('other_mooring_cost',itemized_value==1);\r",
+        "\tshow('mooring_found_substruc_cost_input',itemized_value!=1);",
+        "\tenable('mooring_found_substruc_cost_input',itemized_value==0 || itemized_value==3);\r",
+        "\tenable('mooring_found_substruc_cost_rvalue',itemized_value==3);",
         "\tshow('mooring_found_substruc_cost_total',itemized_value==1);",
         "\t//show('mooring_cost_label',itemized_value==1);",
-        "\tshow('mooring_found_substruc_cost_input',(itemized_value==0 || itemized_value==2));",
         "\t//show('mooring_input_label',(itemized_value==0 || itemized_value==2));",
         "\t",
         "\tif (itemized_value==1)",
diff --git a/deploy/runtime/ui/Marine Costs - O&M.json b/deploy/runtime/ui/Marine Costs - O&M.json
index 7c1544a768..c56445f158 100644
--- a/deploy/runtime/ui/Marine Costs - O&M.json	
+++ b/deploy/runtime/ui/Marine Costs - O&M.json	
@@ -1,7 +1,7 @@
 {
     "Name": "Marine Costs - O&M",
-    "Width": 919.0,
-    "Height": 362.0,
+    "Width": 960.0,
+    "Height": 364.0,
     "FormObjects": {
         "Label": {
             "Visible": 1.0,
@@ -12,7 +12,7 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 789.0
+                    "Integer": 885.0
                 },
                 "Y": {
                     "Type": 3.0,
@@ -74,7 +74,7 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 789.0
+                    "Integer": 885.0
                 },
                 "Y": {
                     "Type": 3.0,
@@ -136,7 +136,7 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 684.0
+                    "Integer": 825.0
                 },
                 "Y": {
                     "Type": 3.0,
@@ -322,7 +322,7 @@
                 },
                 "Items": {
                     "Type": 6.0,
-                    "StringList": "Enter in $/kW|Enter in $|Use Modeled Value ($)|Use Cost Breakdown ($)"
+                    "StringList": "Enter in $/kW|Enter in $|Use Modeled Value ($)|Use Cost Breakdown ($)|Use Array Scaling"
                 },
                 "Selection": {
                     "Type": 3.0,
@@ -417,6 +417,89 @@
                 }
             }
         },
+        "Numeric": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "maintenance_cost_rvalue"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 690.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 231.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 100.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 24.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Value": {
+                    "Type": 1.0,
+                    "Double": 0.0
+                },
+                "Mode": {
+                    "Type": 3.0,
+                    "Integer": 1.0
+                },
+                "Format": {
+                    "Type": 3.0,
+                    "Integer": 0.0
+                },
+                "Decimals": {
+                    "Type": 3.0,
+                    "Integer": 3.0
+                },
+                "Prefix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Suffix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "ThousandsSep": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "Editable": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "ForeColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 0.0,
+                        "Green": 0.0,
+                        "Blue": 0.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "BackColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 255.0,
+                        "Green": 255.0,
+                        "Blue": 255.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "TabOrder": {
+                    "Type": 3.0,
+                    "Integer": 1.0
+                }
+            }
+        },
         "Numeric": {
             "Visible": 1.0,
             "ObjectProperties": {
@@ -571,15 +654,15 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 645.0
+                    "Integer": 813.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 261.0
+                    "Integer": 258.0
                 },
                 "Width": {
                     "Type": 3.0,
-                    "Integer": 171.0
+                    "Integer": 129.0
                 },
                 "Height": {
                     "Type": 3.0,
@@ -629,7 +712,7 @@
                 },
                 "Width": {
                     "Type": 3.0,
-                    "Integer": 900.0
+                    "Integer": 945.0
                 },
                 "Height": {
                     "Type": 3.0,
@@ -720,11 +803,11 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 288.0
+                    "Integer": 429.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 276.0
+                    "Integer": 270.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -968,7 +1051,69 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 666.0
+                    "Integer": 672.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 165.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 117.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 24.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Caption": {
+                    "Type": 5.0,
+                    "String": "Array scaling R-value"
+                },
+                "TextColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 0.0,
+                        "Green": 0.0,
+                        "Blue": 0.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "Bold": {
+                    "Type": 2.0,
+                    "Boolean": 0.0
+                },
+                "FontSize": {
+                    "Type": 3.0,
+                    "Integer": 0.0
+                },
+                "WordWrap": {
+                    "Type": 2.0,
+                    "Boolean": 0.0
+                },
+                "AlignRight": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "AlignTop": {
+                    "Type": 2.0,
+                    "Boolean": 0.0
+                }
+            }
+        },
+        "Label": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "object 732218"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 807.0
                 },
                 "Y": {
                     "Type": 3.0,
@@ -1092,11 +1237,11 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 684.0
+                    "Integer": 825.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 276.0
+                    "Integer": 270.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -1175,11 +1320,11 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 465.0
+                    "Integer": 606.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 312.0
+                    "Integer": 306.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -1216,7 +1361,7 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 684.0
+                    "Integer": 825.0
                 },
                 "Y": {
                     "Type": 3.0,
@@ -1402,7 +1547,7 @@
                 },
                 "Items": {
                     "Type": 6.0,
-                    "StringList": "Enter in $/kW|Enter in $|Use Modeled Value ($)|Use Cost Breakdown ($)"
+                    "StringList": "Enter in $/kW|Enter in $|Use Modeled Value ($)|Use Cost Breakdown ($)|Use Array Scaling"
                 },
                 "Selection": {
                     "Type": 3.0,
@@ -1497,6 +1642,89 @@
                 }
             }
         },
+        "Numeric": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "operations_cost_rvalue"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 690.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 195.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 100.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 24.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Value": {
+                    "Type": 1.0,
+                    "Double": 0.0
+                },
+                "Mode": {
+                    "Type": 3.0,
+                    "Integer": 1.0
+                },
+                "Format": {
+                    "Type": 3.0,
+                    "Integer": 0.0
+                },
+                "Decimals": {
+                    "Type": 3.0,
+                    "Integer": 3.0
+                },
+                "Prefix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Suffix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "ThousandsSep": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "Editable": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "ForeColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 0.0,
+                        "Green": 0.0,
+                        "Blue": 0.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "BackColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 255.0,
+                        "Green": 255.0,
+                        "Blue": 255.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "TabOrder": {
+                    "Type": 3.0,
+                    "Integer": 1.0
+                }
+            }
+        },
         "Numeric": {
             "Visible": 1.0,
             "ObjectProperties": {
@@ -1589,11 +1817,11 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 684.0
+                    "Integer": 825.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 276.0
+                    "Integer": 270.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -1665,6 +1893,19 @@
         }
     },
     "VarDatabase": {
+        "maintenance_cost_rvalue": {
+            "Version": 4.0,
+            "Type": 1.0,
+            "Label": "Maintenance cost scaling value",
+            "Units": "",
+            "Group": "ME Costs - Operation Maintenance",
+            "IndexLabels": "",
+            "Flags": 1.0,
+            "DefaultValue": 0.0,
+            "UIObject": "Default",
+            "sscVariableName": "",
+            "sscVariableValue": ""
+        },
         "om_cost_input": {
             "Version": 4.0,
             "Type": 1.0,
@@ -1706,6 +1947,19 @@
             "sscVariableName": "",
             "sscVariableValue": ""
         },
+        "operations_cost_rvalue": {
+            "Version": 4.0,
+            "Type": 1.0,
+            "Label": "Operations cost scaling value",
+            "Units": "",
+            "Group": "ME Costs - Operation Maintenance",
+            "IndexLabels": "",
+            "Flags": 1.0,
+            "DefaultValue": 0.0,
+            "UIObject": "Default",
+            "sscVariableName": "",
+            "sscVariableValue": ""
+        },
         "total_bos_cost_lcoe": {
             "Version": 4.0,
             "Type": 1.0,
@@ -1816,6 +2070,16 @@
         "",
         "equations {'om_fixed'} = define() {",
         "\treturn [${total_operating_cost}];",
+        "};\r",
+        "\r",
+        "equations {'opex_we_shown'} = define() {\r",
+        "\tif (${operations_cost_method} == 3) return true;\r",
+        "\telse return false;\r",
+        "};\r",
+        "\r",
+        "equations {'maintenance_we_shown'} = define() {\r",
+        "\tif (${maintenance_cost_method} == 3) return true;\r",
+        "\telse return false;\r",
         "};",
         "",
         "",
@@ -1835,14 +2099,16 @@
         "\t//Operations",
         "\tshow('operations_cost_total',value('operations_cost_method')==3);",
         "\tshow('operations_cost_input',value('operations_cost_method')!=3);",
-        "\tenable('operations_cost_input',value('operations_cost_method')!=2);",
+        "\tenable('operations_cost_input',value('operations_cost_method')!=2);\r",
+        "\tenable('operations_cost_rvalue',value('operations_cost_method')==3);",
         "\t",
         "\t//Maintenance",
         "\tshow('maintenance_cost_total',value('maintenance_cost_method')==3);",
         "\tshow('maintenance_cost_input',value('maintenance_cost_method')!=3);",
-        "\tenable('maintenance_cost_input',value('maintenance_cost_method')!=2);",
+        "\tenable('maintenance_cost_input',value('maintenance_cost_method')!=2);\r",
+        "\tenable('maintenance_cost_rvalue',value('maintenance_cost_method')==3);",
         "\t",
-        "\ton_change{'om_cost_override'};",
+        "\ton_change{'om_cost_override'}();",
         "\toverride_om_cost();",
         "\t",
         "\trefresh();",
diff --git a/deploy/runtime/ui/Marine Costs - Operations.json b/deploy/runtime/ui/Marine Costs - Operations.json
index 79f99a1d36..79e3ecaddc 100644
--- a/deploy/runtime/ui/Marine Costs - Operations.json	
+++ b/deploy/runtime/ui/Marine Costs - Operations.json	
@@ -272,6 +272,89 @@
                 }
             }
         },
+        "Numeric": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "annual_leases_fees_cost_rvalue"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 468.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 258.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 100.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 24.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Value": {
+                    "Type": 1.0,
+                    "Double": 0.0
+                },
+                "Mode": {
+                    "Type": 3.0,
+                    "Integer": 1.0
+                },
+                "Format": {
+                    "Type": 3.0,
+                    "Integer": 0.0
+                },
+                "Decimals": {
+                    "Type": 3.0,
+                    "Integer": 3.0
+                },
+                "Prefix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Suffix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "ThousandsSep": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "Editable": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "ForeColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 0.0,
+                        "Green": 0.0,
+                        "Blue": 0.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "BackColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 255.0,
+                        "Green": 255.0,
+                        "Blue": 255.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "TabOrder": {
+                    "Type": 3.0,
+                    "Integer": -1.0
+                }
+            }
+        },
         "Numeric": {
             "Visible": 1.0,
             "ObjectProperties": {
@@ -438,7 +521,7 @@
                 }
             }
         },
-        "CheckBox": {
+        "Choice": {
             "Visible": 1.0,
             "ObjectProperties": {
                 "Name": {
@@ -447,15 +530,15 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 345.0
+                    "Integer": 477.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 258.0
+                    "Integer": 228.0
                 },
                 "Width": {
                     "Type": 3.0,
-                    "Integer": 210.0
+                    "Integer": 177.0
                 },
                 "Height": {
                     "Type": 3.0,
@@ -465,13 +548,13 @@
                     "Type": 5.0,
                     "String": ""
                 },
-                "Caption": {
-                    "Type": 5.0,
-                    "String": "Enter detailed costs"
+                "Items": {
+                    "Type": 6.0,
+                    "StringList": "Enter cost|Enter itemized costs|Array scaling costs"
                 },
-                "State": {
-                    "Type": 2.0,
-                    "Boolean": 0.0
+                "Selection": {
+                    "Type": 3.0,
+                    "Integer": -1.0
                 },
                 "TabOrder": {
                     "Type": 3.0,
@@ -479,7 +562,7 @@
                 }
             }
         },
-        "CheckBox": {
+        "Choice": {
             "Visible": 1.0,
             "ObjectProperties": {
                 "Name": {
@@ -488,15 +571,15 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 345.0
+                    "Integer": 477.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 108.0
+                    "Integer": 78.0
                 },
                 "Width": {
                     "Type": 3.0,
-                    "Integer": 207.0
+                    "Integer": 177.0
                 },
                 "Height": {
                     "Type": 3.0,
@@ -506,13 +589,13 @@
                     "Type": 5.0,
                     "String": ""
                 },
-                "Caption": {
-                    "Type": 5.0,
-                    "String": "Enter detailed costs"
+                "Items": {
+                    "Type": 6.0,
+                    "StringList": "Enter cost|Enter itemized costs|Array scaling costs"
                 },
-                "State": {
-                    "Type": 2.0,
-                    "Boolean": 0.0
+                "Selection": {
+                    "Type": 3.0,
+                    "Integer": -1.0
                 },
                 "TabOrder": {
                     "Type": 3.0,
@@ -520,7 +603,7 @@
                 }
             }
         },
-        "CheckBox": {
+        "Choice": {
             "Visible": 1.0,
             "ObjectProperties": {
                 "Name": {
@@ -529,15 +612,15 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 345.0
+                    "Integer": 477.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 498.0
+                    "Integer": 468.0
                 },
                 "Width": {
                     "Type": 3.0,
-                    "Integer": 183.0
+                    "Integer": 177.0
                 },
                 "Height": {
                     "Type": 3.0,
@@ -547,13 +630,13 @@
                     "Type": 5.0,
                     "String": ""
                 },
-                "Caption": {
-                    "Type": 5.0,
-                    "String": "Enter detailed costs"
+                "Items": {
+                    "Type": 6.0,
+                    "StringList": "Enter cost|Enter itemized costs|Array scaling costs"
                 },
-                "State": {
-                    "Type": 2.0,
-                    "Boolean": 0.0
+                "Selection": {
+                    "Type": 3.0,
+                    "Integer": -1.0
                 },
                 "TabOrder": {
                     "Type": 3.0,
@@ -644,6 +727,89 @@
                 }
             }
         },
+        "Numeric": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "environmental_health_and_safety_monitoring_cost_rvalue"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 468.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 108.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 100.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 24.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Value": {
+                    "Type": 1.0,
+                    "Double": 0.0
+                },
+                "Mode": {
+                    "Type": 3.0,
+                    "Integer": 1.0
+                },
+                "Format": {
+                    "Type": 3.0,
+                    "Integer": 0.0
+                },
+                "Decimals": {
+                    "Type": 3.0,
+                    "Integer": 3.0
+                },
+                "Prefix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Suffix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "ThousandsSep": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "Editable": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "ForeColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 0.0,
+                        "Green": 0.0,
+                        "Blue": 0.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "BackColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 255.0,
+                        "Green": 255.0,
+                        "Blue": 255.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "TabOrder": {
+                    "Type": 3.0,
+                    "Integer": -1.0
+                }
+            }
+        },
         "Numeric": {
             "Visible": 1.0,
             "ObjectProperties": {
@@ -3248,6 +3414,89 @@
                 }
             }
         },
+        "Numeric": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "operations_management_general_administration_cost_rvalue"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 468.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 498.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 100.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 24.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Value": {
+                    "Type": 1.0,
+                    "Double": 0.0
+                },
+                "Mode": {
+                    "Type": 3.0,
+                    "Integer": 1.0
+                },
+                "Format": {
+                    "Type": 3.0,
+                    "Integer": 0.0
+                },
+                "Decimals": {
+                    "Type": 3.0,
+                    "Integer": 3.0
+                },
+                "Prefix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Suffix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "ThousandsSep": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "Editable": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "ForeColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 0.0,
+                        "Green": 0.0,
+                        "Blue": 0.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "BackColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 255.0,
+                        "Green": 255.0,
+                        "Blue": 255.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "TabOrder": {
+                    "Type": 3.0,
+                    "Integer": -1.0
+                }
+            }
+        },
         "Numeric": {
             "Visible": 1.0,
             "ObjectProperties": {
@@ -4402,6 +4651,19 @@
             "sscVariableName": "",
             "sscVariableValue": ""
         },
+        "annual_leases_fees_cost_rvalue": {
+            "Version": 4.0,
+            "Type": 1.0,
+            "Label": "Annual leases/fees array scaling R-value",
+            "Units": "",
+            "Group": "ME Costs - Operations",
+            "IndexLabels": "",
+            "Flags": 2.0,
+            "DefaultValue": 0.0,
+            "UIObject": "Default",
+            "sscVariableName": "",
+            "sscVariableValue": ""
+        },
         "annual_leases_fees_cost_total": {
             "Version": 4.0,
             "Type": 1.0,
@@ -4431,11 +4693,11 @@
         "condition_monitoring_operations_cost": {
             "Version": 4.0,
             "Type": 1.0,
-            "Label": " ",
+            "Label": "Condition monitoring operations cost",
             "Units": " ",
             "Group": "ME Costs - Operations",
             "IndexLabels": "",
-            "Flags": 0.0,
+            "Flags": 1.0,
             "DefaultValue": 0.0,
             "UIObject": "Default",
             "sscVariableName": "",
@@ -4450,7 +4712,7 @@
             "IndexLabels": "",
             "Flags": 3.0,
             "DefaultValue": 0.0,
-            "UIObject": "CheckBox",
+            "UIObject": "Choice",
             "sscVariableName": "",
             "sscVariableValue": ""
         },
@@ -4463,7 +4725,7 @@
             "IndexLabels": "",
             "Flags": 3.0,
             "DefaultValue": 0.0,
-            "UIObject": "CheckBox",
+            "UIObject": "Choice",
             "sscVariableName": "",
             "sscVariableValue": ""
         },
@@ -4476,7 +4738,7 @@
             "IndexLabels": "",
             "Flags": 3.0,
             "DefaultValue": 0.0,
-            "UIObject": "CheckBox",
+            "UIObject": "Choice",
             "sscVariableName": "",
             "sscVariableValue": ""
         },
@@ -4493,6 +4755,19 @@
             "sscVariableName": "",
             "sscVariableValue": ""
         },
+        "environmental_health_and_safety_monitoring_cost_rvalue": {
+            "Version": 4.0,
+            "Type": 1.0,
+            "Label": "Environmental, health, and safety monitoring array scaling R-value",
+            "Units": "",
+            "Group": "ME Costs - Operations",
+            "IndexLabels": "",
+            "Flags": 0.0,
+            "DefaultValue": 0.0,
+            "UIObject": "Default",
+            "sscVariableName": "",
+            "sscVariableValue": ""
+        },
         "environmental_health_and_safety_monitoring_cost_total": {
             "Version": 4.0,
             "Type": 1.0,
@@ -4522,11 +4797,11 @@
         "environmental_monitoring_operations_cost": {
             "Version": 4.0,
             "Type": 1.0,
-            "Label": " ",
+            "Label": "Environmental monitoring operations cost",
             "Units": " ",
             "Group": "ME Costs - Operations",
             "IndexLabels": "",
-            "Flags": 0.0,
+            "Flags": 1.0,
             "DefaultValue": 0.0,
             "UIObject": "Default",
             "sscVariableName": "",
@@ -4535,11 +4810,11 @@
         "federal_energy_regulatory_commission_fees_cost": {
             "Version": 4.0,
             "Type": 1.0,
-            "Label": " ",
+            "Label": "Federal energy regulator commission fees cost",
             "Units": " ",
             "Group": "ME Costs - Operations",
             "IndexLabels": "",
-            "Flags": 0.0,
+            "Flags": 1.0,
             "DefaultValue": 0.0,
             "UIObject": "Default",
             "sscVariableName": "",
@@ -4548,11 +4823,11 @@
         "generation_planning_and_integration_cost": {
             "Version": 4.0,
             "Type": 1.0,
-            "Label": " ",
+            "Label": "Generation planning and integration cost",
             "Units": " ",
             "Group": "ME Costs - Operations",
             "IndexLabels": "",
-            "Flags": 0.0,
+            "Flags": 1.0,
             "DefaultValue": 0.0,
             "UIObject": "Default",
             "sscVariableName": "",
@@ -4561,11 +4836,11 @@
         "health_safety_monitoring_cost": {
             "Version": 4.0,
             "Type": 1.0,
-            "Label": " ",
+            "Label": "Health and safety monitoring cost",
             "Units": " ",
             "Group": "ME Costs - Operations",
             "IndexLabels": "",
-            "Flags": 0.0,
+            "Flags": 1.0,
             "DefaultValue": 0.0,
             "UIObject": "Default",
             "sscVariableName": "",
@@ -4600,11 +4875,11 @@
         "marine_energy_converter_power_consumption_cost": {
             "Version": 4.0,
             "Type": 1.0,
-            "Label": " ",
+            "Label": "Marine energy converter power consumption cost",
             "Units": " ",
             "Group": "ME Costs - Operations",
             "IndexLabels": "",
-            "Flags": 0.0,
+            "Flags": 1.0,
             "DefaultValue": 0.0,
             "UIObject": "Default",
             "sscVariableName": "",
@@ -4626,11 +4901,11 @@
         "onshore_land_lease_cost": {
             "Version": 4.0,
             "Type": 1.0,
-            "Label": " ",
+            "Label": "Onshore land lease cost",
             "Units": " ",
             "Group": "ME Costs - Operations",
             "IndexLabels": "",
-            "Flags": 0.0,
+            "Flags": 1.0,
             "DefaultValue": 0.0,
             "UIObject": "Default",
             "sscVariableName": "",
@@ -4639,11 +4914,11 @@
         "operating_equipment_cost": {
             "Version": 4.0,
             "Type": 1.0,
-            "Label": " ",
+            "Label": "Operating equipment cost",
             "Units": " ",
             "Group": "ME Costs - Operations",
             "IndexLabels": "",
-            "Flags": 0.0,
+            "Flags": 1.0,
             "DefaultValue": 0.0,
             "UIObject": "Default",
             "sscVariableName": "",
@@ -4652,11 +4927,11 @@
         "operating_facilities_cost": {
             "Version": 4.0,
             "Type": 1.0,
-            "Label": " ",
+            "Label": "Operating facilities cost",
             "Units": " ",
             "Group": "ME Costs - Operations",
             "IndexLabels": "",
-            "Flags": 0.0,
+            "Flags": 1.0,
             "DefaultValue": 0.0,
             "UIObject": "Default",
             "sscVariableName": "",
@@ -4665,11 +4940,11 @@
         "operating_margin_cost": {
             "Version": 4.0,
             "Type": 1.0,
-            "Label": " ",
+            "Label": "Operating margin cost",
             "Units": " ",
             "Group": "ME Costs - Operations",
             "IndexLabels": "",
-            "Flags": 0.0,
+            "Flags": 1.0,
             "DefaultValue": 0.0,
             "UIObject": "Default",
             "sscVariableName": "",
@@ -4740,6 +5015,19 @@
             "sscVariableName": "",
             "sscVariableValue": ""
         },
+        "operations_management_general_administration_cost_rvalue": {
+            "Version": 4.0,
+            "Type": 1.0,
+            "Label": "Operations, management, and general admin. array scaling R-value",
+            "Units": "",
+            "Group": "ME Costs - Operations",
+            "IndexLabels": "",
+            "Flags": 2.0,
+            "DefaultValue": 0.0,
+            "UIObject": "Default",
+            "sscVariableName": "",
+            "sscVariableValue": ""
+        },
         "operations_management_general_administration_cost_total": {
             "Version": 4.0,
             "Type": 1.0,
@@ -4782,11 +5070,11 @@
         "other_business_cost": {
             "Version": 4.0,
             "Type": 1.0,
-            "Label": " ",
+            "Label": "Other business costs",
             "Units": " ",
             "Group": "ME Costs - Operations",
             "IndexLabels": "",
-            "Flags": 0.0,
+            "Flags": 1.0,
             "DefaultValue": 0.0,
             "UIObject": "Default",
             "sscVariableName": "",
@@ -4795,11 +5083,11 @@
         "other_gen_admin_cost": {
             "Version": 4.0,
             "Type": 1.0,
-            "Label": " ",
+            "Label": "Other general administration cost",
             "Units": " ",
             "Group": "ME Costs - Operations",
             "IndexLabels": "",
-            "Flags": 0.0,
+            "Flags": 1.0,
             "DefaultValue": 0.0,
             "UIObject": "Default",
             "sscVariableName": "",
@@ -4808,11 +5096,11 @@
         "other_monitoring_cost": {
             "Version": 4.0,
             "Type": 1.0,
-            "Label": " ",
+            "Label": "Other monitoring cost",
             "Units": " ",
             "Group": "ME Costs - Operations",
             "IndexLabels": "",
-            "Flags": 0.0,
+            "Flags": 1.0,
             "DefaultValue": 0.0,
             "UIObject": "Default",
             "sscVariableName": "",
@@ -4834,11 +5122,11 @@
         "professional_advisory_services_operations_cost": {
             "Version": 4.0,
             "Type": 1.0,
-            "Label": " ",
+            "Label": "Professional advisory services and operations cost",
             "Units": " ",
             "Group": "ME Costs - Operations",
             "IndexLabels": "",
-            "Flags": 0.0,
+            "Flags": 1.0,
             "DefaultValue": 0.0,
             "UIObject": "Default",
             "sscVariableName": "",
@@ -4847,11 +5135,11 @@
         "sales_general_and_administrative_operations_cost": {
             "Version": 4.0,
             "Type": 1.0,
-            "Label": " ",
+            "Label": "Sales general and administrative operations cost",
             "Units": " ",
             "Group": "ME Costs - Operations",
             "IndexLabels": "",
-            "Flags": 0.0,
+            "Flags": 1.0,
             "DefaultValue": 0.0,
             "UIObject": "Default",
             "sscVariableName": "",
@@ -4860,11 +5148,11 @@
         "submerged_land_lease_cost": {
             "Version": 4.0,
             "Type": 1.0,
-            "Label": " ",
+            "Label": "Submerged land lease cost",
             "Units": " ",
             "Group": "ME Costs - Operations",
             "IndexLabels": "",
-            "Flags": 0.0,
+            "Flags": 1.0,
             "DefaultValue": 0.0,
             "UIObject": "Default",
             "sscVariableName": "",
@@ -4873,11 +5161,11 @@
         "transmission_charges_rights_cost": {
             "Version": 4.0,
             "Type": 1.0,
-            "Label": " ",
+            "Label": "Transmission charges rights cost",
             "Units": " ",
             "Group": "ME Costs - Operations",
             "IndexLabels": "",
-            "Flags": 0.0,
+            "Flags": 1.0,
             "DefaultValue": 0.0,
             "UIObject": "Default",
             "sscVariableName": "",
@@ -4886,11 +5174,11 @@
         "weather_forecasting_cost": {
             "Version": 4.0,
             "Type": 1.0,
-            "Label": " ",
+            "Label": "Weather forecasting cost",
             "Units": " ",
             "Group": "ME Costs - Operations",
             "IndexLabels": "",
-            "Flags": 0.0,
+            "Flags": 1.0,
             "DefaultValue": 0.0,
             "UIObject": "Default",
             "sscVariableName": "",
@@ -4908,9 +5196,14 @@
         "\t{",
         "\t\treturn ${environmental_health_and_safety_monitoring_cost};",
         "\t}",
-        "\telse",
+        "\telse if (${detailed_cost_choice_env_health_safety}==1)",
         "\t{",
         "\t\treturn ${environmental_health_and_safety_monitoring_cost_total};",
+        "\t}\r",
+        "\telse {\r",
+        "\t\tb = -log(1-${environmental_health_and_safety_monitoring_cost_rvalue})/log(2);\r",
+        "\t\treturn (${environmental_health_and_safety_monitoring_cost}*pow(${number_devices},-b))*${number_devices};\r",
+        "\r",
         "\t}",
         "};",
         "",
@@ -4925,9 +5218,14 @@
         "\t{",
         "\t\treturn ${annual_leases_fees_cost};",
         "\t}",
-        "\telse",
+        "\telse if (${detailed_cost_choice_annual_leases}==1)",
         "\t{",
         "\t\treturn ${annual_leases_fees_cost_total};",
+        "\t}\r",
+        "\telse {\r",
+        "\t\tb = -log(1-${annual_leases_fees_cost_rvalue})/log(2);\r",
+        "\t\treturn (${annual_leases_fees_cost}*pow(${number_devices},-b))*${number_devices};\r",
+        "\r",
         "\t}",
         "};",
         "",
@@ -4943,9 +5241,14 @@
         "\t{",
         "\t\treturn ${operations_management_general_administration_cost};",
         "\t}",
-        "\telse",
+        "\telse if (${detailed_cost_choice_gen_admin}==1)",
         "\t{",
         "\t\treturn ${operations_management_general_administration_cost_total};",
+        "\t}\r",
+        "\telse {\r",
+        "\t\tb = -log(1-${operations_management_general_administration_cost_rvalue})/log(2);\r",
+        "\t\treturn (${operations_management_general_administration_cost}*pow(${number_devices},-b))*${number_devices};\r",
+        "\r",
         "\t}",
         "};",
         "",
@@ -4955,7 +5258,8 @@
         "\t\t\t\t0,",
         "\t\t\t\t0,",
         "\t\t\t\t2,",
-        "\t\t\t\t1",
+        "\t\t\t\t1,\r",
+        "\t\t\t\t3",
         "\t\t\t];",
         "};",
         "",
@@ -4967,12 +5271,14 @@
         "};",
         "",
         "equations {'operations_cost'} = define() {",
+        "\tarray_scaling_b_value = -log(1 - ${operations_cost_rvalue}) / log(2);\r",
         "\treturn ?${operations_cost_method}",
         "\t\t\t[",
         "\t\t\t\t${operations_cost_input}*${system_capacity},",
         "\t\t\t\t${operations_cost_input},",
         "\t\t\t\t${operations_cost_modeled},",
-        "\t\t\t\t${operations_cost_total}",
+        "\t\t\t\t${operations_cost_total},\r",
+        "\t\t\t\t(${operations_cost_input}*pow(${number_devices},-array_scaling_b_value))*${number_devices}",
         "\t\t\t];",
         "};",
         "",
@@ -4985,15 +5291,15 @@
     ],
     "Callbacks": [
         "on_load{'Marine Costs - Operations'} = define() {",
-        "\ton_change{'itemized_check_operations'};",
+        "\ton_change{'itemized_check_operations'}();",
         "\tenable_itemized_operations();",
-        "\ton_change{'detailed_cost_choice_annual_leases'};",
+        "\ton_change{'detailed_cost_choice_annual_leases'}();",
         "\tdetailed_cost_annual_leases();",
-        "\ton_change{'detailed_cost_choice_env_health_safety'};",
+        "\ton_change{'detailed_cost_choice_env_health_safety'}();",
         "\tdetailed_cost_env_health_safety();",
-        "\ton_change{'detailed_cost_choice_gen_admin'};",
+        "\ton_change{'detailed_cost_choice_gen_admin'}();",
         "\tdetailed_cost_gen_admin();",
-        "\ton_change{'operations_override_check'};",
+        "\ton_change{'operations_override_check'}();",
         "\tcheck_override_operations();",
         "};",
         "",
@@ -5019,13 +5325,14 @@
         "\tif (value('itemized_check_operations')==1)",
         "\t{",
         "\t\tdetailed_value = value('detailed_cost_choice_env_health_safety');",
-        "\t\tenable('environmental_health_and_safety_monitoring_cost',detailed_value==0);",
-        "\t\tshow('environmental_health_and_safety_monitoring_cost',detailed_value==0);",
-        "\t\tenable('environmental_health_and_safety_monitoring_cost_total',detailed_value);",
-        "\t\tshow('environmental_health_and_safety_monitoring_cost_total',detailed_value);",
-        "\t\tenable('health_safety_monitoring_cost',detailed_value);",
-        "\t\tenable('environmental_monitoring_operations_cost',detailed_value);",
-        "\t\tenable('other_monitoring_cost',detailed_value);",
+        "\t\tenable('environmental_health_and_safety_monitoring_cost',detailed_value!=1);",
+        "\t\tshow('environmental_health_and_safety_monitoring_cost',detailed_value!=1);",
+        "\t\tenable('environmental_health_and_safety_monitoring_cost_total',detailed_value==1);",
+        "\t\tshow('environmental_health_and_safety_monitoring_cost_total',detailed_value==1);",
+        "\t\tenable('health_safety_monitoring_cost',detailed_value==1);",
+        "\t\tenable('environmental_monitoring_operations_cost',detailed_value==1);",
+        "\t\tenable('other_monitoring_cost',detailed_value==1);\r",
+        "\t\tenable('environmental_health_and_safety_monitoring_cost_rvalue',detailed_value==2);",
         "\t\t",
         "\t\trefresh();",
         "\t}",
@@ -5040,15 +5347,16 @@
         "\tif (value('itemized_check_operations')==1)",
         "\t{",
         "\t\tdetailed_value = value('detailed_cost_choice_annual_leases');",
-        "\t\tenable('annual_leases_fees_cost',detailed_value==0);",
-        "\t\tshow('annual_leases_fees_cost',detailed_value==0);",
-        "\t\tenable('annual_leases_fees_cost_total',detailed_value);",
-        "\t\tshow('annual_leases_fees_cost_total',detailed_value);",
-        "\t\tenable('submerged_land_lease_cost',detailed_value);",
-        "\t\tenable('onshore_land_lease_cost',detailed_value);",
-        "\t\tenable('transmission_charges_rights_cost',detailed_value);",
-        "\t\tenable('federal_energy_regulatory_commission_fees_cost',detailed_value);",
-        "\t\tenable('other_business_cost',detailed_value);",
+        "\t\tenable('annual_leases_fees_cost',detailed_value!=1);",
+        "\t\tshow('annual_leases_fees_cost',detailed_value!=1);",
+        "\t\tenable('annual_leases_fees_cost_total',detailed_value==1);",
+        "\t\tshow('annual_leases_fees_cost_total',detailed_value==1);",
+        "\t\tenable('submerged_land_lease_cost',detailed_value==1);",
+        "\t\tenable('onshore_land_lease_cost',detailed_value==1);",
+        "\t\tenable('transmission_charges_rights_cost',detailed_value==1);",
+        "\t\tenable('federal_energy_regulatory_commission_fees_cost',detailed_value==1);",
+        "\t\tenable('other_business_cost',detailed_value==1);\r",
+        "\t\tenable('annual_leases_fees_cost_rvalue',detailed_value==2);",
         "\t\t",
         "\t\trefresh();",
         "\t}",
@@ -5063,21 +5371,22 @@
         "\tif (value('itemized_check_operations')==1)",
         "\t{",
         "\t\tdetailed_value = value('detailed_cost_choice_gen_admin');",
-        "\t\tenable('operations_management_general_administration_cost',detailed_value==0);",
-        "\t\tshow('operations_management_general_administration_cost',detailed_value==0);",
-        "\t\tenable('operations_management_general_administration_cost_total',detailed_value);",
-        "\t\tshow('operations_management_general_administration_cost_total',detailed_value);",
-        "\t\tenable('generation_planning_and_integration_cost',detailed_value);",
-        "\t\tenable('operating_facilities_cost',detailed_value);",
-        "\t\tenable('operating_equipment_cost',detailed_value);",
-        "\t\tenable('sales_general_and_administrative_operations_cost',detailed_value);",
-        "\t\tenable('marine_energy_converter_power_consumption_cost',detailed_value);",
-        "\t\tenable('weather_forecasting_cost',detailed_value);",
-        "\t\tenable('marine_management_cost',detailed_value);",
-        "\t\tenable('condition_monitoring_operations_cost',detailed_value);",
-        "\t\tenable('operating_margin_cost',detailed_value);",
-        "\t\tenable('professional_advisory_services_operations_cost',detailed_value);",
-        "\t\tenable('other_gen_admin_cost',detailed_value);",
+        "\t\tenable('operations_management_general_administration_cost',detailed_value!=1);",
+        "\t\tshow('operations_management_general_administration_cost',detailed_value!=1);",
+        "\t\tenable('operations_management_general_administration_cost_total',detailed_value==1);",
+        "\t\tshow('operations_management_general_administration_cost_total',detailed_value==1);",
+        "\t\tenable('generation_planning_and_integration_cost',detailed_value==1);",
+        "\t\tenable('operating_facilities_cost',detailed_value==1);",
+        "\t\tenable('operating_equipment_cost',detailed_value==1);",
+        "\t\tenable('sales_general_and_administrative_operations_cost',detailed_value==1);",
+        "\t\tenable('marine_energy_converter_power_consumption_cost',detailed_value==1);",
+        "\t\tenable('weather_forecasting_cost',detailed_value==1);",
+        "\t\tenable('marine_management_cost',detailed_value==1);",
+        "\t\tenable('condition_monitoring_operations_cost',detailed_value==1);",
+        "\t\tenable('operating_margin_cost',detailed_value==1);",
+        "\t\tenable('professional_advisory_services_operations_cost',detailed_value==1);",
+        "\t\tenable('other_gen_admin_cost',detailed_value==1);\r",
+        "\t\tenable('operations_management_general_administration_cost_rvalue',detailed_value==2);",
         "\t\t",
         "\t\trefresh();",
         "\t}",
@@ -5093,13 +5402,15 @@
         "\titemized_value = value('itemized_check_operations');",
         "\tenable('environmental_health_and_safety_monitoring_cost',itemized_value==1);",
         "\tenable('environmental_health_and_safety_monitoring_cost_total',itemized_value==1);",
-        "\tenable('detailed_cost_choice_env_health_safety',itemized_value==1);",
+        "\tenable('detailed_cost_choice_env_health_safety',itemized_value==1);\r",
+        "\tenable('environmental_health_and_safety_monitoring_cost_rvalue',itemized_value==1);",
         "\tenable('health_safety_monitoring_cost',itemized_value==1);",
         "\tenable('environmental_monitoring_operations_cost',itemized_value==1);",
         "\tenable('other_monitoring_cost',itemized_value==1);",
         "\tenable('annual_leases_fees_cost',itemized_value==1);",
         "\tenable('annual_leases_fees_cost_total',itemized_value==1);",
-        "\tenable('detailed_cost_choice_annual_leases',itemized_value==1);",
+        "\tenable('detailed_cost_choice_annual_leases',itemized_value==1);\r",
+        "\tenable('annual_leases_fees_cost_rvalue',itemized_value==1);",
         "\tenable('submerged_land_lease_cost',itemized_value==1);",
         "\tenable('onshore_land_lease_cost',itemized_value==1);",
         "\tenable('transmission_charges_rights_cost',itemized_value==1);",
@@ -5109,6 +5420,7 @@
         "\tenable('operations_management_general_administration_cost',itemized_value==1);",
         "\tenable('operations_management_general_administration_cost_total',itemized_value==1);",
         "\tenable('detailed_cost_choice_gen_admin',itemized_value==1);",
+        "\tenable('operations_management_general_administration_cost_rvalue',itemized_value==1);\r",
         "\tenable('generation_planning_and_integration_cost',itemized_value==1);",
         "\tenable('operating_facilities_cost',itemized_value==1);",
         "\tenable('operating_equipment_cost',itemized_value==1);",
@@ -5121,10 +5433,11 @@
         "\tenable('professional_advisory_services_operations_cost',itemized_value==1);",
         "\tenable('other_gen_admin_cost',itemized_value==1);",
         "\tenable('other_operations_cost',itemized_value==1);",
-        "\tenable('operations_cost_input',itemized_value!=2);",
+        "\tenable('operations_cost_input',itemized_value!=2);\r",
+        "\tenable('operations_cost_rvalue',itemized_value==3);",
         "\tshow('operations_cost_total',itemized_value==1);",
         "\tshow('operations_level_total_label',itemized_value==1);",
-        "\tshow('operations_cost_input',(itemized_value==0 || itemized_value==2));",
+        "\tshow('operations_cost_input',itemized_value!=1);",
         "\tshow('operations_user_input_label',(itemized_value==0 || itemized_value==2));",
         "\tif (itemized_value==1)",
         "\t{",
diff --git a/deploy/runtime/ui/Marine Costs - Other Infrastructure.json b/deploy/runtime/ui/Marine Costs - Other Infrastructure.json
index 4d75ee74a5..35676933ed 100644
--- a/deploy/runtime/ui/Marine Costs - Other Infrastructure.json	
+++ b/deploy/runtime/ui/Marine Costs - Other Infrastructure.json	
@@ -1699,7 +1699,8 @@
         "\t\t\t\t\t0,",
         "\t\t\t\t\t0,",
         "\t\t\t\t\t2,",
-        "\t\t\t\t\t1",
+        "\t\t\t\t\t1,\r",
+        "\t\t\t\t\t3",
         "\t\t\t\t];",
         "\t}",
         "\telse",
@@ -1709,12 +1710,14 @@
         "};",
         "",
         "equations {'other_infrastructure_cost'} = define() {",
+        "\tarray_scaling_b_value = -log(1 - ${other_infrastructure_cost_rvalue}) / log(2);\r",
         "\treturn ?${other_infrastructure_cost_method}",
         "\t\t\t[",
         "\t\t\t\t${other_infrastructure_cost_input}*${system_capacity},",
         "\t\t\t\t${other_infrastructure_cost_input},",
         "\t\t\t\t${other_infrastructure_cost_modeled},",
-        "\t\t\t\t${other_infrastructure_cost_total}",
+        "\t\t\t\t${other_infrastructure_cost_total},\r",
+        "\t\t\t\t(${other_infrastructure_cost_input}*pow(${number_devices},-array_scaling_b_value))*${number_devices}",
         "\t\t\t];",
         "};",
         "",
@@ -1726,10 +1729,10 @@
     ],
     "Callbacks": [
         "on_load{'Marine Costs - Other Infrastructure'} = define() {",
-        "\ton_change{'itemized_check_other_infras'};",
+        "\ton_change{'itemized_check_other_infras'}();",
         "\tenable_itemized_other_infras();",
         "\tcheck_override_other_infras();",
-        "\ton_change{'other_infras_override'};",
+        "\ton_change{'other_infras_override'}();",
         "};",
         "",
         "on_change{'other_infras_override'} = define() {",
@@ -1760,10 +1763,11 @@
         "\tenable('offshore_logistical_infrastructure_other_infras_cost',itemized_value==1);",
         "\tenable('other_infrastructure_transportation_other_infras_cost',itemized_value==1);",
         "\tenable('other_other_infras_cost',itemized_value==1);",
-        "\tenable('other_infrastructure_cost_input',itemized_value!=2);",
+        "\tenable('other_infrastructure_cost_input',itemized_value==0 || itemized_value==3);\r",
+        "\tenable('other_infrastructure_cost_rvalue',itemized_value==3);",
         "\tshow('other_infrastructure_cost_total',itemized_value==1);",
         "\tshow('other_level_label',itemized_value==1);",
-        "\tshow('other_infrastructure_cost_input',(itemized_value==0 || itemized_value==2));",
+        "\tshow('other_infrastructure_cost_input',itemized_value!=1);",
         "\tshow('other_user_input_label',(itemized_value==0 || itemized_value==2));",
         "\t//show('level_label',itemized_value==1);",
         "\t//show('level_line',itemized_value==1);",
diff --git a/deploy/runtime/ui/Marine Costs - PTO.json b/deploy/runtime/ui/Marine Costs - PTO.json
index 4cca47bc56..2ab422e052 100644
--- a/deploy/runtime/ui/Marine Costs - PTO.json	
+++ b/deploy/runtime/ui/Marine Costs - PTO.json	
@@ -1074,6 +1074,89 @@
                 }
             }
         },
+        "Numeric": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "air_turbine_cost_rvalue"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 468.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 696.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 100.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 24.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Value": {
+                    "Type": 1.0,
+                    "Double": 0.0
+                },
+                "Mode": {
+                    "Type": 3.0,
+                    "Integer": 1.0
+                },
+                "Format": {
+                    "Type": 3.0,
+                    "Integer": 0.0
+                },
+                "Decimals": {
+                    "Type": 3.0,
+                    "Integer": 3.0
+                },
+                "Prefix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Suffix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "ThousandsSep": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "Editable": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "ForeColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 0.0,
+                        "Green": 0.0,
+                        "Blue": 0.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "BackColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 255.0,
+                        "Green": 255.0,
+                        "Blue": 255.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "TabOrder": {
+                    "Type": 3.0,
+                    "Integer": -1.0
+                }
+            }
+        },
         "Numeric": {
             "Visible": 1.0,
             "ObjectProperties": {
@@ -1572,7 +1655,7 @@
                 }
             }
         },
-        "CheckBox": {
+        "Choice": {
             "Visible": 1.0,
             "ObjectProperties": {
                 "Name": {
@@ -1581,15 +1664,15 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 390.0
+                    "Integer": 477.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 696.0
+                    "Integer": 666.0
                 },
                 "Width": {
                     "Type": 3.0,
-                    "Integer": 201.0
+                    "Integer": 177.0
                 },
                 "Height": {
                     "Type": 3.0,
@@ -1599,13 +1682,13 @@
                     "Type": 5.0,
                     "String": ""
                 },
-                "Caption": {
-                    "Type": 5.0,
-                    "String": "Enter detailed costs"
+                "Items": {
+                    "Type": 6.0,
+                    "StringList": "Enter cost|Enter itemized costs|Array scaling costs"
                 },
-                "State": {
-                    "Type": 2.0,
-                    "Boolean": 0.0
+                "Selection": {
+                    "Type": 3.0,
+                    "Integer": -1.0
                 },
                 "TabOrder": {
                     "Type": 3.0,
@@ -1613,7 +1696,7 @@
                 }
             }
         },
-        "CheckBox": {
+        "Choice": {
             "Visible": 1.0,
             "ObjectProperties": {
                 "Name": {
@@ -1622,11 +1705,11 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 390.0
+                    "Integer": 477.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 906.0
+                    "Integer": 876.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -1640,13 +1723,13 @@
                     "Type": 5.0,
                     "String": ""
                 },
-                "Caption": {
-                    "Type": 5.0,
-                    "String": "Enter detailed costs"
+                "Items": {
+                    "Type": 6.0,
+                    "StringList": "Enter cost|Enter itemized costs|Array scaling costs"
                 },
-                "State": {
-                    "Type": 2.0,
-                    "Boolean": 0.0
+                "Selection": {
+                    "Type": 3.0,
+                    "Integer": -1.0
                 },
                 "TabOrder": {
                     "Type": 3.0,
@@ -1654,7 +1737,7 @@
                 }
             }
         },
-        "CheckBox": {
+        "Choice": {
             "Visible": 1.0,
             "ObjectProperties": {
                 "Name": {
@@ -1663,15 +1746,15 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 390.0
+                    "Integer": 477.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 426.0
+                    "Integer": 396.0
                 },
                 "Width": {
                     "Type": 3.0,
-                    "Integer": 174.0
+                    "Integer": 177.0
                 },
                 "Height": {
                     "Type": 3.0,
@@ -1681,13 +1764,13 @@
                     "Type": 5.0,
                     "String": ""
                 },
-                "Caption": {
-                    "Type": 5.0,
-                    "String": "Enter detailed costs"
+                "Items": {
+                    "Type": 6.0,
+                    "StringList": "Enter cost|Enter itemized costs|Array scaling costs"
                 },
-                "State": {
-                    "Type": 2.0,
-                    "Boolean": 0.0
+                "Selection": {
+                    "Type": 3.0,
+                    "Integer": -1.0
                 },
                 "TabOrder": {
                     "Type": 3.0,
@@ -1695,7 +1778,7 @@
                 }
             }
         },
-        "CheckBox": {
+        "Choice": {
             "Visible": 1.0,
             "ObjectProperties": {
                 "Name": {
@@ -1704,15 +1787,15 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 390.0
+                    "Integer": 477.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 96.0
+                    "Integer": 66.0
                 },
                 "Width": {
                     "Type": 3.0,
-                    "Integer": 219.0
+                    "Integer": 177.0
                 },
                 "Height": {
                     "Type": 3.0,
@@ -1722,13 +1805,13 @@
                     "Type": 5.0,
                     "String": ""
                 },
-                "Caption": {
-                    "Type": 5.0,
-                    "String": "Enter detailed costs"
+                "Items": {
+                    "Type": 6.0,
+                    "StringList": "Enter cost|Enter itemized costs|Array scaling costs"
                 },
-                "State": {
-                    "Type": 2.0,
-                    "Boolean": 0.0
+                "Selection": {
+                    "Type": 3.0,
+                    "Integer": -1.0
                 },
                 "TabOrder": {
                     "Type": 3.0,
@@ -1736,7 +1819,7 @@
                 }
             }
         },
-        "CheckBox": {
+        "Choice": {
             "Visible": 1.0,
             "ObjectProperties": {
                 "Name": {
@@ -1745,15 +1828,15 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 390.0
+                    "Integer": 474.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 1206.0
+                    "Integer": 1176.0
                 },
                 "Width": {
                     "Type": 3.0,
-                    "Integer": 180.0
+                    "Integer": 177.0
                 },
                 "Height": {
                     "Type": 3.0,
@@ -1763,13 +1846,13 @@
                     "Type": 5.0,
                     "String": ""
                 },
-                "Caption": {
-                    "Type": 5.0,
-                    "String": "Enter detailed costs"
+                "Items": {
+                    "Type": 6.0,
+                    "StringList": "Enter cost|Enter itemized costs|Array scaling costs"
                 },
-                "State": {
-                    "Type": 2.0,
-                    "Boolean": 0.0
+                "Selection": {
+                    "Type": 3.0,
+                    "Integer": -1.0
                 },
                 "TabOrder": {
                     "Type": 3.0,
@@ -1860,6 +1943,89 @@
                 }
             }
         },
+        "Numeric": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "electrical_generator_cost_rvalue"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 468.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 906.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 100.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 24.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Value": {
+                    "Type": 1.0,
+                    "Double": 0.0
+                },
+                "Mode": {
+                    "Type": 3.0,
+                    "Integer": 1.0
+                },
+                "Format": {
+                    "Type": 3.0,
+                    "Integer": 0.0
+                },
+                "Decimals": {
+                    "Type": 3.0,
+                    "Integer": 3.0
+                },
+                "Prefix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Suffix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "ThousandsSep": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "Editable": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "ForeColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 0.0,
+                        "Green": 0.0,
+                        "Blue": 0.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "BackColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 255.0,
+                        "Green": 255.0,
+                        "Blue": 255.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "TabOrder": {
+                    "Type": 3.0,
+                    "Integer": -1.0
+                }
+            }
+        },
         "Numeric": {
             "Visible": 1.0,
             "ObjectProperties": {
@@ -2109,6 +2275,89 @@
                 }
             }
         },
+        "Numeric": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "gearbox_cost_rvalue"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 468.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 426.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 100.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 24.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Value": {
+                    "Type": 1.0,
+                    "Double": 0.0
+                },
+                "Mode": {
+                    "Type": 3.0,
+                    "Integer": 1.0
+                },
+                "Format": {
+                    "Type": 3.0,
+                    "Integer": 0.0
+                },
+                "Decimals": {
+                    "Type": 3.0,
+                    "Integer": 3.0
+                },
+                "Prefix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Suffix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "ThousandsSep": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "Editable": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "ForeColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 0.0,
+                        "Green": 0.0,
+                        "Blue": 0.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "BackColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 255.0,
+                        "Green": 255.0,
+                        "Blue": 255.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "TabOrder": {
+                    "Type": 3.0,
+                    "Integer": -1.0
+                }
+            }
+        },
         "Numeric": {
             "Visible": 1.0,
             "ObjectProperties": {
@@ -2288,7 +2537,90 @@
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 516.0
+                    "Integer": 516.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 100.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 24.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Value": {
+                    "Type": 1.0,
+                    "Double": 0.0
+                },
+                "Mode": {
+                    "Type": 3.0,
+                    "Integer": 1.0
+                },
+                "Format": {
+                    "Type": 3.0,
+                    "Integer": 0.0
+                },
+                "Decimals": {
+                    "Type": 3.0,
+                    "Integer": 0.0
+                },
+                "Prefix": {
+                    "Type": 5.0,
+                    "String": "$"
+                },
+                "Suffix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "ThousandsSep": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "Editable": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "ForeColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 0.0,
+                        "Green": 0.0,
+                        "Blue": 0.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "BackColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 255.0,
+                        "Green": 255.0,
+                        "Blue": 255.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "TabOrder": {
+                    "Type": 3.0,
+                    "Integer": 14.0
+                }
+            }
+        },
+        "Numeric": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "hub_assembly_cost"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 468.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 756.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -2354,7 +2686,7 @@
                 },
                 "TabOrder": {
                     "Type": 3.0,
-                    "Integer": 14.0
+                    "Integer": 21.0
                 }
             }
         },
@@ -2363,15 +2695,15 @@
             "ObjectProperties": {
                 "Name": {
                     "Type": 5.0,
-                    "String": "hub_assembly_cost"
+                    "String": "hydraulic_drivetrain_cost"
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 468.0
+                    "Integer": 339.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 756.0
+                    "Integer": 66.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -2437,7 +2769,7 @@
                 },
                 "TabOrder": {
                     "Type": 3.0,
-                    "Integer": 21.0
+                    "Integer": 1.0
                 }
             }
         },
@@ -2446,15 +2778,15 @@
             "ObjectProperties": {
                 "Name": {
                     "Type": 5.0,
-                    "String": "hydraulic_drivetrain_cost"
+                    "String": "hydraulic_drivetrain_cost_rvalue"
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 339.0
+                    "Integer": 468.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 66.0
+                    "Integer": 96.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -2482,11 +2814,11 @@
                 },
                 "Decimals": {
                     "Type": 3.0,
-                    "Integer": 0.0
+                    "Integer": 3.0
                 },
                 "Prefix": {
                     "Type": 5.0,
-                    "String": "$"
+                    "String": ""
                 },
                 "Suffix": {
                     "Type": 5.0,
@@ -2520,7 +2852,7 @@
                 },
                 "TabOrder": {
                     "Type": 3.0,
-                    "Integer": 1.0
+                    "Integer": -1.0
                 }
             }
         },
@@ -5629,6 +5961,89 @@
                 }
             }
         },
+        "Numeric": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "power_electronics_cost_rvalue"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 465.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 1206.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 100.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 24.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Value": {
+                    "Type": 1.0,
+                    "Double": 0.0
+                },
+                "Mode": {
+                    "Type": 3.0,
+                    "Integer": 1.0
+                },
+                "Format": {
+                    "Type": 3.0,
+                    "Integer": 0.0
+                },
+                "Decimals": {
+                    "Type": 3.0,
+                    "Integer": 3.0
+                },
+                "Prefix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Suffix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "ThousandsSep": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "Editable": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "ForeColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 0.0,
+                        "Green": 0.0,
+                        "Blue": 0.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "BackColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 255.0,
+                        "Green": 255.0,
+                        "Blue": 255.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "TabOrder": {
+                    "Type": 3.0,
+                    "Integer": -1.0
+                }
+            }
+        },
         "Numeric": {
             "Visible": 1.0,
             "ObjectProperties": {
@@ -7396,6 +7811,19 @@
             "sscVariableName": "",
             "sscVariableValue": ""
         },
+        "air_turbine_cost_rvalue": {
+            "Version": 4.0,
+            "Type": 1.0,
+            "Label": "Air turbine array scaling R-value",
+            "Units": "",
+            "Group": "ME Costs - Power Take-off",
+            "IndexLabels": "",
+            "Flags": 2.0,
+            "DefaultValue": 0.0,
+            "UIObject": "Default",
+            "sscVariableName": "",
+            "sscVariableValue": ""
+        },
         "air_turbine_cost_total": {
             "Version": 4.0,
             "Type": 1.0,
@@ -7509,7 +7937,7 @@
             "IndexLabels": "",
             "Flags": 3.0,
             "DefaultValue": 0.0,
-            "UIObject": "CheckBox",
+            "UIObject": "Choice",
             "sscVariableName": "",
             "sscVariableValue": ""
         },
@@ -7522,7 +7950,7 @@
             "IndexLabels": "",
             "Flags": 3.0,
             "DefaultValue": 0.0,
-            "UIObject": "CheckBox",
+            "UIObject": "Choice",
             "sscVariableName": "",
             "sscVariableValue": ""
         },
@@ -7535,7 +7963,7 @@
             "IndexLabels": "",
             "Flags": 3.0,
             "DefaultValue": 0.0,
-            "UIObject": "CheckBox",
+            "UIObject": "Choice",
             "sscVariableName": "",
             "sscVariableValue": ""
         },
@@ -7548,7 +7976,7 @@
             "IndexLabels": "",
             "Flags": 3.0,
             "DefaultValue": 0.0,
-            "UIObject": "CheckBox",
+            "UIObject": "Choice",
             "sscVariableName": "",
             "sscVariableValue": ""
         },
@@ -7561,7 +7989,7 @@
             "IndexLabels": "",
             "Flags": 3.0,
             "DefaultValue": 0.0,
-            "UIObject": "CheckBox",
+            "UIObject": "Choice",
             "sscVariableName": "",
             "sscVariableValue": ""
         },
@@ -7578,6 +8006,19 @@
             "sscVariableName": "",
             "sscVariableValue": ""
         },
+        "electrical_generator_cost_rvalue": {
+            "Version": 4.0,
+            "Type": 1.0,
+            "Label": "Electrical generator array scaling R-value",
+            "Units": "",
+            "Group": "ME Costs - Power Take-off",
+            "IndexLabels": "",
+            "Flags": 0.0,
+            "DefaultValue": 0.0,
+            "UIObject": "Default",
+            "sscVariableName": "",
+            "sscVariableValue": ""
+        },
         "electrical_generator_cost_total": {
             "Version": 4.0,
             "Type": 1.0,
@@ -7630,6 +8071,19 @@
             "sscVariableName": "",
             "sscVariableValue": ""
         },
+        "gearbox_cost_rvalue": {
+            "Version": 4.0,
+            "Type": 1.0,
+            "Label": "Gearbox array scaling R-value",
+            "Units": "",
+            "Group": "ME Costs - Power Take-off",
+            "IndexLabels": "",
+            "Flags": 0.0,
+            "DefaultValue": 0.0,
+            "UIObject": "Default",
+            "sscVariableName": "",
+            "sscVariableValue": ""
+        },
         "gearbox_cost_total": {
             "Version": 4.0,
             "Type": 1.0,
@@ -7708,6 +8162,19 @@
             "sscVariableName": "",
             "sscVariableValue": ""
         },
+        "hydraulic_drivetrain_cost_rvalue": {
+            "Version": 4.0,
+            "Type": 1.0,
+            "Label": "Hydraulic drivetrain array scaling R-value",
+            "Units": "",
+            "Group": "ME Costs - Power Take-off",
+            "IndexLabels": "",
+            "Flags": 2.0,
+            "DefaultValue": 0.0,
+            "UIObject": "Default",
+            "sscVariableName": "",
+            "sscVariableValue": ""
+        },
         "hydraulic_drivetrain_cost_total": {
             "Version": 4.0,
             "Type": 1.0,
@@ -7968,6 +8435,19 @@
             "sscVariableName": "",
             "sscVariableValue": ""
         },
+        "power_electronics_cost_rvalue": {
+            "Version": 4.0,
+            "Type": 1.0,
+            "Label": "Power electronics array scaling R-value",
+            "Units": "",
+            "Group": "ME Costs - Power Take-off",
+            "IndexLabels": "",
+            "Flags": 2.0,
+            "DefaultValue": 0.0,
+            "UIObject": "Default",
+            "sscVariableName": "",
+            "sscVariableValue": ""
+        },
         "power_electronics_cost_total": {
             "Version": 4.0,
             "Type": 1.0,
@@ -8412,7 +8892,8 @@
         "\t\t\t\t\t0,",
         "\t\t\t\t\t0,",
         "\t\t\t\t\t2,",
-        "\t\t\t\t\t1",
+        "\t\t\t\t\t1,\r",
+        "\t\t\t\t\t3",
         "\t\t\t\t];",
         "\t}",
         "\telse",
@@ -8421,184 +8902,67 @@
         "\t}",
         "};",
         "",
-        "equations {'variable_hydraulic_drivetrain'} = define() {",
-        "\tif (${hydraulic_drivetrain_cost}!=0 && ${primary_hydraulic_pump_cost}!=0)",
-        "\t{",
-        "\t\treturn 1;",
-        "\t}",
-        "\telse if (${hydraulic_drivetrain_cost}!=0 && ${rectifying_circuit_cost}!=0)",
-        "\t{",
-        "\t\treturn 1;",
-        "\t}",
-        "\telse if (${hydraulic_drivetrain_cost}!=0 && ${accumulators_cost}!=0)",
-        "\t{",
-        "\t\treturn 1;",
-        "\t}",
-        "\telse if (${hydraulic_drivetrain_cost}!=0 && ${hydraulic_motor_cost}!=0)",
-        "\t{",
-        "\t\treturn 1;",
-        "\t}",
-        "\telse if (${hydraulic_drivetrain_cost}!=0 && ${valves_cost}!=0)",
-        "\t{",
-        "\t\treturn 1;",
-        "\t}",
-        "\telse if (${hydraulic_drivetrain_cost}!=0 && ${hydraulic_reservoir_cost}!=0)",
-        "\t{",
-        "\t\treturn 1;",
-        "\t}",
-        "\telse if (${hydraulic_drivetrain_cost}!=0 && ${plumbing_fittings_cost}!=0)",
-        "\t{",
-        "\t\treturn 1;",
-        "\t}",
-        "\telse if (${hydraulic_drivetrain_cost}!=0 && ${other_hydraulic_drivetrain_cost}!=0)",
-        "\t{",
-        "\t\treturn 1;",
-        "\t}",
-        "\telse",
-        "\t{",
-        "\t\treturn 0;",
-        "\t}",
-        "};",
-        "",
         "equations {'hydraulic_drivetrain_cost_total_check'} = define() {",
+        "\tb = -log(1-${hydraulic_drivetrain_cost_rvalue})/log(2);\r",
         "\tif (${detailed_cost_choice_hydraulic_drivetrain}==0)",
-        "\t\t{",
-        "\t\t\treturn ${hydraulic_drivetrain_cost};",
-        "\t\t}",
-        "\t\telse",
-        "\t\t{",
-        "\t\t\treturn ${hydraulic_drivetrain_cost_total};",
-        "\t\t}",
-        "};",
-        "\t",
-        "equations {'variable_gearbox'} = define() {",
-        "\tif (${gearbox_cost}!=0 && ${gears_cost}!=0)",
-        "\t{",
-        "\t\treturn 1;",
-        "\t}",
-        "\telse if (${gearbox_cost}!=0 && ${bearings_cost}!=0)",
-        "\t{",
-        "\t\treturn 1;",
-        "\t}",
-        "\telse if (${gearbox_cost}!=0 && ${housing_cost}!=0)",
-        "\t{",
-        "\t\treturn 1;",
-        "\t}",
-        "\telse if (${gearbox_cost}!=0 && ${sensors_cost}!=0)",
-        "\t{",
-        "\t\treturn 1;",
-        "\t}",
-        "\telse if (${gearbox_cost}!=0 && ${lube_system_cost}!=0)",
-        "\t{",
-        "\t\treturn 1;",
-        "\t}",
-        "\telse if (${gearbox_cost}!=0 && ${cooling_system_gearbox_cost}!=0)",
-        "\t{",
-        "\t\treturn 1;",
-        "\t}",
-        "\telse if (${gearbox_cost}!=0 && ${other_gearbox_cost}!=0)",
         "\t{",
-        "\t\treturn 1;",
+        "\t\treturn ${hydraulic_drivetrain_cost};",
         "\t}",
-        "\telse",
+        "\telse if (${detailed_cost_choice_hydraulic_drivetrain}==1)",
         "\t{",
-        "\t\treturn 0;",
+        "\t\treturn ${hydraulic_drivetrain_cost_total};",
+        "\t}\r",
+        "\telse {\r",
+        "\t\tb = -log(1-${hydraulic_drivetrain_cost_rvalue})/log(2);\r",
+        "\t\treturn (${hydraulic_drivetrain_cost}*pow(${number_devices},-b))*${number_devices};\r",
         "\t}",
         "};",
         "",
         "equations {'gearbox_cost_total_check'} = define() {",
         "\tif (${detailed_cost_choice_gearbox}==0) ",
-        "\t\t{",
-        "\t\t\treturn ${gearbox_cost};",
-        "\t\t}",
-        "\telse",
-        "\t\t{",
-        "\t\t\treturn ${gearbox_cost_total};",
-        "\t\t}",
-        "};",
-        "",
-        "equations {'variable_air_turbine'} = define() {",
-        "\tif (${air_turbine_cost}!=0 && ${blades_rotor_assembly_cost}!=0)",
         "\t{",
-        "\t\treturn 1;",
-        "\t}",
-        "\telse if (${air_turbine_cost}!=0 && ${hub_assembly_cost}!=0)",
-        "\t{",
-        "\t\treturn 1;",
-        "\t}",
-        "\telse if (${air_turbine_cost}!=0 && ${shaft_assembly_cost}!=0)",
-        "\t{",
-        "\t\treturn 1;",
-        "\t}",
-        "\telse if (${air_turbine_cost}!=0 && ${turbine_bearings_cost}!=0)",
-        "\t{",
-        "\t\treturn 1;",
-        "\t}",
-        "\telse if (${air_turbine_cost}!=0 && ${other_air_turbine_cost}!=0)",
-        "\t{",
-        "\t\treturn 1;",
+        "\t\treturn ${gearbox_cost};",
         "\t}",
-        "\telse",
+        "\telse if (${detailed_cost_choice_gearbox}==1) ",
         "\t{",
-        "\t\treturn 0;",
+        "\t\treturn ${gearbox_cost_total};",
+        "\t}\r",
+        "\telse {\r",
+        "\t\tb = -log(1-${gearbox_cost_rvalue})/log(2);\r",
+        "\t\treturn (${gearbox_cost}*pow(${number_devices},-b))*${number_devices};\r",
         "\t}",
         "};",
         "",
+        "",
         "equations {'air_turbine_cost_total_check'} = define() {",
         "\tif (${detailed_cost_choice_air_turbine}==0)",
-        "\t\t{",
-        "\t\t\treturn ${air_turbine_cost};",
-        "\t\t}",
-        "\t\telse",
-        "\t\t{",
-        "\t\t\treturn ${air_turbine_cost_total};",
-        "\t\t}",
-        "};",
-        "",
-        "equations {'variable_electrical_generator'} = define() {",
-        "\tif (${electrical_generator_cost}!=0 && ${cooling_system_cost}!=0)",
-        "\t{",
-        "\t\treturn 1;",
-        "\t}",
-        "\telse if (${electrical_generator_cost}!=0 && ${lubrication_system_cost}!=0)",
-        "\t{",
-        "\t\treturn 1;",
-        "\t}",
-        "\telse if (${electrical_generator_cost}!=0 && ${rotors_cost}!=0)",
-        "\t{",
-        "\t\treturn 1;",
-        "\t}",
-        "\telse if (${electrical_generator_cost}!=0 && ${sensors_elec_gen_cost}!=0)",
-        "\t{",
-        "\t\treturn 1;",
-        "\t}",
-        "\telse if (${electrical_generator_cost}!=0 && ${stator_cost}!=0)",
-        "\t{",
-        "\t\treturn 1;",
-        "\t}",
-        "\telse if (${electrical_generator_cost}!=0 && ${struct_and_mechanical_cost}!=0)",
-        "\t{",
-        "\t\treturn 1;",
-        "\t}",
-        "\telse if (${electrical_generator_cost}!=0 && ${other_electrical_generator_cost}!=0)",
         "\t{",
-        "\t\treturn 1;",
+        "\t\treturn ${air_turbine_cost};",
         "\t}",
-        "\telse",
+        "\telse if (${detailed_cost_choice_air_turbine}==1)",
         "\t{",
-        "\t\treturn 0;",
+        "\t\treturn ${air_turbine_cost_total};",
+        "\t}\r",
+        "\telse {\r",
+        "\t\tb = -log(1-${air_turbine_cost_rvalue})/log(2);\r",
+        "\t\treturn (${air_turbine_cost}*pow(${number_devices},-b))*${number_devices};\r",
         "\t}",
         "};",
         "",
+        "",
         "equations {'electrical_generator_cost_total_check'} = define() {",
         "\tif (${detailed_cost_choice_electrical_generator}==0)",
-        "\t\t{",
-        "\t\t\treturn ${electrical_generator_cost};",
-        "\t\t}",
-        "\t\telse",
-        "\t\t{",
-        "\t\t\treturn ${electrical_generator_cost_total};",
-        "\t\t}",
+        "\t{",
+        "\t\treturn ${electrical_generator_cost};",
+        "\t}",
+        "\telse if (${detailed_cost_choice_electrical_generator}==1)",
+        "\t{",
+        "\t\treturn ${electrical_generator_cost_total};",
+        "\t}\r",
+        "\telse {\r",
+        "\t\tb = -log(1-${electrical_generator_cost_rvalue})/log(2);\r",
+        "\t\treturn (${electrical_generator_cost}*pow(${number_devices},-b))*${number_devices};\r",
+        "\t}",
         "};",
         "",
         "equations {'variable_power_electronics'} = define() {",
@@ -8626,13 +8990,18 @@
         "",
         "equations {'power_electronics_cost_total_check'} = define() {",
         "\tif (${detailed_cost_choice_power_electronics}==0)",
-        "\t\t{",
-        "\t\t\treturn ${power_electronics_cost};",
-        "\t\t}",
-        "\t\telse",
-        "\t\t{",
-        "\t\t\treturn ${power_electronics_cost_total};",
-        "\t\t}",
+        "\t{",
+        "\t\treturn ${power_electronics_cost};",
+        "\t}",
+        "\telse if (${detailed_cost_choice_power_electronics}==1)",
+        "\t{",
+        "\t\treturn ${power_electronics_cost_total};",
+        "\t}\r",
+        "\telse {\r",
+        "\t\tb = -log(1-${power_electronics_cost_rvalue})/log(2);\r",
+        "\t\treturn (${power_electronics_cost}*pow(${number_devices},-b))*${number_devices};\r",
+        "\r",
+        "\t}",
         "};",
         "",
         "equations {'power_takeoff_system_cost_total'} = define() {",
@@ -8644,12 +9013,15 @@
         "};",
         "",
         "equations {'power_takeoff_system_cost'} = define() {",
+        "\tarray_scaling_b_value = -log(1-${power_takeoff_system_cost_rvalue})/ log(2);\r",
         "\treturn ?${power_takeoff_system_cost_method}",
         "\t\t\t[",
         "\t\t\t\t${power_takeoff_system_cost_input}*${system_capacity},",
         "\t\t\t\t${power_takeoff_system_cost_input},",
         "\t\t\t\t${power_takeoff_system_cost_modeled},",
-        "\t\t\t\t${power_takeoff_system_cost_total}",
+        "\t\t\t\t${power_takeoff_system_cost_total},\r",
+        "\t\t\t\t(${power_takeoff_system_cost_input}*pow(${number_devices},-array_scaling_b_value))*${number_devices}\r",
+        "\t\t\t\t",
         "\t\t\t];",
         "};",
         "",
@@ -8664,8 +9036,8 @@
     "Callbacks": [
         "on_load{'Marine Costs - PTO'} = define() {",
         "\tcheck_override_pto();",
-        "\ton_change{'pto_override'};",
-        "\ton_change{'itemized_check_pto'};",
+        "\ton_change{'pto_override'}();",
+        "\ton_change{'itemized_check_pto'}();",
         "\tenable_itemized_pto();",
         "\t/*on_change{'variable_hydraulic_drivetrain'};",
         "\tshow_hydraulic_drivetrain_warning();",
@@ -8677,11 +9049,11 @@
         "\tshow_electrical_generator_warning();",
         "\ton_change{'variable_power_electronics'};",
         "\tshow_power_electronics_warning();*/",
-        "\ton_change{'detailed_cost_choice_hydraulic_drivetrain'};",
-        "\ton_change{'detailed_cost_choice_gearbox'};",
-        "\ton_change{'detailed_cost_choice_air_turbine'};",
-        "\ton_change{'detailed_cost_choice_electrical_generator'};",
-        "\ton_change{'detailed_cost_choice_power_electronics'};",
+        "\ton_change{'detailed_cost_choice_hydraulic_drivetrain'}();",
+        "\ton_change{'detailed_cost_choice_gearbox'}();",
+        "\ton_change{'detailed_cost_choice_air_turbine'}();",
+        "\ton_change{'detailed_cost_choice_electrical_generator'}();",
+        "\ton_change{'detailed_cost_choice_power_electronics'}();",
         "\tdetailed_cost_hydraulic_drivetrain();",
         "\tdetailed_cost_gearbox();",
         "\tdetailed_cost_air_turbine();",
@@ -8718,19 +9090,20 @@
         "\tif (value('itemized_check_pto')==1)",
         "\t{",
         "\t\tdetailed_value = value('detailed_cost_choice_hydraulic_drivetrain');",
-        "\t\tenable('hydraulic_drivetrain_cost',detailed_value==0);",
-        "\t\tshow('hydraulic_drivetrain_cost',detailed_value==0);",
-        "\t\tenable('hydraulic_drivetrain_cost_total',detailed_value);",
-        "\t\tshow('hydraulic_drivetrain_cost_total',detailed_value);",
-        "\t\tenable('primary_hydraulic_pump_cost',detailed_value);",
-        "\t\tenable('rectifying_circuit_cost',detailed_value);",
-        "\t\tenable('accumulators_cost',detailed_value);",
-        "\t\tenable('hydraulic_motor_cost',detailed_value);",
-        "\t\tenable('valves_cost',detailed_value);",
-        "\t\tenable('hydraulic_reservoir_cost',detailed_value);",
-        "\t\tenable('hydraulic_fluid_cost',detailed_value);",
-        "\t\tenable('plumbing_fittings_cost',detailed_value);",
-        "\t\tenable('other_hydraulic_drivetrain_cost',detailed_value);",
+        "\t\tenable('hydraulic_drivetrain_cost',detailed_value!=1);",
+        "\t\tshow('hydraulic_drivetrain_cost',detailed_value!=1);",
+        "\t\tenable('hydraulic_drivetrain_cost_total',detailed_value==1);",
+        "\t\tshow('hydraulic_drivetrain_cost_total',detailed_value==1);",
+        "\t\tenable('primary_hydraulic_pump_cost',detailed_value==1);",
+        "\t\tenable('rectifying_circuit_cost',detailed_value==1);",
+        "\t\tenable('accumulators_cost',detailed_value==1);",
+        "\t\tenable('hydraulic_motor_cost',detailed_value==1);",
+        "\t\tenable('valves_cost',detailed_value==1);",
+        "\t\tenable('hydraulic_reservoir_cost',detailed_value==1);",
+        "\t\tenable('hydraulic_fluid_cost',detailed_value==1);",
+        "\t\tenable('plumbing_fittings_cost',detailed_value==1);",
+        "\t\tenable('other_hydraulic_drivetrain_cost',detailed_value==1);\r",
+        "\t\tenable('hydraulic_drivetrain_cost_rvalue',detailed_value==2);",
         "\t\t",
         "\t\trefresh();",
         "\t}",
@@ -8745,17 +9118,18 @@
         "\tif (value('itemized_check_pto')==1)",
         "\t{",
         "\t\tdetailed_value = value('detailed_cost_choice_gearbox');",
-        "\t\tenable('gearbox_cost',detailed_value==0);",
-        "\t\tshow('gearbox_cost',detailed_value==0);",
-        "\t\tenable('gearbox_cost_total',detailed_value);",
-        "\t\tshow('gearbox_cost_total',detailed_value);",
-        "\t\tenable('gears_cost',detailed_value);",
-        "\t\tenable('bearings_cost',detailed_value);",
-        "\t\tenable('housing_cost',detailed_value);",
-        "\t\tenable('sensors_cost',detailed_value);",
-        "\t\tenable('lube_system_cost',detailed_value);",
-        "\t\tenable('cooling_system_gearbox_cost',detailed_value);",
-        "\t\tenable('other_gearbox_cost',detailed_value);",
+        "\t\tenable('gearbox_cost',detailed_value!=1);",
+        "\t\tshow('gearbox_cost',detailed_value!=1);",
+        "\t\tenable('gearbox_cost_total',detailed_value==1);",
+        "\t\tshow('gearbox_cost_total',detailed_value==1);",
+        "\t\tenable('gears_cost',detailed_value==1);",
+        "\t\tenable('bearings_cost',detailed_value==1);",
+        "\t\tenable('housing_cost',detailed_value==1);",
+        "\t\tenable('sensors_cost',detailed_value==1);",
+        "\t\tenable('lube_system_cost',detailed_value==1);",
+        "\t\tenable('cooling_system_gearbox_cost',detailed_value==1);",
+        "\t\tenable('other_gearbox_cost',detailed_value==1);\r",
+        "\t\tenable('gearbox_cost_rvalue',detailed_value==2);",
         "\t\t",
         "\t\trefresh();",
         "\t}",
@@ -8770,15 +9144,16 @@
         "\tif (value('itemized_check_pto')==1)",
         "\t{",
         "\t\tdetailed_value = value('detailed_cost_choice_air_turbine');",
-        "\t\tenable('air_turbine_cost',detailed_value==0);",
-        "\t\tshow('air_turbine_cost',detailed_value==0);",
-        "\t\tenable('air_turbine_cost_total',detailed_value);",
-        "\t\tshow('air_turbine_cost_total',detailed_value);",
-        "\t\tenable('blades_rotor_assembly_cost',detailed_value);",
-        "\t\tenable('hub_assembly_cost',detailed_value);",
-        "\t\tenable('shaft_assembly_cost',detailed_value);",
-        "\t\tenable('turbine_bearings_cost',detailed_value);",
-        "\t\tenable('other_air_turbine_cost',detailed_value);",
+        "\t\tenable('air_turbine_cost',detailed_value!=1);",
+        "\t\tshow('air_turbine_cost',detailed_value!=1);",
+        "\t\tenable('air_turbine_cost_total',detailed_value==1);",
+        "\t\tshow('air_turbine_cost_total',detailed_value==1);",
+        "\t\tenable('blades_rotor_assembly_cost',detailed_value==1);",
+        "\t\tenable('hub_assembly_cost',detailed_value==1);",
+        "\t\tenable('shaft_assembly_cost',detailed_value==1);",
+        "\t\tenable('turbine_bearings_cost',detailed_value==1);",
+        "\t\tenable('other_air_turbine_cost',detailed_value==1);\r",
+        "\t\tenable('air_turbine_cost_rvalue',detailed_value==2);",
         "\t\t",
         "\t\trefresh();",
         "\t}",
@@ -8793,17 +9168,18 @@
         "\tif (value('itemized_check_pto')==1)",
         "\t{",
         "\t\tdetailed_value = value('detailed_cost_choice_electrical_generator');",
-        "\t\tenable('electrical_generator_cost',detailed_value==0);",
-        "\t\tshow('electrical_generator_cost',detailed_value==0);",
-        "\t\tenable('electrical_generator_cost_total',detailed_value);",
-        "\t\tshow('electrical_generator_cost_total',detailed_value);",
-        "\t\tenable('cooling_system_cost',detailed_value);",
-        "\t\tenable('lubrication_system_cost',detailed_value);",
-        "\t\tenable('rotors_cost',detailed_value);",
-        "\t\tenable('sensor_elec_gen_cost',detailed_value);",
-        "\t\tenable('stator_cost',detailed_value);",
-        "\t\tenable('struct_and_mechanical_cost',detailed_value);",
-        "\t\tenable('other_electrical_generator_cost',detailed_value);",
+        "\t\tenable('electrical_generator_cost',detailed_value!=1);",
+        "\t\tshow('electrical_generator_cost',detailed_value!=1);",
+        "\t\tenable('electrical_generator_cost_total',detailed_value==1);",
+        "\t\tshow('electrical_generator_cost_total',detailed_value==1);",
+        "\t\tenable('cooling_system_cost',detailed_value==1);",
+        "\t\tenable('lubrication_system_cost',detailed_value==1);",
+        "\t\tenable('rotors_cost',detailed_value==1);",
+        "\t\tenable('sensor_elec_gen_cost',detailed_value==1);",
+        "\t\tenable('stator_cost',detailed_value==1);",
+        "\t\tenable('struct_and_mechanical_cost',detailed_value==1);",
+        "\t\tenable('other_electrical_generator_cost',detailed_value==1);\r",
+        "\t\tenable('electrical_generator_cost_rvalue',detailed_value==2);",
         "\t\t",
         "\t\trefresh();",
         "\t}",
@@ -8818,14 +9194,15 @@
         "\tif (value('itemized_check_pto')==1)",
         "\t{",
         "\t\tdetailed_value = value('detailed_cost_choice_power_electronics');",
-        "\t\tenable('power_electronics_cost',detailed_value==0);",
-        "\t\tshow('power_electronics_cost',detailed_value==0);",
-        "\t\tenable('power_electronics_cost_total',detailed_value);",
-        "\t\tshow('power_electronics_cost_total',detailed_value);",
-        "\t\tenable('frequency_converter_cost',detailed_value);",
-        "\t\tenable('power_electrical_system_cost',detailed_value);",
-        "\t\tenable('scada_cost',detailed_value);",
-        "\t\tenable('other_power_electronics_cost',detailed_value);",
+        "\t\tenable('power_electronics_cost',detailed_value!=1);",
+        "\t\tshow('power_electronics_cost',detailed_value!=1);",
+        "\t\tenable('power_electronics_cost_total',detailed_value==1);",
+        "\t\tshow('power_electronics_cost_total',detailed_value==1);",
+        "\t\tenable('frequency_converter_cost',detailed_value==1);",
+        "\t\tenable('power_electrical_system_cost',detailed_value==1);",
+        "\t\tenable('scada_cost',detailed_value==1);",
+        "\t\tenable('other_power_electronics_cost',detailed_value==1);\r",
+        "\t\tenable('power_electronics_cost_rvalue',detailed_value==2);",
         "\t\t",
         "\t\trefresh();",
         "\t}",
@@ -8846,7 +9223,8 @@
         "\tenable('detailed_cost_choice_gearbox',itemized_value==1);",
         "\tenable('detailed_cost_choice_hydraulic_drivetrain',itemized_value==1);",
         "\tenable('hydraulic_drivetrain_cost',itemized_value==1);",
-        "\tenable('hydraulic_drivetrain_cost_total',itemized_value==1);",
+        "\tenable('hydraulic_drivetrain_cost_total',itemized_value==1);\r",
+        "\tenable('hydraulic_drivetrain_cost_rvalue', itemized_value==1);",
         "\tenable('primary_hydraulic_pump_cost',itemized_value==1);",
         "\tenable('rectifying_circuit_cost',itemized_value==1);",
         "\tenable('accumulators_cost',itemized_value==1);",
@@ -8857,7 +9235,8 @@
         "\tenable('plumbing_fittings_cost',itemized_value==1);",
         "\tenable('other_hydraulic_drivetrain_cost',itemized_value==1);",
         "\tenable('gearbox_cost',itemized_value==1);",
-        "\tenable('gearbox_cost_total',itemized_value==1);",
+        "\tenable('gearbox_cost_total',itemized_value==1);\r",
+        "\tenable('gearbox_cost_rvalue', itemized_value==1);",
         "\tenable('gears_cost',itemized_value==1);",
         "\tenable('bearings_cost',itemized_value==1);",
         "\tenable('housing_cost',itemized_value==1);",
@@ -8866,14 +9245,16 @@
         "\tenable('cooling_system_gearbox_cost',itemized_value==1);",
         "\tenable('other_gearbox_cost',itemized_value==1);",
         "\tenable('air_turbine_cost',itemized_value==1);",
-        "\tenable('air_turbine_cost_total',itemized_value==1);",
+        "\tenable('air_turbine_cost_total',itemized_value==1);\r",
+        "\tenable('air_turbine_cost_rvalue',itemized_value==1);",
         "\tenable('blades_rotor_assembly_cost',itemized_value==1);",
         "\tenable('hub_assembly_cost',itemized_value==1);",
         "\tenable('shaft_assembly_cost',itemized_value==1);",
         "\tenable('turbine_bearings_cost',itemized_value==1);",
         "\tenable('other_air_turbine_cost',itemized_value==1);",
         "\tenable('electrical_generator_cost',itemized_value==1);",
-        "\tenable('electrical_generator_cost_total',itemized_value==1);",
+        "\tenable('electrical_generator_cost_total',itemized_value==1);\r",
+        "\tenable('electrical_generator_cost_rvalue',itemized_value==1);",
         "\tenable('cooling_system_cost',itemized_value==1);",
         "\tenable('lubrication_system_cost',itemized_value==1);",
         "\tenable('rotors_cost',itemized_value==1);",
@@ -8883,7 +9264,8 @@
         "\tenable('other_electrical_generator_cost',itemized_value==1);",
         "\tenable('shortterm_energy_storage_cost',itemized_value==1);",
         "\tenable('power_electronics_cost',itemized_value==1);",
-        "\tenable('power_electronics_cost_total',itemized_value==1);",
+        "\tenable('power_electronics_cost_total',itemized_value==1);\r",
+        "\tenable('power_electronics_cost_rvalue',itemized_value==1);",
         "\tenable('frequency_converter_cost',itemized_value==1);",
         "\tenable('power_electrical_system_cost',itemized_value==1);",
         "\tenable('scada_cost',itemized_value==1);",
@@ -8892,9 +9274,10 @@
         "\tenable('coatings_pto_cost',itemized_value==1);",
         "\tenable('transport_power_conversion_chain_cost',itemized_value==1);",
         "\tenable('other_pto_cost',itemized_value==1);",
-        "\tenable('test_num',itemized_value==1);",
-        "\tenable('power_takeoff_system_cost_input',itemized_value!=2);",
-        "\tshow('power_takeoff_system_cost_input',(itemized_value==0 || itemized_value==2));",
+        "\tenable('test_num',itemized_value==1);\r",
+        "\tshow('power_takeoff_system_cost_input',itemized_value!=1);",
+        "\tenable('power_takeoff_system_cost_input',itemized_value==0 || itemized_value==3);\r",
+        "\tenable('power_takeoff_system_cost_rvalue',itemized_value==3);",
         "\t//show('power_takeoff_system_cost_input_label',(itemized_value==0 || itemized_value==2));",
         "\tshow('power_takeoff_system_cost_total',itemized_value==1);",
         "\t//show('power_takeoff_system_total_label',itemized_value==1);",
diff --git a/deploy/runtime/ui/Marine Costs - Site Access, Port & Staging.json b/deploy/runtime/ui/Marine Costs - Site Access, Port & Staging.json
index 9d53378029..d1b0414686 100644
--- a/deploy/runtime/ui/Marine Costs - Site Access, Port & Staging.json	
+++ b/deploy/runtime/ui/Marine Costs - Site Access, Port & Staging.json	
@@ -578,7 +578,7 @@
                 }
             }
         },
-        "CheckBox": {
+        "Choice": {
             "Visible": 1.0,
             "ObjectProperties": {
                 "Name": {
@@ -587,15 +587,15 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 345.0
+                    "Integer": 477.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 402.0
+                    "Integer": 372.0
                 },
                 "Width": {
                     "Type": 3.0,
-                    "Integer": 150.0
+                    "Integer": 177.0
                 },
                 "Height": {
                     "Type": 3.0,
@@ -605,13 +605,13 @@
                     "Type": 5.0,
                     "String": ""
                 },
-                "Caption": {
-                    "Type": 5.0,
-                    "String": "Enter detailed costs"
+                "Items": {
+                    "Type": 6.0,
+                    "StringList": "Enter cost|Enter itemized costs|Array scaling costs"
                 },
-                "State": {
-                    "Type": 2.0,
-                    "Boolean": 0.0
+                "Selection": {
+                    "Type": 3.0,
+                    "Integer": -1.0
                 },
                 "TabOrder": {
                     "Type": 3.0,
@@ -619,7 +619,7 @@
                 }
             }
         },
-        "CheckBox": {
+        "Choice": {
             "Visible": 1.0,
             "ObjectProperties": {
                 "Name": {
@@ -628,15 +628,15 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 348.0
+                    "Integer": 477.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 102.0
+                    "Integer": 72.0
                 },
                 "Width": {
                     "Type": 3.0,
-                    "Integer": 237.0
+                    "Integer": 177.0
                 },
                 "Height": {
                     "Type": 3.0,
@@ -646,13 +646,13 @@
                     "Type": 5.0,
                     "String": ""
                 },
-                "Caption": {
-                    "Type": 5.0,
-                    "String": "Enter detailed costs"
+                "Items": {
+                    "Type": 6.0,
+                    "StringList": "Enter cost|Enter itemized costs|Array scaling costs"
                 },
-                "State": {
-                    "Type": 2.0,
-                    "Boolean": 0.0
+                "Selection": {
+                    "Type": 3.0,
+                    "Integer": -1.0
                 },
                 "TabOrder": {
                     "Type": 3.0,
@@ -2006,6 +2006,89 @@
                 }
             }
         },
+        "Numeric": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "port_fees_cost_rvalue"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 468.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 402.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 100.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 24.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Value": {
+                    "Type": 1.0,
+                    "Double": 0.0
+                },
+                "Mode": {
+                    "Type": 3.0,
+                    "Integer": 1.0
+                },
+                "Format": {
+                    "Type": 3.0,
+                    "Integer": 0.0
+                },
+                "Decimals": {
+                    "Type": 3.0,
+                    "Integer": 3.0
+                },
+                "Prefix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Suffix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "ThousandsSep": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "Editable": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "ForeColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 0.0,
+                        "Green": 0.0,
+                        "Blue": 0.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "BackColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 255.0,
+                        "Green": 255.0,
+                        "Blue": 255.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "TabOrder": {
+                    "Type": 3.0,
+                    "Integer": -1.0
+                }
+            }
+        },
         "Numeric": {
             "Visible": 1.0,
             "ObjectProperties": {
@@ -2545,6 +2628,89 @@
                 }
             }
         },
+        "Numeric": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "staging_port_cost_rvalue"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 468.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 102.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 100.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 24.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Value": {
+                    "Type": 1.0,
+                    "Double": 0.0
+                },
+                "Mode": {
+                    "Type": 3.0,
+                    "Integer": 1.0
+                },
+                "Format": {
+                    "Type": 3.0,
+                    "Integer": 0.0
+                },
+                "Decimals": {
+                    "Type": 3.0,
+                    "Integer": 3.0
+                },
+                "Prefix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Suffix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "ThousandsSep": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "Editable": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "ForeColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 0.0,
+                        "Green": 0.0,
+                        "Blue": 0.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "BackColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 255.0,
+                        "Green": 255.0,
+                        "Blue": 255.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "TabOrder": {
+                    "Type": 3.0,
+                    "Integer": -1.0
+                }
+            }
+        },
         "Numeric": {
             "Visible": 1.0,
             "ObjectProperties": {
@@ -2933,7 +3099,7 @@
             "IndexLabels": "",
             "Flags": 3.0,
             "DefaultValue": 0.0,
-            "UIObject": "CheckBox",
+            "UIObject": "Choice",
             "sscVariableName": "",
             "sscVariableValue": ""
         },
@@ -2946,7 +3112,7 @@
             "IndexLabels": "",
             "Flags": 3.0,
             "DefaultValue": 0.0,
-            "UIObject": "CheckBox",
+            "UIObject": "Choice",
             "sscVariableName": "",
             "sscVariableValue": ""
         },
@@ -3067,6 +3233,19 @@
             "sscVariableName": "",
             "sscVariableValue": ""
         },
+        "port_fees_cost_rvalue": {
+            "Version": 4.0,
+            "Type": 1.0,
+            "Label": "Port fees array scaling R-value",
+            "Units": "",
+            "Group": "ME Costs - Access Port Staging",
+            "IndexLabels": "",
+            "Flags": 0.0,
+            "DefaultValue": 0.0,
+            "UIObject": "Default",
+            "sscVariableName": "",
+            "sscVariableValue": ""
+        },
         "port_fees_cost_total": {
             "Version": 4.0,
             "Type": 1.0,
@@ -3236,6 +3415,19 @@
             "sscVariableName": "",
             "sscVariableValue": ""
         },
+        "staging_port_cost_rvalue": {
+            "Version": 4.0,
+            "Type": 1.0,
+            "Label": "Staging port array scaling R-value",
+            "Units": "",
+            "Group": "ME Costs - Access Port Staging",
+            "IndexLabels": "",
+            "Flags": 2.0,
+            "DefaultValue": 0.0,
+            "UIObject": "Default",
+            "sscVariableName": "",
+            "sscVariableValue": ""
+        },
         "staging_port_cost_total": {
             "Version": 4.0,
             "Type": 1.0,
@@ -3288,9 +3480,14 @@
         "\t{",
         "\t\treturn ${staging_port_cost};",
         "\t}",
-        "\telse",
+        "\telse if (${detailed_cost_choice_staging_port}==1)",
         "\t{",
         "\t\treturn ${staging_port_cost_total};",
+        "\t}\r",
+        "\telse {\r",
+        "\t\tb = -log(1-${staging_port_cost_rvalue})/log(2);\r",
+        "\t\treturn (${staging_port_cost}*pow(${number_devices},-b))*${number_devices};\r",
+        "\r",
         "\t}",
         "};",
         "",
@@ -3304,9 +3501,14 @@
         "\t{",
         "\t\treturn ${port_fees_cost};",
         "\t}",
-        "\telse",
+        "\telse if (${detailed_cost_choice_port_fees}==1)",
         "\t{",
         "\t\treturn ${port_fees_cost_total};",
+        "\t}\r",
+        "\telse {\r",
+        "\t\tb = -log(1-${port_fees_cost_rvalue})/log(2);\r",
+        "\t\treturn (${port_fees_cost}*pow(${number_devices},-b))*${number_devices};\r",
+        "\r",
         "\t}",
         "};",
         "",
@@ -3316,12 +3518,14 @@
         "};",
         "",
         "equations {'site_access_port_staging_cost'} = define() {",
+        "\tarray_scaling_b_value = -log(1 - ${site_access_port_staging_cost_rvalue}) / log(2);\r",
         "\treturn ?${site_access_port_staging_cost_method}",
         "\t\t\t[",
         "\t\t\t\t${site_access_port_staging_cost_input}*${system_capacity},",
         "\t\t\t\t${site_access_port_staging_cost_input},",
         "\t\t\t\t${site_access_port_staging_cost_modeled_ui},",
-        "\t\t\t\t${site_access_port_staging_cost_total}",
+        "\t\t\t\t${site_access_port_staging_cost_total},\r",
+        "\t\t\t\t(${site_access_port_staging_cost_input}*pow(${number_devices},-array_scaling_b_value))*${number_devices}",
         "\t\t\t];",
         "};",
         "",
@@ -3333,7 +3537,8 @@
         "\t\t\t\t\t0,",
         "\t\t\t\t\t0,",
         "\t\t\t\t\t2,",
-        "\t\t\t\t\t1",
+        "\t\t\t\t\t1,\r",
+        "\t\t\t\t\t3",
         "\t\t\t\t];",
         "\t}",
         "\telse",
@@ -3355,15 +3560,15 @@
     ],
     "Callbacks": [
         "on_load{'Marine Costs - Site Access, Port & Staging'} = define() {",
-        "\ton_change{'itemized_check_site_access'};",
+        "\ton_change{'itemized_check_site_access'}();",
         "\tenable_itemized_site_access();",
-        "\ton_change{'detailed_cost_choice_port_fees'};",
+        "\ton_change{'detailed_cost_choice_port_fees'}();",
         "\tdetailed_cost_port_fees();",
-        "\ton_change{'detailed_cost_choice_staging_port'};",
+        "\ton_change{'detailed_cost_choice_staging_port'}();",
         "\tdetailed_cost_staging_port();",
         "\t//enable_itemized_level();",
         "\tcheck_override_site_access();",
-        "\ton_change{'site_access_override'};",
+        "\ton_change{'site_access_override'}();",
         "};",
         "",
         "on_change{'site_access_override'} = define() {",
@@ -3389,16 +3594,17 @@
         "\tif (value('itemized_check_site_access')==1)",
         "\t{",
         "\t\tdetailed_value = value('detailed_cost_choice_staging_port');",
-        "\t\tenable('staging_port_cost',detailed_value==0);",
-        "\t\tshow('staging_port_cost',detailed_value==0);",
-        "\t\tenable('staging_port_cost_total',detailed_value);",
-        "\t\tshow('staging_port_cost_total',detailed_value);",
-        "\t\tenable('quay_cost',detailed_value);",
-        "\t\tenable('laydown_area_cost',detailed_value);",
-        "\t\tenable('assembly_areas_cost',detailed_value);",
-        "\t\tenable('personnel_facilities_cost',detailed_value);",
-        "\t\tenable('fabrication_facilities_cost',detailed_value);",
-        "\t\tenable('other_staging_port_cost',detailed_value);",
+        "\t\tenable('staging_port_cost',detailed_value!=1);",
+        "\t\tshow('staging_port_cost',detailed_value!=1);",
+        "\t\tenable('staging_port_cost_total',detailed_value==1);",
+        "\t\tshow('staging_port_cost_total',detailed_value==1);",
+        "\t\tenable('quay_cost',detailed_value==1);",
+        "\t\tenable('laydown_area_cost',detailed_value==1);",
+        "\t\tenable('assembly_areas_cost',detailed_value==1);",
+        "\t\tenable('personnel_facilities_cost',detailed_value==1);",
+        "\t\tenable('fabrication_facilities_cost',detailed_value==1);",
+        "\t\tenable('other_staging_port_cost',detailed_value==1);\r",
+        "\t\tenable('staging_port_cost_rvalue',detailed_value==2);",
         "\t\t",
         "\t\trefresh();",
         "\t}",
@@ -3413,14 +3619,15 @@
         "\tif (value('itemized_check_site_access')==1)",
         "\t{",
         "\t\tdetailed_value = value('detailed_cost_choice_port_fees');",
-        "\t\tenable('port_fees_cost',detailed_value==0);",
-        "\t\tshow('port_fees_cost',detailed_value==0);",
-        "\t\tenable('port_fees_cost_total',detailed_value);",
-        "\t\tshow('port_fees_cost_total',detailed_value);",
-        "\t\tenable('entrance_exit_fees_cost',detailed_value);",
-        "\t\tenable('quayside_docking_fees_cost',detailed_value);",
-        "\t\tenable('wharfage_fees_cost',detailed_value);",
-        "\t\tenable('other_port_fees_cost',detailed_value);",
+        "\t\tenable('port_fees_cost',detailed_value!=1);",
+        "\t\tshow('port_fees_cost',detailed_value!=1);",
+        "\t\tenable('port_fees_cost_total',detailed_value==1);",
+        "\t\tshow('port_fees_cost_total',detailed_value==1);",
+        "\t\tenable('entrance_exit_fees_cost',detailed_value==1);",
+        "\t\tenable('quayside_docking_fees_cost',detailed_value==1);",
+        "\t\tenable('wharfage_fees_cost',detailed_value==1);",
+        "\t\tenable('other_port_fees_cost',detailed_value==1);\r",
+        "\t\tenable('port_fees_cost_rvalue',detailed_value==2);",
         "\t\t",
         "\t\trefresh();",
         "\t}",
@@ -3436,7 +3643,8 @@
         "\titemized_value = value('itemized_check_site_access');",
         "\tenable('staging_port_cost',itemized_value==1);",
         "\tenable('staging_port_cost_total',itemized_value==1);",
-        "\tenable('detailed_cost_choice_staging_port',itemized_value==1);",
+        "\tenable('detailed_cost_choice_staging_port',itemized_value==1);\r",
+        "\tenable('staging_port_cost_rvalue',itemized_value==1);",
         "\tenable('quay_cost',itemized_value==1);",
         "\tenable('laydown_area_cost',itemized_value==1);",
         "\tenable('assembly_areas_cost',itemized_value==1);",
@@ -3447,16 +3655,18 @@
         "\tenable('port_improvement_cost',itemized_value==1);",
         "\tenable('port_fees_cost',itemized_value==1);",
         "\tenable('port_fees_cost_total',itemized_value==1);",
-        "\tenable('detailed_cost_choice_port_fees',itemized_value==1);",
+        "\tenable('detailed_cost_choice_port_fees',itemized_value==1);\r",
+        "\tenable('port_fees_cost_rvalue',itemized_value==1);",
         "\tenable('entrance_exit_fees_cost',itemized_value==1);",
         "\tenable('quayside_docking_fees_cost',itemized_value==1);",
         "\tenable('wharfage_fees_cost',itemized_value==1);",
         "\tenable('other_port_fees_cost',itemized_value==1);",
         "\tenable('other_site_access_cost',itemized_value==1);",
-        "\tenable('site_access_port_staging_cost_input',itemized_value!=2);",
+        "\tenable('site_access_port_staging_cost_input',itemized_value==0 || itemized_value==3);\r",
+        "\tenable('site_access_port_staging_cost_rvalue', itemized_value==3);",
         "\tshow('site_access_port_staging_cost_total',itemized_value==1);",
         "\tshow('site_access_port_staging_cost_total_label',itemized_value==1);",
-        "\tshow('site_access_port_staging_cost_input',(itemized_value==0 || itemized_value==2));",
+        "\tshow('site_access_port_staging_cost_input',itemized_value != 1);",
         "\tshow('site_access_port_staging_cost_input_label',(itemized_value==0 || itemized_value==2));",
         "\tif (itemized_value==1)",
         "\t{",
diff --git a/deploy/runtime/ui/Marine Costs - Structural Assembly.json b/deploy/runtime/ui/Marine Costs - Structural Assembly.json
index ecac1f0ff8..6c440109c3 100644
--- a/deploy/runtime/ui/Marine Costs - Structural Assembly.json	
+++ b/deploy/runtime/ui/Marine Costs - Structural Assembly.json	
@@ -1,7 +1,7 @@
 {
     "Name": "Marine Costs - Structural Assembly",
-    "Width": 919.0,
-    "Height": 603.0,
+    "Width": 918.0,
+    "Height": 601.0,
     "FormObjects": {
         "Label": {
             "Visible": 1.0,
@@ -542,7 +542,7 @@
                 }
             }
         },
-        "CheckBox": {
+        "Choice": {
             "Visible": 1.0,
             "ObjectProperties": {
                 "Name": {
@@ -551,15 +551,15 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 363.0
+                    "Integer": 501.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 339.0
+                    "Integer": 309.0
                 },
                 "Width": {
                     "Type": 3.0,
-                    "Integer": 174.0
+                    "Integer": 177.0
                 },
                 "Height": {
                     "Type": 3.0,
@@ -569,13 +569,13 @@
                     "Type": 5.0,
                     "String": ""
                 },
-                "Caption": {
-                    "Type": 5.0,
-                    "String": "Enter detailed costs"
+                "Items": {
+                    "Type": 6.0,
+                    "StringList": "Enter cost|Enter itemized costs|Array scaling costs"
                 },
-                "State": {
-                    "Type": 2.0,
-                    "Boolean": 0.0
+                "Selection": {
+                    "Type": 3.0,
+                    "Integer": -1.0
                 },
                 "TabOrder": {
                     "Type": 3.0,
@@ -583,7 +583,7 @@
                 }
             }
         },
-        "CheckBox": {
+        "Choice": {
             "Visible": 1.0,
             "ObjectProperties": {
                 "Name": {
@@ -592,15 +592,15 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 366.0
+                    "Integer": 501.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 99.0
+                    "Integer": 69.0
                 },
                 "Width": {
                     "Type": 3.0,
-                    "Integer": 171.0
+                    "Integer": 177.0
                 },
                 "Height": {
                     "Type": 3.0,
@@ -610,13 +610,13 @@
                     "Type": 5.0,
                     "String": ""
                 },
-                "Caption": {
-                    "Type": 5.0,
-                    "String": "Enter detailed costs"
+                "Items": {
+                    "Type": 6.0,
+                    "StringList": "Enter cost|Enter itemized costs|Array scaling costs"
                 },
-                "State": {
-                    "Type": 2.0,
-                    "Boolean": 0.0
+                "Selection": {
+                    "Type": 3.0,
+                    "Integer": -1.0
                 },
                 "TabOrder": {
                     "Type": 3.0,
@@ -914,6 +914,89 @@
                 }
             }
         },
+        "Numeric": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "marine_systems_cost_rvalue"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 492.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 339.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 100.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 24.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Value": {
+                    "Type": 1.0,
+                    "Double": 0.0
+                },
+                "Mode": {
+                    "Type": 3.0,
+                    "Integer": 1.0
+                },
+                "Format": {
+                    "Type": 3.0,
+                    "Integer": 0.0
+                },
+                "Decimals": {
+                    "Type": 3.0,
+                    "Integer": 3.0
+                },
+                "Prefix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Suffix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "ThousandsSep": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "Editable": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "ForeColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 0.0,
+                        "Green": 0.0,
+                        "Blue": 0.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "BackColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 255.0,
+                        "Green": 255.0,
+                        "Blue": 255.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "TabOrder": {
+                    "Type": 3.0,
+                    "Integer": -1.0
+                }
+            }
+        },
         "Numeric": {
             "Visible": 1.0,
             "ObjectProperties": {
@@ -2483,6 +2566,89 @@
                 }
             }
         },
+        "Numeric": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "prime_mover_cost_rvalue"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 492.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 99.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 100.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 24.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Value": {
+                    "Type": 1.0,
+                    "Double": 0.0
+                },
+                "Mode": {
+                    "Type": 3.0,
+                    "Integer": 1.0
+                },
+                "Format": {
+                    "Type": 3.0,
+                    "Integer": 0.0
+                },
+                "Decimals": {
+                    "Type": 3.0,
+                    "Integer": 3.0
+                },
+                "Prefix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Suffix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "ThousandsSep": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "Editable": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "ForeColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 0.0,
+                        "Green": 0.0,
+                        "Blue": 0.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "BackColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 255.0,
+                        "Green": 255.0,
+                        "Blue": 255.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "TabOrder": {
+                    "Type": 3.0,
+                    "Integer": -1.0
+                }
+            }
+        },
         "Numeric": {
             "Visible": 1.0,
             "ObjectProperties": {
@@ -3365,7 +3531,7 @@
             "Label": " ",
             "Units": "$ ",
             "Group": "ME Costs - Structural Assembly",
-            "IndexLabels": "Enter in $/kW|Enter in $| Use Modeled Costs ($)|Use Cost Breakdown ($)",
+            "IndexLabels": "Enter in $/kW|Enter in $| Use Modeled Costs ($)|Use Cost Breakdown ($)|Use Array Scaling",
             "Flags": 1.0,
             "DefaultValue": 0.0,
             "UIObject": "Choice",
@@ -3390,7 +3556,7 @@
             "Type": 1.0,
             "Label": "Assembly and install cost input ",
             "Units": "$, $/kW ",
-            "Group": "ME Costs - Structural Assembly",
+            "Group": "ME Costs - Assembly Installation",
             "IndexLabels": "",
             "Flags": 3.0,
             "DefaultValue": 0.0,
@@ -3403,8 +3569,8 @@
             "Type": 1.0,
             "Label": "Assembly and install cost method",
             "Units": "$",
-            "Group": "ME Costs - Structural Assembly",
-            "IndexLabels": "Enter in $/kW|Enter in $| Use Modeled Costs ($)|Use Cost Breakdown ($)",
+            "Group": "ME Costs - Assembly Installation",
+            "IndexLabels": "Enter in $/kW|Enter in $| Use Modeled Costs ($)|Use Cost Breakdown ($)|Use Array Scaling",
             "Flags": 3.0,
             "DefaultValue": 2.0,
             "UIObject": "Choice",
@@ -3416,7 +3582,7 @@
             "Type": 1.0,
             "Label": " ",
             "Units": "$",
-            "Group": "ME Costs - Structural Assembly",
+            "Group": "ME Costs - Assembly Installation",
             "IndexLabels": "",
             "Flags": 9.0,
             "DefaultValue": 0.0,
@@ -3485,7 +3651,7 @@
             "IndexLabels": "",
             "Flags": 3.0,
             "DefaultValue": 0.0,
-            "UIObject": "CheckBox",
+            "UIObject": "Choice",
             "sscVariableName": "",
             "sscVariableValue": ""
         },
@@ -3498,7 +3664,7 @@
             "IndexLabels": "",
             "Flags": 3.0,
             "DefaultValue": 0.0,
-            "UIObject": "CheckBox",
+            "UIObject": "Choice",
             "sscVariableName": "",
             "sscVariableValue": ""
         },
@@ -3507,7 +3673,7 @@
             "Type": 1.0,
             "Label": "Development cost input",
             "Units": "$, $/kW",
-            "Group": "ME Costs - Structural Assembly",
+            "Group": "ME Costs - Development",
             "IndexLabels": "",
             "Flags": 3.0,
             "DefaultValue": 0.0,
@@ -3520,8 +3686,8 @@
             "Type": 1.0,
             "Label": "Development cost method",
             "Units": " ",
-            "Group": "ME Costs - Structural Assembly",
-            "IndexLabels": "Enter in $/kW|Enter in $| Use Modeled Costs ($)|Use Cost Breakdown ($)",
+            "Group": "ME Costs - Development",
+            "IndexLabels": "Enter in $/kW|Enter in $| Use Modeled Costs ($)|Use Cost Breakdown ($)|Use Array Scaling",
             "Flags": 3.0,
             "DefaultValue": 2.0,
             "UIObject": "Choice",
@@ -3533,7 +3699,7 @@
             "Type": 1.0,
             "Label": " ",
             "Units": "$ ",
-            "Group": "ME Costs - Structural Assembly",
+            "Group": "ME Costs - Development",
             "IndexLabels": "",
             "Flags": 9.0,
             "DefaultValue": 0.0,
@@ -3560,7 +3726,7 @@
             "Label": "E&M cost method",
             "Units": " ",
             "Group": "ME Costs - Structural Assembly",
-            "IndexLabels": "Enter in $/kW|Enter in $| Use Modeled Costs ($)|Use Cost Breakdown ($)",
+            "IndexLabels": "Enter in $/kW|Enter in $| Use Modeled Costs ($)|Use Cost Breakdown ($)|Use Array Scaling",
             "Flags": 3.0,
             "DefaultValue": 2.0,
             "UIObject": "Choice",
@@ -3599,7 +3765,7 @@
             "Label": " ",
             "Units": " ",
             "Group": "ME Costs - Structural Assembly",
-            "IndexLabels": "Enter in $/kW|Enter in $| Use Modeled Costs ($)|Use Cost Breakdown ($)",
+            "IndexLabels": "Enter in $/kW|Enter in $|Use Modeled Costs ($)|Use Cost Breakdown ($)",
             "Flags": 0.0,
             "DefaultValue": 0.0,
             "UIObject": "Choice",
@@ -3710,6 +3876,19 @@
             "sscVariableName": "",
             "sscVariableValue": ""
         },
+        "marine_systems_cost_rvalue": {
+            "Version": 4.0,
+            "Type": 1.0,
+            "Label": "Marine systems array scaling R-value",
+            "Units": "",
+            "Group": "ME Costs - Structural Assembly",
+            "IndexLabels": "",
+            "Flags": 2.0,
+            "DefaultValue": 0.0,
+            "UIObject": "Default",
+            "sscVariableName": "",
+            "sscVariableValue": ""
+        },
         "marine_systems_cost_total": {
             "Version": 4.0,
             "Type": 1.0,
@@ -3741,7 +3920,7 @@
             "Type": 1.0,
             "Label": "Mooring cost input ",
             "Units": "$, $/kW ",
-            "Group": "ME Costs - Structural Assembly",
+            "Group": "ME Costs - Mooring",
             "IndexLabels": "",
             "Flags": 3.0,
             "DefaultValue": 0.0,
@@ -3754,8 +3933,8 @@
             "Type": 1.0,
             "Label": "Mooring cost method",
             "Units": " ",
-            "Group": "ME Costs - Structural Assembly",
-            "IndexLabels": "Enter in $/kW|Enter in $| Use Modeled Costs ($)|Use Cost Breakdown ($)",
+            "Group": "ME Costs - Mooring",
+            "IndexLabels": "Enter in $/kW|Enter in $| Use Modeled Costs ($)|Use Cost Breakdown ($)|Use Array Scaling",
             "Flags": 3.0,
             "DefaultValue": 2.0,
             "UIObject": "Choice",
@@ -3767,7 +3946,7 @@
             "Type": 1.0,
             "Label": " ",
             "Units": "$",
-            "Group": "ME Costs - Structural Assembly",
+            "Group": "ME Costs - Mooring",
             "IndexLabels": "",
             "Flags": 9.0,
             "DefaultValue": 0.0,
@@ -3807,7 +3986,7 @@
             "Label": " ",
             "Units": "$",
             "Group": "ME Costs - Structural Assembly",
-            "IndexLabels": "Enter in $/kW|Enter in $| Use Modeled Costs ($)|Use Cost Breakdown ($)",
+            "IndexLabels": "Enter in $/kW|Enter in $| Use Modeled Costs ($)|Use Cost Breakdown ($)|Use Array Scaling",
             "Flags": 1.0,
             "DefaultValue": 0.0,
             "UIObject": "Choice",
@@ -3846,7 +4025,7 @@
             "Label": " ",
             "Units": "$",
             "Group": "ME Costs - Structural Assembly",
-            "IndexLabels": "Enter in $/kW|Enter in $| Use Modeled Costs ($)|Use Cost Breakdown ($)",
+            "IndexLabels": "Enter in $/kW|Enter in $| Use Modeled Costs ($)|Use Cost Breakdown ($)|Use Array Scaling",
             "Flags": 1.0,
             "DefaultValue": 0.0,
             "UIObject": "Choice",
@@ -3871,7 +4050,7 @@
             "Type": 1.0,
             "Label": " ",
             "Units": " ",
-            "Group": "ME Costs - Structural Assembly",
+            "Group": "ME Costs - Operations",
             "IndexLabels": "",
             "Flags": 8.0,
             "DefaultValue": 0.0,
@@ -3924,7 +4103,7 @@
             "Label": " ",
             "Units": "$",
             "Group": "ME Costs - Structural Assembly",
-            "IndexLabels": "Enter in $/kW|Enter in $| Use Modeled Costs ($)|Use Cost Breakdown ($)",
+            "IndexLabels": "Enter in $/kW|Enter in $| Use Modeled Costs ($)|Use Cost Breakdown ($)|Use Array Scaling",
             "Flags": 3.0,
             "DefaultValue": 0.0,
             "UIObject": "Choice",
@@ -3963,7 +4142,7 @@
             "Label": "Other infrastructure cost method",
             "Units": "$",
             "Group": "ME Costs - Structural Assembly",
-            "IndexLabels": "Enter in $/kW|Enter in $| Use Modeled Costs ($)|Use Cost Breakdown ($)",
+            "IndexLabels": "Enter in $/kW|Enter in $| Use Modeled Costs ($)|Use Cost Breakdown ($)|Use Array Scaling",
             "Flags": 3.0,
             "DefaultValue": 2.0,
             "UIObject": "Choice",
@@ -4053,7 +4232,7 @@
             "Type": 1.0,
             "Label": "PTO cost input ",
             "Units": "$, $/kW",
-            "Group": "ME Costs - Structural Assembly",
+            "Group": "ME Costs - Power Take-off",
             "IndexLabels": "",
             "Flags": 3.0,
             "DefaultValue": 0.0,
@@ -4066,8 +4245,8 @@
             "Type": 1.0,
             "Label": "PTO cost method",
             "Units": "$",
-            "Group": "ME Costs - Structural Assembly",
-            "IndexLabels": "Enter in $/kW|Enter in $| Use Modeled Costs ($)|Use Cost Breakdown ($)",
+            "Group": "ME Costs - Power Take-off",
+            "IndexLabels": "Enter in $/kW|Enter in $| Use Modeled Costs ($)|Use Cost Breakdown ($)|Use Array Scaling",
             "Flags": 3.0,
             "DefaultValue": 2.0,
             "UIObject": "Choice",
@@ -4079,7 +4258,7 @@
             "Type": 1.0,
             "Label": " ",
             "Units": "$",
-            "Group": "ME Costs - Structural Assembly",
+            "Group": "ME Costs - Power Take-off",
             "IndexLabels": "",
             "Flags": 9.0,
             "DefaultValue": 0.0,
@@ -4113,6 +4292,19 @@
             "sscVariableName": "",
             "sscVariableValue": ""
         },
+        "prime_mover_cost_rvalue": {
+            "Version": 4.0,
+            "Type": 1.0,
+            "Label": "Prime mover array scaling R-value",
+            "Units": "",
+            "Group": "ME Costs - Structural Assembly",
+            "IndexLabels": "",
+            "Flags": 2.0,
+            "DefaultValue": 0.0,
+            "UIObject": "Default",
+            "sscVariableName": "",
+            "sscVariableValue": ""
+        },
         "prime_mover_cost_total": {
             "Version": 4.0,
             "Type": 1.0,
@@ -4249,7 +4441,7 @@
             "Label": "Structural assembly cost method ",
             "Units": " ",
             "Group": "ME Costs - Structural Assembly",
-            "IndexLabels": "Enter in $/kW|Enter in $| Use Modeled Costs ($)|Use Cost Breakdown ($)",
+            "IndexLabels": "Enter in $/kW|Enter in $|Use Modeled Costs ($)|Use Cost Breakdown ($)|Use Array Scaling",
             "Flags": 3.0,
             "DefaultValue": 2.0,
             "UIObject": "Choice",
@@ -4478,24 +4670,32 @@
         "};",
         "",
         "equations {'prime_mover_cost_total_check'} = define() {",
+        "\tb = -log(1-${prime_mover_cost_rvalue})/log(2);\r",
         "\tif (${detailed_cost_choice_struct_assem}==0)",
         "\t{",
         "\t\treturn ${prime_mover_cost};",
         "\t}",
-        "\telse",
+        "\telse if (${detailed_cost_choice_struct_assem}==1)",
         "\t{",
         "\t\treturn ${prime_mover_cost_total};",
+        "\t}\r",
+        "\telse {\r",
+        "\t\treturn (${prime_mover_cost}*pow(${number_devices},-b))*${number_devices};\r",
         "\t}",
         "};",
         "",
         "equations {'marine_system_cost_total_check'} = define() {",
+        "\tb = -log(1-${marine_systems_cost_rvalue})/log(2);\r",
         "\tif (${detailed_cost_choice_marine_systems}==0)",
         "\t{",
         "\t\treturn ${marine_systems_cost};",
         "\t}",
-        "\telse",
+        "\telse if (${detailed_cost_choice_marine_systems}==1)",
         "\t{",
         "\t\treturn ${marine_systems_cost_total};",
+        "\t}\r",
+        "\telse {\r",
+        "\t\treturn (${marine_systems_cost}*pow(${number_devices},-b))*${number_devices};\r",
         "\t}",
         "};",
         "",
@@ -4575,10 +4775,10 @@
         "\t${assembly_and_install_cost_modeled} = ssc_var( obj, 'assembly_and_install_cost_modeled' );",
         "\t${other_infrastructure_cost_modeled} = ssc_var( obj, 'other_infrastructure_cost_modeled' );",
         "",
-        "\t${array_cable_system_cost_modeled} = ssc_var( obj, 'array_cable_system_cost_modeled' );",
-        "\t${export_cable_system_cost_modeled} = ssc_var( obj, 'export_cable_system_cost_modeled' );",
-        "\t${onshore_substation_cost_modeled} = ssc_var( obj, 'onshore_substation_cost_modeled' );",
-        "\t${offshore_substation_cost_modeled} = ssc_var( obj, 'offshore_substation_cost_modeled' );",
+        "\t//${array_cable_system_cost_modeled} = ssc_var( obj, 'array_cable_system_cost_modeled' );",
+        "\t//${export_cable_system_cost_modeled} = ssc_var( obj, 'export_cable_system_cost_modeled' );",
+        "\t//${onshore_substation_cost_modeled} = ssc_var( obj, 'onshore_substation_cost_modeled' );",
+        "\t//${offshore_substation_cost_modeled} = ssc_var( obj, 'offshore_substation_cost_modeled' );",
         "\t${other_elec_infra_cost_modeled} = ssc_var( obj, 'other_elec_infra_cost_modeled' );",
         "",
         "\t${project_contingency_modeled} = ssc_var( obj, 'project_contingency' );",
@@ -4614,7 +4814,8 @@
         "\t\t\t\t\t0,",
         "\t\t\t\t\t0,",
         "\t\t\t\t\t2,",
-        "\t\t\t\t\t1",
+        "\t\t\t\t\t1,\r",
+        "\t\t\t\t\t3",
         "\t\t\t\t];",
         "\t}",
         "\telse",
@@ -4624,12 +4825,14 @@
         "};",
         "",
         "equations {'structural_assembly_cost'} = define() {",
+        "\tarray_scaling_b_value = -log(1-${structural_assembly_cost_rvalue})/log(2);\r",
         "\treturn ?${structural_assembly_cost_method}",
         "\t\t\t[",
         "\t\t\t\t${structural_assembly_cost_input}*${system_capacity},",
         "\t\t\t\t${structural_assembly_cost_input},",
         "\t\t\t\t${structural_assembly_cost_modeled_formatted},",
-        "\t\t\t\t${structural_assembly_cost_total}",
+        "\t\t\t\t${structural_assembly_cost_total},\r",
+        "\t\t\t\t(${structural_assembly_cost_input}*pow(${number_devices},-array_scaling_b_value))*${number_devices}",
         "\t\t\t];",
         "};",
         "",
@@ -4643,7 +4846,8 @@
         "\t\t\t0,",
         "\t\t\t1,",
         "\t\t\t2,",
-        "\t\t\t3",
+        "\t\t\t3,\r",
+        "\t\t\t4",
         "\t\t];",
         "};",
         "",
@@ -4720,16 +4924,16 @@
     "Callbacks": [
         "on_load{'Marine Costs - Structural Assembly'} = define() {",
         "\tcheck_override_structural();",
-        "\ton_change{'struct_override'};",
-        "\ton_change{'itemized_check_structural'};",
+        "\ton_change{'struct_override'}();",
+        "\ton_change{'itemized_check_structural'}();",
         "\t//on_change{'variable_marine_systems'};",
         "\t//on_change{'variable_prime_mover'};",
         "\tenable_itemized_structural();",
         "\t//show_marine_system_warning();",
         "\t//show_prime_mover_warning();",
-        "\ton_change{'detailed_cost_choice_struct_assem'};",
+        "\ton_change{'detailed_cost_choice_struct_assem'}();",
         "\tdetailed_cost_structural();",
-        "\ton_change{'detailed_cost_choice_marine_systems'};",
+        "\ton_change{'detailed_cost_choice_marine_systems'}();",
         "\tdetailed_cost_marine_systems();",
         "\t",
         "};",
@@ -4785,21 +4989,19 @@
         "\tif (value('itemized_check_structural')==1)",
         "\t{",
         "\t\tdetailed_value = value('detailed_cost_choice_struct_assem');",
-        "\t\tenable('prime_mover_cost',detailed_value==0);",
-        "\t\tshow('prime_mover_cost',detailed_value==0);",
+        "\t\tenable('prime_mover_cost',detailed_value!=1);",
+        "\t\tshow('prime_mover_cost',detailed_value!=1);",
         "\t\t//show('level_4_total_prime',detailed_value==0);",
-        "\t\tenable('prime_mover_cost_total',detailed_value);",
-        "\t\tshow('prime_mover_cost_total',detailed_value);",
+        "\t\tenable('prime_mover_cost_total',detailed_value==1);",
+        "\t\tshow('prime_mover_cost_total',detailed_value==1);",
         "\t\t//show('level_5_total_prime',detailed_value);",
-        "\t\tenable('primary_struct_assem_cost',detailed_value);",
-        "\t\tenable('buoyancy_chamber_cost',detailed_value);",
-        "\t\tenable('external_ballast_chambers_cost',detailed_value);",
-        "\t\tenable('active_structure_cost',detailed_value);",
-        "\t\tenable('other_prime_mover_cost',detailed_value);",
-        "\t\tenable('prime_mover_cost_total',detailed_value);",
-        "\t\t",
-        "\t\t",
-        "\t",
+        "\t\tenable('primary_struct_assem_cost',detailed_value==1);",
+        "\t\tenable('buoyancy_chamber_cost',detailed_value==1);",
+        "\t\tenable('external_ballast_chambers_cost',detailed_value==1);",
+        "\t\tenable('active_structure_cost',detailed_value==1);",
+        "\t\tenable('other_prime_mover_cost',detailed_value==1);",
+        "\t\tenable('prime_mover_cost_total',detailed_value==1);\r",
+        "\t\tenable('prime_mover_cost_rvalue',detailed_value==2);",
         "\t\trefresh();",
         "\t}",
         "}",
@@ -4813,14 +5015,15 @@
         "\tif (value('itemized_check_structural')==1)",
         "\t{",
         "\t\tdetailed_value_marine = value('detailed_cost_choice_marine_systems');",
-        "\t\tenable('marine_systems_cost',detailed_value_marine==0);",
-        "\t\tshow('marine_systems_cost',detailed_value_marine==0);",
-        "\t\tshow('marine_systems_cost_total',detailed_value_marine);",
-        "\t\tenable('marine_systems_cost_total',detailed_value_marine);",
-        "\t\tenable('personnel_access_system_cost',detailed_value_marine);",
-        "\t\tenable('ballast_system_cost',detailed_value_marine);",
-        "\t\tenable('navigation_lighting_cost',detailed_value_marine);",
-        "\t\tenable('other_marine_system_cost',detailed_value_marine);",
+        "\t\tenable('marine_systems_cost',detailed_value_marine!=1);",
+        "\t\tshow('marine_systems_cost',detailed_value_marine!=1);",
+        "\t\tshow('marine_systems_cost_total',detailed_value_marine==1);",
+        "\t\tenable('marine_systems_cost_total',detailed_value_marine==1);",
+        "\t\tenable('personnel_access_system_cost',detailed_value_marine==1);",
+        "\t\tenable('ballast_system_cost',detailed_value_marine==1);",
+        "\t\tenable('navigation_lighting_cost',detailed_value_marine==1);",
+        "\t\tenable('other_marine_system_cost',detailed_value_marine==1);\r",
+        "\t\tenable('marine_systems_cost_rvalue',detailed_value_marine==2);",
         "\t\tshow('warning_marine_systems',detailed_value_marine==2);",
         "\t\t",
         "\t\trefresh();",
@@ -4831,7 +5034,8 @@
         "{",
         "\titemized_value = value('itemized_check_structural');",
         "\tenable('prime_mover_cost',itemized_value==1);",
-        "\tenable('detailed_cost_choice_struct_assem',itemized_value==1);",
+        "\tenable('detailed_cost_choice_struct_assem',itemized_value==1);\r",
+        "\tenable('prime_mover_cost_rvalue', itemized_value==1);",
         "\tenable('primary_struct_assem_cost',itemized_value==1);",
         "\tenable('buoyancy_chamber_cost',itemized_value==1);",
         "\tenable('external_ballast_chambers_cost',itemized_value==1);",
@@ -4839,7 +5043,8 @@
         "\tenable('other_prime_mover_cost',itemized_value==1);",
         "\tenable('additional_structural_components_cost',itemized_value==1);",
         "\tenable('marine_systems_cost',itemized_value==1);",
-        "\tenable('detailed_cost_choice_marine_systems',itemized_value==1);",
+        "\tenable('detailed_cost_choice_marine_systems',itemized_value==1);\r",
+        "\tenable('marine_systems_cost_rvalue', itemized_value==1);",
         "\tenable('personnel_access_system_cost',itemized_value==1);",
         "\tenable('ballast_system_cost',itemized_value==1);",
         "\tenable('navigation_lighting_cost',itemized_value==1);",
@@ -4853,10 +5058,11 @@
         "\tenable('coatings_cost_total',itemized_value==1);",
         "\tenable('transport_structure_cost_total',itemized_value==1);",
         "\tenable('other_cost_total',itemized_value==1);",
-        "\tenable('structural_assembly_cost_input',itemized_value!=2);",
-        "\tshow('structural_assembly_cost_total',itemized_value==1);",
+        "\tenable('structural_assembly_cost_input',itemized_value==0 || itemized_value==3);\r",
+        "\tenable('structural_assembly_cost_rvalue',itemized_value==3);",
+        "\tshow('structural_assembly_cost_total',itemized_value==1);\r",
+        "\tshow('structural_assembly_cost_input',itemized_value!=1);",
         "\t//show('struct_level_total_label',itemized_value==1);",
-        "\tshow('structural_assembly_cost_input',(itemized_value==0 || itemized_value==2));",
         "\t//show('struct_user_input_label',(itemized_value==0 || itemized_value==2));",
         "\tshow('warning_prime_mover',itemized_value==4);",
         "\tshow('warning_marine_systems',itemized_value==4);",
diff --git a/deploy/runtime/ui/Marine Losses.json b/deploy/runtime/ui/Marine Losses.json
index 5f3a552670..eaa57ff6fc 100644
--- a/deploy/runtime/ui/Marine Losses.json	
+++ b/deploy/runtime/ui/Marine Losses.json	
@@ -1033,130 +1033,6 @@
                 }
             }
         },
-        "Label": {
-            "Visible": 1.0,
-            "ObjectProperties": {
-                "Name": {
-                    "Type": 5.0,
-                    "String": "tidal_power_curve"
-                },
-                "X": {
-                    "Type": 3.0,
-                    "Integer": 399.0
-                },
-                "Y": {
-                    "Type": 3.0,
-                    "Integer": 774.0
-                },
-                "Width": {
-                    "Type": 3.0,
-                    "Integer": 90.0
-                },
-                "Height": {
-                    "Type": 3.0,
-                    "Integer": 24.0
-                },
-                "Tool Tip": {
-                    "Type": 5.0,
-                    "String": ""
-                },
-                "Caption": {
-                    "Type": 5.0,
-                    "String": ""
-                },
-                "TextColour": {
-                    "Type": 4.0,
-                    "Color": {
-                        "Red": 0.0,
-                        "Green": 0.0,
-                        "Blue": 0.0,
-                        "Alpha": 255.0
-                    }
-                },
-                "Bold": {
-                    "Type": 2.0,
-                    "Boolean": 0.0
-                },
-                "FontSize": {
-                    "Type": 3.0,
-                    "Integer": 0.0
-                },
-                "WordWrap": {
-                    "Type": 2.0,
-                    "Boolean": 0.0
-                },
-                "AlignRight": {
-                    "Type": 2.0,
-                    "Boolean": 0.0
-                },
-                "AlignTop": {
-                    "Type": 2.0,
-                    "Boolean": 0.0
-                }
-            }
-        },
-        "Label": {
-            "Visible": 1.0,
-            "ObjectProperties": {
-                "Name": {
-                    "Type": 5.0,
-                    "String": "tidal_resource_calc"
-                },
-                "X": {
-                    "Type": 3.0,
-                    "Integer": 486.0
-                },
-                "Y": {
-                    "Type": 3.0,
-                    "Integer": 774.0
-                },
-                "Width": {
-                    "Type": 3.0,
-                    "Integer": 90.0
-                },
-                "Height": {
-                    "Type": 3.0,
-                    "Integer": 24.0
-                },
-                "Tool Tip": {
-                    "Type": 5.0,
-                    "String": ""
-                },
-                "Caption": {
-                    "Type": 5.0,
-                    "String": ""
-                },
-                "TextColour": {
-                    "Type": 4.0,
-                    "Color": {
-                        "Red": 0.0,
-                        "Green": 0.0,
-                        "Blue": 0.0,
-                        "Alpha": 255.0
-                    }
-                },
-                "Bold": {
-                    "Type": 2.0,
-                    "Boolean": 0.0
-                },
-                "FontSize": {
-                    "Type": 3.0,
-                    "Integer": 0.0
-                },
-                "WordWrap": {
-                    "Type": 2.0,
-                    "Boolean": 0.0
-                },
-                "AlignRight": {
-                    "Type": 2.0,
-                    "Boolean": 0.0
-                },
-                "AlignTop": {
-                    "Type": 2.0,
-                    "Boolean": 0.0
-                }
-            }
-        },
         "Label": {
             "Visible": 1.0,
             "ObjectProperties": {
diff --git a/deploy/runtime/ui/Marine Tidal Converter Header.json b/deploy/runtime/ui/Marine Tidal Converter Header.json
new file mode 100644
index 0000000000..f4ef6eec45
--- /dev/null
+++ b/deploy/runtime/ui/Marine Tidal Converter Header.json	
@@ -0,0 +1,100 @@
+{
+    "Name": "Marine Tidal Converter Header",
+    "Width": 945.0,
+    "Height": 128.0,
+    "FormObjects": {
+        "RadioChoice": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "library_or_input_tidal"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 21.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 36.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 502.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 66.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Selection": {
+                    "Type": 3.0,
+                    "Integer": 0.0
+                },
+                "Items": {
+                    "Type": 6.0,
+                    "StringList": "Choose tidal converter from library|Import tidal converter|Design tidal converter"
+                },
+                "ShowCaptions": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "Horizontal": {
+                    "Type": 2.0,
+                    "Boolean": 0.0
+                },
+                "TabOrder": {
+                    "Type": 3.0,
+                    "Integer": 2.0
+                }
+            }
+        },
+        "GroupBox": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "object 4"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 9.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 9.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 920.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 108.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Caption": {
+                    "Type": 5.0,
+                    "String": "Tidal Turbine Design"
+                },
+                "Bold": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                }
+            }
+        }
+    },
+    "VarDatabase": {},
+    "Equations": [],
+    "Callbacks": [
+        "on_change{'library_or_input_tidal'} = define() {\r",
+        "\tvalue('tidal_design_excl', value('library_or_input_tidal'));\r",
+        "};"
+    ]
+}
\ No newline at end of file
diff --git a/deploy/runtime/ui/Marine Tidal Converter User.json b/deploy/runtime/ui/Marine Tidal Converter User.json
new file mode 100644
index 0000000000..e7ce11f1c7
--- /dev/null
+++ b/deploy/runtime/ui/Marine Tidal Converter User.json	
@@ -0,0 +1,281 @@
+{
+    "Name": "Marine Tidal Converter User",
+    "Width": 936.0,
+    "Height": 724.0,
+    "FormObjects": {
+        "Numeric": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "device_rated_power"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 543.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 57.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 100.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 21.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Value": {
+                    "Type": 1.0,
+                    "Double": 1500.0
+                },
+                "Mode": {
+                    "Type": 3.0,
+                    "Integer": 1.0
+                },
+                "Format": {
+                    "Type": 3.0,
+                    "Integer": 1.0
+                },
+                "Decimals": {
+                    "Type": 3.0,
+                    "Integer": 3.0
+                },
+                "Prefix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Suffix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "ThousandsSep": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "Editable": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "ForeColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 0.0,
+                        "Green": 0.0,
+                        "Blue": 0.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "BackColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 255.0,
+                        "Green": 255.0,
+                        "Blue": 255.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "TabOrder": {
+                    "Type": 3.0,
+                    "Integer": 27.0
+                }
+            }
+        },
+        "GroupBox": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "object 4"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 9.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 15.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 920.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 696.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Caption": {
+                    "Type": 5.0,
+                    "String": "Tidal Turbine Converter Input"
+                },
+                "Bold": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                }
+            }
+        },
+        "Plot": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "tidal_power_curve_plot"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 342.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 150.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 540.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 380.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                }
+            }
+        },
+        "DataMatrix": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "user_tidal_power_curve"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 21.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 42.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 300.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 655.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "PasteAppendRows": {
+                    "Type": 2.0,
+                    "Boolean": 0.0
+                },
+                "PasteAppendCols": {
+                    "Type": 2.0,
+                    "Boolean": 0.0
+                },
+                "ShowButtons": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "ShowRows": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "ShowRowLabels": {
+                    "Type": 2.0,
+                    "Boolean": 0.0
+                },
+                "RowLabels": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "ShadeR0C0": {
+                    "Type": 2.0,
+                    "Boolean": 0.0
+                },
+                "VerticalLabel": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "HorizontalLabel": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "ShadeC0": {
+                    "Type": 2.0,
+                    "Boolean": 0.0
+                },
+                "ShowCols": {
+                    "Type": 2.0,
+                    "Boolean": 0.0
+                },
+                "ShowColLabels": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "ColLabels": {
+                    "Type": 5.0,
+                    "String": "Velocity (m/s),Power (kW)"
+                },
+                "NumRowsLabel": {
+                    "Type": 5.0,
+                    "String": "Rows:"
+                },
+                "NumColsLabel": {
+                    "Type": 5.0,
+                    "String": "Cols:"
+                },
+                "Layout": {
+                    "Type": 3.0,
+                    "Integer": 1.0
+                },
+                "ChoiceColumn": {
+                    "Type": 3.0,
+                    "Integer": -1.0
+                },
+                "Choices": {
+                    "Type": 5.0,
+                    "String": "Choice1,Choice2"
+                },
+                "HideColumn": {
+                    "Type": 3.0,
+                    "Integer": -1.0
+                },
+                "ShowColumn": {
+                    "Type": 3.0,
+                    "Integer": -1.0
+                },
+                "ColorMap": {
+                    "Type": 2.0,
+                    "Boolean": 0.0
+                }
+            }
+        }
+    },
+    "VarDatabase": {},
+    "Equations": [],
+    "Callbacks": [
+        "on_change{'user_tidal_power_curve'} = define() {\r",
+        "\tplot_device_curve();\r",
+        "\trefresh('user_tidal_power_curve');\r",
+        "};\r",
+        "\r",
+        "on_load{'Marine Tidal Converter User'} = define() {\r",
+        "\tplot_device_curve();\r",
+        "};"
+    ]
+}
\ No newline at end of file
diff --git a/deploy/runtime/ui/Marine Tidal Converter.json b/deploy/runtime/ui/Marine Tidal Converter.json
index 0ff7d448d1..cb6469c853 100644
--- a/deploy/runtime/ui/Marine Tidal Converter.json	
+++ b/deploy/runtime/ui/Marine Tidal Converter.json	
@@ -1,7 +1,7 @@
 {
     "Name": "Marine Tidal Converter",
-    "Width": 939.0,
-    "Height": 1056.0,
+    "Width": 940.0,
+    "Height": 1038.0,
     "FormObjects": {
         "GroupBox": {
             "Visible": 1.0,
@@ -12,19 +12,19 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 15.0
+                    "Integer": 12.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 231.0
+                    "Integer": 6.0
                 },
                 "Width": {
                     "Type": 3.0,
-                    "Integer": 908.0
+                    "Integer": 920.0
                 },
                 "Height": {
                     "Type": 3.0,
-                    "Integer": 819.0
+                    "Integer": 1023.0
                 },
                 "Tool Tip": {
                     "Type": 5.0,
@@ -49,11 +49,11 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 546.0
+                    "Integer": 540.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 270.0
+                    "Integer": 243.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -132,11 +132,11 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 15.0
+                    "Integer": 18.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 57.0
+                    "Integer": 24.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -169,11 +169,11 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 27.0
+                    "Integer": 24.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 255.0
+                    "Integer": 240.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -273,52 +273,65 @@
                 }
             }
         },
-        "RadioChoice": {
+        "Label": {
             "Visible": 1.0,
             "ObjectProperties": {
                 "Name": {
                     "Type": 5.0,
-                    "String": "library_or_input_tidal"
+                    "String": "tidal_design_label"
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 15.0
+                    "Integer": 546.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 27.0
+                    "Integer": 36.0
                 },
                 "Width": {
                     "Type": 3.0,
-                    "Integer": 502.0
+                    "Integer": 342.0
                 },
                 "Height": {
                     "Type": 3.0,
-                    "Integer": 21.0
+                    "Integer": 63.0
                 },
                 "Tool Tip": {
                     "Type": 5.0,
                     "String": ""
                 },
-                "Selection": {
+                "Caption": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "TextColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 255.0,
+                        "Green": 0.0,
+                        "Blue": 0.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "Bold": {
+                    "Type": 2.0,
+                    "Boolean": 0.0
+                },
+                "FontSize": {
                     "Type": 3.0,
                     "Integer": 0.0
                 },
-                "Items": {
-                    "Type": 6.0,
-                    "StringList": "Choose tidal converter from library|Import tidal converter"
-                },
-                "ShowCaptions": {
+                "WordWrap": {
                     "Type": 2.0,
-                    "Boolean": 1.0
+                    "Boolean": 0.0
                 },
-                "Horizontal": {
+                "AlignRight": {
                     "Type": 2.0,
-                    "Boolean": 1.0
+                    "Boolean": 0.0
                 },
-                "TabOrder": {
-                    "Type": 3.0,
-                    "Integer": 2.0
+                "AlignTop": {
+                    "Type": 2.0,
+                    "Boolean": 0.0
                 }
             }
         },
@@ -331,11 +344,11 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 345.0
+                    "Integer": 333.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 363.0
+                    "Integer": 276.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -360,11 +373,11 @@
                 },
                 "X": {
                     "Type": 3.0,
-                    "Integer": 15.0
+                    "Integer": 18.0
                 },
                 "Y": {
                     "Type": 3.0,
-                    "Integer": 57.0
+                    "Integer": 120.0
                 },
                 "Width": {
                     "Type": 3.0,
@@ -412,119 +425,6 @@
                     "Boolean": 1.0
                 }
             }
-        },
-        "DataMatrix": {
-            "Visible": 1.0,
-            "ObjectProperties": {
-                "Name": {
-                    "Type": 5.0,
-                    "String": "user_tidal_power_curve"
-                },
-                "X": {
-                    "Type": 3.0,
-                    "Integer": 27.0
-                },
-                "Y": {
-                    "Type": 3.0,
-                    "Integer": 255.0
-                },
-                "Width": {
-                    "Type": 3.0,
-                    "Integer": 300.0
-                },
-                "Height": {
-                    "Type": 3.0,
-                    "Integer": 775.0
-                },
-                "Tool Tip": {
-                    "Type": 5.0,
-                    "String": ""
-                },
-                "PasteAppendRows": {
-                    "Type": 2.0,
-                    "Boolean": 0.0
-                },
-                "PasteAppendCols": {
-                    "Type": 2.0,
-                    "Boolean": 0.0
-                },
-                "ShowButtons": {
-                    "Type": 2.0,
-                    "Boolean": 1.0
-                },
-                "ShowRows": {
-                    "Type": 2.0,
-                    "Boolean": 1.0
-                },
-                "ShowRowLabels": {
-                    "Type": 2.0,
-                    "Boolean": 0.0
-                },
-                "RowLabels": {
-                    "Type": 5.0,
-                    "String": ""
-                },
-                "ShadeR0C0": {
-                    "Type": 2.0,
-                    "Boolean": 0.0
-                },
-                "VerticalLabel": {
-                    "Type": 5.0,
-                    "String": ""
-                },
-                "HorizontalLabel": {
-                    "Type": 5.0,
-                    "String": ""
-                },
-                "ShadeC0": {
-                    "Type": 2.0,
-                    "Boolean": 0.0
-                },
-                "ShowCols": {
-                    "Type": 2.0,
-                    "Boolean": 0.0
-                },
-                "ShowColLabels": {
-                    "Type": 2.0,
-                    "Boolean": 1.0
-                },
-                "ColLabels": {
-                    "Type": 5.0,
-                    "String": "Velocity (m/s),Power (kW)"
-                },
-                "NumRowsLabel": {
-                    "Type": 5.0,
-                    "String": "Rows:"
-                },
-                "NumColsLabel": {
-                    "Type": 5.0,
-                    "String": "Cols:"
-                },
-                "Layout": {
-                    "Type": 3.0,
-                    "Integer": 1.0
-                },
-                "ChoiceColumn": {
-                    "Type": 3.0,
-                    "Integer": -1.0
-                },
-                "Choices": {
-                    "Type": 5.0,
-                    "String": "Choice1,Choice2"
-                },
-                "HideColumn": {
-                    "Type": 3.0,
-                    "Integer": -1.0
-                },
-                "ShowColumn": {
-                    "Type": 3.0,
-                    "Integer": -1.0
-                },
-                "ColorMap": {
-                    "Type": 2.0,
-                    "Boolean": 0.0
-                }
-            }
         }
     },
     "VarDatabase": {
@@ -856,8 +756,20 @@
         "",
         "equations{ 'tidal_power_curve' } = define()",
         "{",
-        "\tif (${library_or_input_tidal})",
-        "\t\treturn ${user_tidal_power_curve};",
+        "\tif (${library_or_input_tidal}==1)",
+        "\t\treturn ${user_tidal_power_curve};\r",
+        "\telse if (${library_or_input_tidal} == 2) {\r",
+        "\t\tresource = ${tidal_resource};\r",
+        "\t\tspeeds = ${tidal_turbine_powercurve_tidalspeeds};\r",
+        "\t\tpower = ${tidal_turbine_powercurve_powerout};\r",
+        "\t\ttidal_power_curve = [[]];\r",
+        "\t\tfor (i = 0; i < #resource; i++) {\r",
+        "\t\t\r",
+        "\t\t\ttidal_power_curve[i][0] = speeds[i];\r",
+        "\t\t\ttidal_power_curve[i][1] = power[i];\r",
+        "\t\t}\r",
+        "\t\treturn tidal_power_curve;\r",
+        "\t}",
         "\telse",
         "\t\treturn ${lib_tidal_power_curve};",
         "};",
@@ -910,7 +822,8 @@
         "",
         "on_load{'Marine Tidal Converter'}=define()",
         "{",
-        "\tupdate_controls();",
+        "\tupdate_controls();\r",
+        "\ttidal_design_label();",
         "\tplot_device_curve();",
         "};",
         "",
@@ -919,7 +832,15 @@
         "\tinput_tidal = (value(\"library_or_input_tidal\") == 1);",
         "\tshow(\"user_tidal_power_curve\", input_tidal);",
         "\tshow(\"lib_tidal_device\", !input_tidal);",
-        "\tshow(\"lib_tidal_power_curve\", !input_tidal);",
+        "\tshow(\"lib_tidal_power_curve\", !input_tidal);\r",
+        "\tenable('user_tidal_power_curve', value('library_or_input_tidal') != 2);\r",
+        "\tenable('lib_tidal_power_curve', value('library_or_input_tidal') != 2);\r",
+        "\tenable('device_rated_power', value('library_or_input_tidal') != 2);\r",
+        "\tenable('lib_tidal_device', value('library_or_input_tidal') != 2);\r",
+        "\tif (value('library_or_input_tidal') == 2) {\r",
+        "\t\tvalue('tidal_turbine_design_shown', 1);\r",
+        "\t}\r",
+        "\t",
         "\t/*",
         "\tshow('device_mooring', !input_wec);",
         "\tshow('device_foundation', !input_wec);",
@@ -931,12 +852,13 @@
         "\t*/",
         "\trefresh();",
         "}",
-        "",
+        "/*",
         "on_change{'library_or_input_tidal'} = define()",
         "{",
-        "\tupdate_controls();",
+        "\tupdate_controls();\r",
+        "\ttidal_design_label();",
         "};",
-        "",
+        "*/",
         "/*",
         "on_change{'lib_tidal_device'} = define()",
         "{",
@@ -945,6 +867,19 @@
         "\t\tvalue( 'wave_device_name', value('lib_wave_device') );",
         "\t}",
         "};*/",
+        "function tidal_design_label()\r",
+        "{\r",
+        "\tcheck = value('library_or_input_tidal');\r",
+        "\tif (check == 2) {\r",
+        "\t\tproperty('tidal_design_label','Caption',\"See tidal design module at bottom of page.\");\r",
+        "\t\tproperty('tidal_design_label','TextColour', 'red');\r",
+        "\t}\r",
+        "\telse {\r",
+        "\t\tproperty('tidal_design_label','Caption',\"\");\r",
+        "\t}\r",
+        "\r",
+        "\t\t\r",
+        "}\r",
         ""
     ]
 }
\ No newline at end of file
diff --git a/deploy/runtime/ui/Marine Tidal Turbine Design.json b/deploy/runtime/ui/Marine Tidal Turbine Design.json
new file mode 100644
index 0000000000..4f8e0240f2
--- /dev/null
+++ b/deploy/runtime/ui/Marine Tidal Turbine Design.json	
@@ -0,0 +1,940 @@
+{
+    "Name": "Marine Tidal Turbine Design",
+    "Width": 937.0,
+    "Height": 470.0,
+    "FormObjects": {
+        "GroupBox": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "GroupBox1"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 3.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 6.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 920.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 449.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Caption": {
+                    "Type": 5.0,
+                    "String": "Tidal Turbine Design"
+                },
+                "Bold": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                }
+            }
+        },
+        "Numeric": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "tidal_turbine_cut_out"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 198.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 234.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 118.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 24.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Value": {
+                    "Type": 1.0,
+                    "Double": 25.0
+                },
+                "Mode": {
+                    "Type": 3.0,
+                    "Integer": 1.0
+                },
+                "Format": {
+                    "Type": 3.0,
+                    "Integer": 1.0
+                },
+                "Decimals": {
+                    "Type": 3.0,
+                    "Integer": 3.0
+                },
+                "Prefix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Suffix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "ThousandsSep": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "Editable": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "ForeColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 0.0,
+                        "Green": 0.0,
+                        "Blue": 0.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "BackColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 255.0,
+                        "Green": 255.0,
+                        "Blue": 255.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "TabOrder": {
+                    "Type": 3.0,
+                    "Integer": 9.0
+                }
+            }
+        },
+        "Numeric": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "tidal_turbine_cutin"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 198.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 204.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 118.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 24.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Value": {
+                    "Type": 1.0,
+                    "Double": 4.0
+                },
+                "Mode": {
+                    "Type": 3.0,
+                    "Integer": 1.0
+                },
+                "Format": {
+                    "Type": 3.0,
+                    "Integer": 1.0
+                },
+                "Decimals": {
+                    "Type": 3.0,
+                    "Integer": 3.0
+                },
+                "Prefix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Suffix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "ThousandsSep": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "Editable": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "ForeColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 0.0,
+                        "Green": 0.0,
+                        "Blue": 0.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "BackColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 255.0,
+                        "Green": 255.0,
+                        "Blue": 255.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "TabOrder": {
+                    "Type": 3.0,
+                    "Integer": 8.0
+                }
+            }
+        },
+        "Numeric": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "tidal_turbine_kw_rating_input"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 198.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 54.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 118.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 24.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Value": {
+                    "Type": 1.0,
+                    "Double": 1500.0
+                },
+                "Mode": {
+                    "Type": 3.0,
+                    "Integer": 1.0
+                },
+                "Format": {
+                    "Type": 3.0,
+                    "Integer": 1.0
+                },
+                "Decimals": {
+                    "Type": 3.0,
+                    "Integer": 3.0
+                },
+                "Prefix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Suffix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "ThousandsSep": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "Editable": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "ForeColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 0.0,
+                        "Green": 0.0,
+                        "Blue": 0.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "BackColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 255.0,
+                        "Green": 255.0,
+                        "Blue": 255.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "TabOrder": {
+                    "Type": 3.0,
+                    "Integer": 3.0
+                }
+            }
+        },
+        "SchedNumeric": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "tidal_turbine_max_cp"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 198.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 177.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 118.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 24.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Label": {
+                    "Type": 5.0,
+                    "String": "Maximum CP"
+                },
+                "UseSchedule": {
+                    "Type": 2.0,
+                    "Boolean": 0.0
+                },
+                "ScheduleOnly": {
+                    "Type": 2.0,
+                    "Boolean": 0.0
+                },
+                "FixedLength": {
+                    "Type": 3.0,
+                    "Integer": -1.0
+                },
+                "Description": {
+                    "Type": 5.0,
+                    "String": "Enter an annual land lease cost for each year of the analysis period."
+                },
+                "TabOrder": {
+                    "Type": 3.0,
+                    "Integer": 1.0
+                }
+            }
+        },
+        "Numeric": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "tidal_turbine_number_rotors"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 198.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 114.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 118.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 24.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Value": {
+                    "Type": 1.0,
+                    "Double": 2.0
+                },
+                "Mode": {
+                    "Type": 3.0,
+                    "Integer": 1.0
+                },
+                "Format": {
+                    "Type": 3.0,
+                    "Integer": 1.0
+                },
+                "Decimals": {
+                    "Type": 3.0,
+                    "Integer": 3.0
+                },
+                "Prefix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Suffix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "ThousandsSep": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "Editable": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "ForeColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 0.0,
+                        "Green": 0.0,
+                        "Blue": 0.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "BackColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 255.0,
+                        "Green": 255.0,
+                        "Blue": 255.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "TabOrder": {
+                    "Type": 3.0,
+                    "Integer": 14.0
+                }
+            }
+        },
+        "Plot": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "tidal_turbine_power_curve_plot"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 366.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 27.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 540.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 414.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                }
+            }
+        },
+        "SchedNumeric": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "tidal_turbine_pto_eff"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 198.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 147.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 118.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 24.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Label": {
+                    "Type": 5.0,
+                    "String": "PTO efficiency (%)"
+                },
+                "UseSchedule": {
+                    "Type": 2.0,
+                    "Boolean": 0.0
+                },
+                "ScheduleOnly": {
+                    "Type": 2.0,
+                    "Boolean": 0.0
+                },
+                "FixedLength": {
+                    "Type": 3.0,
+                    "Integer": -1.0
+                },
+                "Description": {
+                    "Type": 5.0,
+                    "String": "Enter a PTO efficiency value for each current velocity bin"
+                },
+                "TabOrder": {
+                    "Type": 3.0,
+                    "Integer": 1.0
+                }
+            }
+        },
+        "Numeric": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "tidal_turbine_rotor_diameter_input"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 198.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 84.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 118.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 24.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Value": {
+                    "Type": 1.0,
+                    "Double": 75.0
+                },
+                "Mode": {
+                    "Type": 3.0,
+                    "Integer": 1.0
+                },
+                "Format": {
+                    "Type": 3.0,
+                    "Integer": 1.0
+                },
+                "Decimals": {
+                    "Type": 3.0,
+                    "Integer": 3.0
+                },
+                "Prefix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Suffix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "ThousandsSep": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "Editable": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "ForeColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 0.0,
+                        "Green": 0.0,
+                        "Blue": 0.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "BackColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 255.0,
+                        "Green": 255.0,
+                        "Blue": 255.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "TabOrder": {
+                    "Type": 3.0,
+                    "Integer": 4.0
+                }
+            }
+        }
+    },
+    "VarDatabase": {
+        "tidal.turbine.elevation": {
+            "Version": 4.0,
+            "Type": 1.0,
+            "Label": "Turbine hub height",
+            "Units": "",
+            "Group": "",
+            "IndexLabels": "",
+            "Flags": 8.0,
+            "DefaultValue": 0.0,
+            "UIObject": "Numeric",
+            "sscVariableName": "",
+            "sscVariableValue": ""
+        },
+        "tidal.turbine.max_tip_speed": {
+            "Version": 4.0,
+            "Type": 1.0,
+            "Label": "",
+            "Units": "",
+            "Group": "",
+            "IndexLabels": "",
+            "Flags": 0.0,
+            "DefaultValue": 0.0,
+            "UIObject": "Numeric",
+            "sscVariableName": "",
+            "sscVariableValue": ""
+        },
+        "tidal.turbine.max_tspeed_ratio": {
+            "Version": 4.0,
+            "Type": 1.0,
+            "Label": "",
+            "Units": "",
+            "Group": "",
+            "IndexLabels": "",
+            "Flags": 0.0,
+            "DefaultValue": 0.0,
+            "UIObject": "Numeric",
+            "sscVariableName": "",
+            "sscVariableValue": ""
+        },
+        "tidal_resource_shear": {
+            "Version": 4.0,
+            "Type": 1.0,
+            "Label": "",
+            "Units": "",
+            "Group": "",
+            "IndexLabels": "",
+            "Flags": 0.0,
+            "DefaultValue": 0.0,
+            "UIObject": "Numeric",
+            "sscVariableName": "",
+            "sscVariableValue": ""
+        },
+        "tidal_turbine_cut_out": {
+            "Version": 4.0,
+            "Type": 1.0,
+            "Label": "Cut-out tidal surface velocity",
+            "Units": "m/s",
+            "Group": "ME Tidal Converter",
+            "IndexLabels": "",
+            "Flags": 2.0,
+            "DefaultValue": 0.0,
+            "UIObject": "Numeric",
+            "sscVariableName": "",
+            "sscVariableValue": ""
+        },
+        "tidal_turbine_cutin": {
+            "Version": 4.0,
+            "Type": 1.0,
+            "Label": "Cut-in tidal surface velocity",
+            "Units": "m/s",
+            "Group": "ME Tidal Converter",
+            "IndexLabels": "",
+            "Flags": 2.0,
+            "DefaultValue": 0.0,
+            "UIObject": "Numeric",
+            "sscVariableName": "",
+            "sscVariableValue": ""
+        },
+        "tidal_turbine_hub_ht": {
+            "Version": 4.0,
+            "Type": 1.0,
+            "Label": "Tidal turbine hub height",
+            "Units": "m",
+            "Group": "ME Tidal Converter",
+            "IndexLabels": "",
+            "Flags": 0.0,
+            "DefaultValue": 0.0,
+            "UIObject": "Numeric",
+            "sscVariableName": "",
+            "sscVariableValue": ""
+        },
+        "tidal_turbine_kw_rating": {
+            "Version": 4.0,
+            "Type": 1.0,
+            "Label": "Generator Rated Power",
+            "Units": "kW",
+            "Group": "ME Tidal Converter",
+            "IndexLabels": "",
+            "Flags": 2.0,
+            "DefaultValue": 0.0,
+            "UIObject": "Numeric",
+            "sscVariableName": "",
+            "sscVariableValue": ""
+        },
+        "tidal_turbine_kw_rating_input": {
+            "Version": 4.0,
+            "Type": 1.0,
+            "Label": "User-defined rated output",
+            "Units": "kW",
+            "Group": "ME Tidal Converter",
+            "IndexLabels": "",
+            "Flags": 2.0,
+            "DefaultValue": 0.0,
+            "UIObject": "Numeric",
+            "sscVariableName": "",
+            "sscVariableValue": ""
+        },
+        "tidal_turbine_max_cp": {
+            "Version": 4.0,
+            "Type": 2.0,
+            "Label": "Maximum Cp",
+            "Units": "",
+            "Group": "ME Tidal Converter",
+            "IndexLabels": "",
+            "Flags": 2.0,
+            "DefaultValue": [
+                0.0
+            ],
+            "UIObject": "SchedNumeric",
+            "sscVariableName": "",
+            "sscVariableValue": ""
+        },
+        "tidal_turbine_number_rotors": {
+            "Version": 4.0,
+            "Type": 1.0,
+            "Label": "Number of rotors",
+            "Units": "",
+            "Group": "ME Tidal Converters",
+            "IndexLabels": "",
+            "Flags": 0.0,
+            "DefaultValue": 2.0,
+            "UIObject": "Default",
+            "sscVariableName": "",
+            "sscVariableValue": ""
+        },
+        "tidal_turbine_powercurve_powerout": {
+            "Version": 4.0,
+            "Type": 2.0,
+            "Label": "Tidal turbine power curve",
+            "Units": "kW",
+            "Group": "ME Tidal Converter",
+            "IndexLabels": "",
+            "Flags": 8.0,
+            "DefaultValue": [
+                0.0
+            ],
+            "UIObject": "Default",
+            "sscVariableName": "",
+            "sscVariableValue": ""
+        },
+        "tidal_turbine_powercurve_tidalspeeds": {
+            "Version": 4.0,
+            "Type": 2.0,
+            "Label": "Tidal turbine tide speeds",
+            "Units": "m/s",
+            "Group": "ME Tidal Converter",
+            "IndexLabels": "",
+            "Flags": 8.0,
+            "DefaultValue": [
+                0.0,
+                0.0,
+                0.0,
+                0.0,
+                0.0,
+                0.0,
+                0.0
+            ],
+            "UIObject": "Default",
+            "sscVariableName": "",
+            "sscVariableValue": ""
+        },
+        "tidal_turbine_pto_eff": {
+            "Version": 4.0,
+            "Type": 2.0,
+            "Label": "PTO efficiency",
+            "Units": "%",
+            "Group": "ME Tidal Converter",
+            "IndexLabels": "",
+            "Flags": 0.0,
+            "DefaultValue": [
+                0.0
+            ],
+            "UIObject": "SchedNumeric",
+            "sscVariableName": "",
+            "sscVariableValue": ""
+        },
+        "tidal_turbine_rotor_diameter": {
+            "Version": 4.0,
+            "Type": 1.0,
+            "Label": "Tidal turbine rotor diameter",
+            "Units": "m",
+            "Group": "ME Tidal Converter",
+            "IndexLabels": "",
+            "Flags": 2.0,
+            "DefaultValue": 0.0,
+            "UIObject": "Numeric",
+            "sscVariableName": "",
+            "sscVariableValue": ""
+        },
+        "tidal_turbine_rotor_diameter_input": {
+            "Version": 4.0,
+            "Type": 1.0,
+            "Label": "User-defined rotor diameter",
+            "Units": "m",
+            "Group": "ME Tidal Converter",
+            "IndexLabels": "",
+            "Flags": 2.0,
+            "DefaultValue": 0.0,
+            "UIObject": "Numeric",
+            "sscVariableName": "",
+            "sscVariableValue": ""
+        },
+        "tidal_turbine_site_depth": {
+            "Version": 4.0,
+            "Type": 1.0,
+            "Label": "Site depth",
+            "Units": "m",
+            "Group": "ME Tidal Converter",
+            "IndexLabels": "",
+            "Flags": 8.0,
+            "DefaultValue": 0.0,
+            "UIObject": "Default",
+            "sscVariableName": "",
+            "sscVariableValue": ""
+        },
+        "tidal_velocity_power_law_fit": {
+            "Version": 4.0,
+            "Type": 1.0,
+            "Label": "Velocity power law fit",
+            "Units": "1/x",
+            "Group": "ME Tidal Converter",
+            "IndexLabels": "",
+            "Flags": 2.0,
+            "DefaultValue": 0.0,
+            "UIObject": "Default",
+            "sscVariableName": "",
+            "sscVariableValue": ""
+        }
+    },
+    "Equations": [
+        "equations{'tidal_turbine_site_depth'} = define() {\r",
+        "\treturn ${water_depth};\r",
+        "};\r",
+        "\r",
+        "equations{ '$MIMO$ tidalturbinemod' } = define() {\r",
+        "\t// reset the error message\r",
+        "\r",
+        "\t// if we don't need to calculate the curve, get it from library and get out\r",
+        "\t\r",
+        "\t// make sure error msg starts empty\r",
+        "\t//errmsg = \"\";\r",
+        "\r",
+        "\t// If user defined turbine, get user inputs, otherwise get values for kW rating and rotor diameter from the library for the (non-generic) turbine chosen in the drop-down\r",
+        "\tdata.tidal_turbine_rotor_diameter = ${tidal_turbine_rotor_diameter_input};\r",
+        "\tdata.number_rotors = ${tidal_turbine_number_rotors};\r",
+        "\tdata.tidal_turbine_max_cp = ${tidal_turbine_max_cp};\r",
+        "\tdata.cut_in = ${tidal_turbine_cutin};\r",
+        "\tdata.cut_out = ${tidal_turbine_cut_out};\r",
+        "\tdata.tidal_resource = ${tidal_resource};\r",
+        "\tdata.generator_rated_capacity = ${tidal_turbine_kw_rating_input};\r",
+        "\tdata.pto_efficiency = ${tidal_turbine_pto_eff};\r",
+        "\t\r",
+        "\t\r",
+        "\tsuccess = ssc_eqn(\"tidal_turbine_calculate_powercurve\", data);\r",
+        "\t/*\r",
+        "\tif (!success){\r",
+        "\t\tmsgbox(data.error);\r",
+        "\t\treturn 0;\r",
+        "\t}*/\r",
+        "\t/*\r",
+        "\tif (strlen(data.error) >4) {\r",
+        "\t\t${tidal_turbine_powercurve_err_msg} = data.error;\r",
+        "\t\t${tidal_turbine_powercurve_tidalspeeds} = [0]; //Show that equation failed so no plot\r",
+        "\t\t${tidal_turbine_powercurve_powerout} = [0]; //Show that equation failed so no plot\r",
+        "\t\t${tidal_turbine_powercurve_hub_efficiency} = [0]; //Show that equation failed so no plot\r",
+        "\t\tmsgbox(data.error);\r",
+        "\t\treturn 0;\r",
+        "\t}*/\r",
+        "\t\r",
+        "\tts = data.tidal_turbine_powercurve_tidespeeds;\r",
+        "\tpower = data.tidal_turbine_powercurve_powerout;\r",
+        "\t${tidal_turbine_powercurve_tidalspeeds} = ts;\r",
+        "\t${tidal_turbine_powercurve_powerout} = power;\r",
+        "\t\r",
+        "\t// other outputs\r",
+        "\treturn 0;\r",
+        "};\r",
+        ""
+    ],
+    "Callbacks": [
+        "function plot_turbine_curve()\r",
+        "{\r",
+        "\tsetplot('tidal_turbine_power_curve_plot');\r",
+        "\tclearplot('tidal_turbine_power_curve_plot');\r",
+        "\tplotopt( {'title'='Turbine power curve','backcolor'=[255,255,255], 'popup'=true, 'legend'=false, 'legendpos'=[75,10]}  );\r",
+        "\t\r",
+        "\tws = ${tidal_turbine_powercurve_tidalspeeds};\r",
+        "\tpc = ${tidal_turbine_powercurve_powerout};\r",
+        "\tplot( ws, pc, {'thick'=1, 'scale'=true, 'color'=[100,200,100], 'series'='Turbine Output'});\r",
+        "\t\r",
+        "\thigh = max( ws );\r",
+        "\tlow = min( ws );\r",
+        "\tpad = (high - low) * 0.05;\r",
+        "\taxis( 'x1', {'label'='Velocity (m/s)', 'min'=floor(low-pad), 'max'=ceil(high+pad) });\r",
+        "\t\r",
+        "\thigh = max( pc );\r",
+        "\tlow = min( pc );\r",
+        "\tpad = (high - low) * 0.05;\r",
+        "\taxis( 'y1', {'label'='Turbine Power (kW)', 'min'=floor(low-pad), 'max'=ceil(high+pad) });\r",
+        "\t\r",
+        "\t// show any error messages\r",
+        "\t//set_error_msg();\r",
+        "}\r",
+        "\r",
+        "on_load{'Marine Tidal Turbine Design'} = define() {\r",
+        "\tset_turbine_sched();\r",
+        "\tplot_turbine_curve();\r",
+        "\t//set_error_msg();\r",
+        "};\r",
+        "\r",
+        "function set_turbine_sched() {\r",
+        "\tlength = #${tidal_resource};\r",
+        "\tproperty('tidal_turbine_pto_eff','FixedLength', length);\r",
+        "\tproperty('tidal_turbine_max_cp','FixedLength', length);\r",
+        "\trefresh();\r",
+        "}\r",
+        "\r",
+        "on_change{'tidal_turbine_kw_rating_input'} = define() { plot_turbine_curve();};\r",
+        "on_change{'tidal_turbine_rotor_diameter_input'} = define() { plot_turbine_curve();};\r",
+        "on_change{'tidal_turbine_max_cp'} = define() { set_turbine_sched();plot_turbine_curve();};\r",
+        "on_change{'tidal_turbine_pto_eff'} = define() { set_turbine_sched();plot_turbine_curve();};\r",
+        "on_change{'tidal_turbine_cutin'} = define() { plot_turbine_curve();};\r",
+        "on_change{'tidal_turbine_cut_out'} = define() { plot_turbine_curve();};\r",
+        "on_change{'tidal_turbine_number_rotors'} = define() { plot_turbine_curve();};"
+    ]
+}
\ No newline at end of file
diff --git a/deploy/runtime/ui/Marine Wave Turbine Design.json b/deploy/runtime/ui/Marine Wave Turbine Design.json
new file mode 100644
index 0000000000..e73ec6aea8
--- /dev/null
+++ b/deploy/runtime/ui/Marine Wave Turbine Design.json	
@@ -0,0 +1,1319 @@
+{
+    "Name": "Marine Wave Turbine Design",
+    "Width": 961.0,
+    "Height": 688.0,
+    "FormObjects": {
+        "GroupBox": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "GroupBox1"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 3.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 6.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 950.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 671.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Caption": {
+                    "Type": 5.0,
+                    "String": "Wind Turbine"
+                },
+                "Bold": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                }
+            }
+        },
+        "Numeric": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "wave.turbine.elevation"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 243.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 417.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 118.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 24.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Value": {
+                    "Type": 1.0,
+                    "Double": 0.0
+                },
+                "Mode": {
+                    "Type": 3.0,
+                    "Integer": 1.0
+                },
+                "Format": {
+                    "Type": 3.0,
+                    "Integer": 0.0
+                },
+                "Decimals": {
+                    "Type": 3.0,
+                    "Integer": 0.0
+                },
+                "Prefix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Suffix": {
+                    "Type": 5.0,
+                    "String": " m"
+                },
+                "ThousandsSep": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "Editable": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "ForeColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 0.0,
+                        "Green": 0.0,
+                        "Blue": 0.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "BackColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 255.0,
+                        "Green": 255.0,
+                        "Blue": 255.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "TabOrder": {
+                    "Type": 3.0,
+                    "Integer": -1.0
+                }
+            }
+        },
+        "Numeric": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "wave.turbine.max_tip_speed"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 243.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 321.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 118.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 21.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Value": {
+                    "Type": 1.0,
+                    "Double": 80.0
+                },
+                "Mode": {
+                    "Type": 3.0,
+                    "Integer": 1.0
+                },
+                "Format": {
+                    "Type": 3.0,
+                    "Integer": 1.0
+                },
+                "Decimals": {
+                    "Type": 3.0,
+                    "Integer": 3.0
+                },
+                "Prefix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Suffix": {
+                    "Type": 5.0,
+                    "String": " m/s"
+                },
+                "ThousandsSep": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "Editable": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "ForeColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 0.0,
+                        "Green": 0.0,
+                        "Blue": 0.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "BackColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 255.0,
+                        "Green": 255.0,
+                        "Blue": 255.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "TabOrder": {
+                    "Type": 3.0,
+                    "Integer": 6.0
+                }
+            }
+        },
+        "Numeric": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "wave.turbine.max_tspeed_ratio"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 243.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 345.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 118.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 21.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Value": {
+                    "Type": 1.0,
+                    "Double": 8.0
+                },
+                "Mode": {
+                    "Type": 3.0,
+                    "Integer": 1.0
+                },
+                "Format": {
+                    "Type": 3.0,
+                    "Integer": 1.0
+                },
+                "Decimals": {
+                    "Type": 3.0,
+                    "Integer": 3.0
+                },
+                "Prefix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Suffix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "ThousandsSep": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "Editable": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "ForeColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 0.0,
+                        "Green": 0.0,
+                        "Blue": 0.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "BackColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 255.0,
+                        "Green": 255.0,
+                        "Blue": 255.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "TabOrder": {
+                    "Type": 3.0,
+                    "Integer": 7.0
+                }
+            }
+        },
+        "Numeric": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "wave_resource_shear"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 261.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 156.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 100.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 21.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Value": {
+                    "Type": 1.0,
+                    "Double": 0.14
+                },
+                "Mode": {
+                    "Type": 3.0,
+                    "Integer": 1.0
+                },
+                "Format": {
+                    "Type": 3.0,
+                    "Integer": 1.0
+                },
+                "Decimals": {
+                    "Type": 3.0,
+                    "Integer": 3.0
+                },
+                "Prefix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Suffix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "ThousandsSep": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "Editable": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "ForeColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 0.0,
+                        "Green": 0.0,
+                        "Blue": 0.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "BackColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 255.0,
+                        "Green": 255.0,
+                        "Blue": 255.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "TabOrder": {
+                    "Type": 3.0,
+                    "Integer": 14.0
+                }
+            }
+        },
+        "Numeric": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "wave_turbine_cut_out"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 243.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 393.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 118.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 21.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Value": {
+                    "Type": 1.0,
+                    "Double": 25.0
+                },
+                "Mode": {
+                    "Type": 3.0,
+                    "Integer": 1.0
+                },
+                "Format": {
+                    "Type": 3.0,
+                    "Integer": 1.0
+                },
+                "Decimals": {
+                    "Type": 3.0,
+                    "Integer": 3.0
+                },
+                "Prefix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Suffix": {
+                    "Type": 5.0,
+                    "String": " m/s"
+                },
+                "ThousandsSep": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "Editable": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "ForeColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 0.0,
+                        "Green": 0.0,
+                        "Blue": 0.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "BackColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 255.0,
+                        "Green": 255.0,
+                        "Blue": 255.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "TabOrder": {
+                    "Type": 3.0,
+                    "Integer": 9.0
+                }
+            }
+        },
+        "Numeric": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "wave_turbine_cutin"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 243.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 369.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 118.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 21.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Value": {
+                    "Type": 1.0,
+                    "Double": 4.0
+                },
+                "Mode": {
+                    "Type": 3.0,
+                    "Integer": 1.0
+                },
+                "Format": {
+                    "Type": 3.0,
+                    "Integer": 1.0
+                },
+                "Decimals": {
+                    "Type": 3.0,
+                    "Integer": 3.0
+                },
+                "Prefix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Suffix": {
+                    "Type": 5.0,
+                    "String": " m/s"
+                },
+                "ThousandsSep": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "Editable": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "ForeColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 0.0,
+                        "Green": 0.0,
+                        "Blue": 0.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "BackColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 255.0,
+                        "Green": 255.0,
+                        "Blue": 255.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "TabOrder": {
+                    "Type": 3.0,
+                    "Integer": 8.0
+                }
+            }
+        },
+        "Numeric": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "wave_turbine_hub_ht"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 261.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 132.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 100.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 21.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Value": {
+                    "Type": 1.0,
+                    "Double": 80.0
+                },
+                "Mode": {
+                    "Type": 3.0,
+                    "Integer": 1.0
+                },
+                "Format": {
+                    "Type": 3.0,
+                    "Integer": 1.0
+                },
+                "Decimals": {
+                    "Type": 3.0,
+                    "Integer": 3.0
+                },
+                "Prefix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Suffix": {
+                    "Type": 5.0,
+                    "String": " m"
+                },
+                "ThousandsSep": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "Editable": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "ForeColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 0.0,
+                        "Green": 0.0,
+                        "Blue": 0.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "BackColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 255.0,
+                        "Green": 255.0,
+                        "Blue": 255.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "TabOrder": {
+                    "Type": 3.0,
+                    "Integer": 13.0
+                }
+            }
+        },
+        "Numeric": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "wave_turbine_kw_rating"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 261.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 84.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 100.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 21.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Value": {
+                    "Type": 1.0,
+                    "Double": 1500.0
+                },
+                "Mode": {
+                    "Type": 3.0,
+                    "Integer": 1.0
+                },
+                "Format": {
+                    "Type": 3.0,
+                    "Integer": 0.0
+                },
+                "Decimals": {
+                    "Type": 3.0,
+                    "Integer": 2.0
+                },
+                "Prefix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Suffix": {
+                    "Type": 5.0,
+                    "String": " kW"
+                },
+                "ThousandsSep": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "Editable": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "ForeColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 0.0,
+                        "Green": 0.0,
+                        "Blue": 0.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "BackColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 255.0,
+                        "Green": 255.0,
+                        "Blue": 255.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "TabOrder": {
+                    "Type": 3.0,
+                    "Integer": 27.0
+                }
+            }
+        },
+        "Numeric": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "wave_turbine_kw_rating_input"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 243.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 249.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 118.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 21.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Value": {
+                    "Type": 1.0,
+                    "Double": 1500.0
+                },
+                "Mode": {
+                    "Type": 3.0,
+                    "Integer": 1.0
+                },
+                "Format": {
+                    "Type": 3.0,
+                    "Integer": 1.0
+                },
+                "Decimals": {
+                    "Type": 3.0,
+                    "Integer": 3.0
+                },
+                "Prefix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Suffix": {
+                    "Type": 5.0,
+                    "String": " kW"
+                },
+                "ThousandsSep": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "Editable": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "ForeColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 0.0,
+                        "Green": 0.0,
+                        "Blue": 0.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "BackColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 255.0,
+                        "Green": 255.0,
+                        "Blue": 255.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "TabOrder": {
+                    "Type": 3.0,
+                    "Integer": 3.0
+                }
+            }
+        },
+        "Numeric": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "wave_turbine_max_cp"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 243.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 297.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 118.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 21.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Value": {
+                    "Type": 1.0,
+                    "Double": 0.45
+                },
+                "Mode": {
+                    "Type": 3.0,
+                    "Integer": 1.0
+                },
+                "Format": {
+                    "Type": 3.0,
+                    "Integer": 1.0
+                },
+                "Decimals": {
+                    "Type": 3.0,
+                    "Integer": 3.0
+                },
+                "Prefix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Suffix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "ThousandsSep": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "Editable": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "ForeColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 0.0,
+                        "Green": 0.0,
+                        "Blue": 0.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "BackColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 255.0,
+                        "Green": 255.0,
+                        "Blue": 255.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "TabOrder": {
+                    "Type": 3.0,
+                    "Integer": 5.0
+                }
+            }
+        },
+        "Numeric": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "wave_turbine_rotor_diameter"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 261.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 108.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 100.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 21.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Value": {
+                    "Type": 1.0,
+                    "Double": 75.0
+                },
+                "Mode": {
+                    "Type": 3.0,
+                    "Integer": 1.0
+                },
+                "Format": {
+                    "Type": 3.0,
+                    "Integer": 0.0
+                },
+                "Decimals": {
+                    "Type": 3.0,
+                    "Integer": 2.0
+                },
+                "Prefix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Suffix": {
+                    "Type": 5.0,
+                    "String": " m"
+                },
+                "ThousandsSep": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "Editable": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "ForeColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 0.0,
+                        "Green": 0.0,
+                        "Blue": 0.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "BackColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 255.0,
+                        "Green": 255.0,
+                        "Blue": 255.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "TabOrder": {
+                    "Type": 3.0,
+                    "Integer": 14.0
+                }
+            }
+        },
+        "Numeric": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "wave_turbine_rotor_diameter_input"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 243.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 273.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 118.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 21.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Value": {
+                    "Type": 1.0,
+                    "Double": 75.0
+                },
+                "Mode": {
+                    "Type": 3.0,
+                    "Integer": 1.0
+                },
+                "Format": {
+                    "Type": 3.0,
+                    "Integer": 1.0
+                },
+                "Decimals": {
+                    "Type": 3.0,
+                    "Integer": 3.0
+                },
+                "Prefix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Suffix": {
+                    "Type": 5.0,
+                    "String": " m"
+                },
+                "ThousandsSep": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "Editable": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "ForeColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 0.0,
+                        "Green": 0.0,
+                        "Blue": 0.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "BackColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 255.0,
+                        "Green": 255.0,
+                        "Blue": 255.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "TabOrder": {
+                    "Type": 3.0,
+                    "Integer": 4.0
+                }
+            }
+        },
+        "RadioChoice": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "wind.turbine.radio_list_or_design"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 15.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 27.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 347.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 50.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Selection": {
+                    "Type": 3.0,
+                    "Integer": -1.0
+                },
+                "Items": {
+                    "Type": 6.0,
+                    "StringList": "Select a turbine from the library|Define turbine design characteristics"
+                },
+                "ShowCaptions": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "Horizontal": {
+                    "Type": 2.0,
+                    "Boolean": 0.0
+                },
+                "TabOrder": {
+                    "Type": 3.0,
+                    "Integer": 1.0
+                }
+            }
+        },
+        "Label": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "wind_turbine_hub_ht_msg"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 21.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 531.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 335.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 60.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Caption": {
+                    "Type": 5.0,
+                    "String": "Error messages"
+                },
+                "TextColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 255.0,
+                        "Green": 0.0,
+                        "Blue": 0.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "Bold": {
+                    "Type": 2.0,
+                    "Boolean": 0.0
+                },
+                "FontSize": {
+                    "Type": 3.0,
+                    "Integer": 0.0
+                },
+                "WordWrap": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "AlignRight": {
+                    "Type": 2.0,
+                    "Boolean": 0.0
+                },
+                "AlignTop": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                }
+            }
+        },
+        "Plot": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "wind_turbine_power_curve_plot"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 366.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 27.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 573.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 414.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                }
+            }
+        },
+        "Label": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "wind_turbine_powercurve_err_msg"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 21.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 594.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 335.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 60.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Caption": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "TextColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 255.0,
+                        "Green": 0.0,
+                        "Blue": 0.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "Bold": {
+                    "Type": 2.0,
+                    "Boolean": 0.0
+                },
+                "FontSize": {
+                    "Type": 3.0,
+                    "Integer": 0.0
+                },
+                "WordWrap": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "AlignRight": {
+                    "Type": 2.0,
+                    "Boolean": 0.0
+                },
+                "AlignTop": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                }
+            }
+        }
+    },
+    "VarDatabase": {},
+    "Equations": [],
+    "Callbacks": [
+        "function plot_turbine_curve()\r",
+        "{\r",
+        "\tsetplot('wind_turbine_power_curve_plot');\r",
+        "\tclearplot('wind_turbine_power_curve_plot');\r",
+        "\tplotopt( {'title'='Turbine power curve','backcolor'=[255,255,255], 'popup'=true, 'legend'=false, 'legendpos'=[75,10]}  );\r",
+        "\t\r",
+        "\tws = ${wind_turbine_powercurve_windspeeds};\r",
+        "\tpc = ${wind_turbine_powercurve_powerout};\r",
+        "\tplot( ws, pc, {'thick'=1, 'scale'=true, 'color'=[100,200,100], 'series'='Turbine Output'});\r",
+        "\t\r",
+        "\thigh = max( ws );\r",
+        "\tlow = min( ws );\r",
+        "\tpad = (high - low) * 0.05;\r",
+        "\taxis( 'x1', {'label'='Wind Speed (m/s)', 'min'=floor(low-pad), 'max'=ceil(high+pad) });\r",
+        "\t\r",
+        "\thigh = max( pc );\r",
+        "\tlow = min( pc );\r",
+        "\tpad = (high - low) * 0.05;\r",
+        "\taxis( 'y1', {'label'='Turbine Power (kW)', 'min'=floor(low-pad), 'max'=ceil(high+pad) });\r",
+        "\t\r",
+        "\t// show any error messages\r",
+        "\tset_error_msg();\r",
+        "}\r",
+        "\r",
+        "function set_error_msg()\r",
+        "{\t\r",
+        "\t// Start with a fresh error message\r",
+        "\terrmsg = '';\r",
+        "\r",
+        "\t// Check hub height compared to rotor diameter\r",
+        "\trotor_diameter = ${wind_turbine_rotor_diameter};\r",
+        "\thubht = ${wind_turbine_hub_ht};\r",
+        "\tif (hubht <  (rotor_diameter/2)+10) \r",
+        "\t\terrmsg += 'Turbine hub height is too low for rotor diameter. ';\r",
+        "\t\r",
+        "\t// Check resource height compared to hub height- not for weibull\r",
+        "\tif(${wind_resource_model_choice} != 1) \r",
+        "\t{\r",
+        "\t\tssc = ssc_create();\r",
+        "\t\tssc_var( ssc, 'file_name', ${wind_resource_filename});\t\r",
+        "\t\tssc_var(ssc, 'scan_header_only', 1);\r",
+        "\t\tssc_var(ssc, 'requested_ht', hubht);\r",
+        "\t\terr = ssc_exec(ssc, 'wind_file_reader');\r",
+        "\t\tif (err != 0) //file didn't run successfully\r",
+        "\t\t{\r",
+        "\t\t\tmsgbox('Could not check hub height compared to resource height. This may indicate a problem with your weather file.');\r",
+        "\t\t\treturn;\r",
+        "\t\t}\r",
+        "\t\tclosest_ht = ssc_var(ssc, 'closest_speed_meas_ht');\r",
+        "\t\tssc_free(ssc);\r",
+        "\t\tif (hubht > closest_ht + 35) errmsg += 'Turbine hub height is more than 35 meters taller than the measured resource data. ';\r",
+        "\t\tif (hubht < closest_ht - 35) errmsg += 'Turbine hub height is more than 35 meters shorter than the measured resource data. ';\r",
+        "\t}\r",
+        "\t\r",
+        "\t// Check for negative values in power curve\r",
+        "\tpc = ${wind_turbine_powercurve_powerout};\r",
+        "\tfor (i=0; i<#pc; i++)\r",
+        "\t{\r",
+        "\t\tif (pc[i] < 0) //negative power curve value\r",
+        "\t\t{\r",
+        "\t\t\terrmsg += 'Turbine power curve contains negative values. Please check your inputs. ';\r",
+        "\t\t\tbreak;\r",
+        "\t\t}\r",
+        "\t}\r",
+        "\t\r",
+        "\t//assign error message\r",
+        "\tproperty('wind_turbine_hub_ht_msg', 'Caption', errmsg );\r",
+        "}\r",
+        "\r",
+        "on_load{'Marine Wave Turbine Design'} = define() {\r",
+        "\tplot_turbine_curve();\r",
+        "\tset_error_msg();\r",
+        "};"
+    ]
+}
\ No newline at end of file
diff --git a/deploy/runtime/ui/PV2 Interconnection.json b/deploy/runtime/ui/PV2 Interconnection.json
new file mode 100644
index 0000000000..9c33cb7770
--- /dev/null
+++ b/deploy/runtime/ui/PV2 Interconnection.json	
@@ -0,0 +1,823 @@
+{
+    "Name": "PV2 Interconnection",
+    "Width": 803.0,
+    "Height": 379.0,
+    "FormObjects": {
+        "Numeric": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "ac_loss"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 279.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 138.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 91.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 24.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Value": {
+                    "Type": 1.0,
+                    "Double": 0.0
+                },
+                "Mode": {
+                    "Type": 3.0,
+                    "Integer": 1.0
+                },
+                "Format": {
+                    "Type": 3.0,
+                    "Integer": 1.0
+                },
+                "Decimals": {
+                    "Type": 3.0,
+                    "Integer": 2.0
+                },
+                "Prefix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Suffix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "ThousandsSep": {
+                    "Type": 2.0,
+                    "Boolean": 0.0
+                },
+                "Editable": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "ForeColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 0.0,
+                        "Green": 0.0,
+                        "Blue": 0.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "BackColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 255.0,
+                        "Green": 255.0,
+                        "Blue": 255.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "TabOrder": {
+                    "Type": 3.0,
+                    "Integer": 35.0
+                }
+            }
+        },
+        "LossAdjustment": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "adjust"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 57.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 222.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 395.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 54.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "TabOrder": {
+                    "Type": 3.0,
+                    "Integer": -1.0
+                },
+                "Description": {
+                    "Type": 5.0,
+                    "String": "System Availability Losses"
+                },
+                "Label": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Mode": {
+                    "Type": 3.0,
+                    "Integer": 1.0
+                },
+                "AnalysisPeriod": {
+                    "Type": 3.0,
+                    "Integer": 25.0
+                },
+                "ShowMode": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "AnnualEnabled": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "WeeklyEnabled": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                }
+            }
+        },
+        "Numeric": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "object 11"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 279.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 42.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 90.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 24.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Value": {
+                    "Type": 1.0,
+                    "Double": 0.5
+                },
+                "Mode": {
+                    "Type": 3.0,
+                    "Integer": 1.0
+                },
+                "Format": {
+                    "Type": 3.0,
+                    "Integer": 1.0
+                },
+                "Decimals": {
+                    "Type": 3.0,
+                    "Integer": 3.0
+                },
+                "Prefix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Suffix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "ThousandsSep": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "Editable": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "ForeColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 0.0,
+                        "Green": 0.0,
+                        "Blue": 0.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "BackColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 255.0,
+                        "Green": 255.0,
+                        "Blue": 255.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "TabOrder": {
+                    "Type": 3.0,
+                    "Integer": -1.0
+                }
+            }
+        },
+        "GroupBox": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "object 4"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 9.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 12.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 783.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 69.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Caption": {
+                    "Type": 5.0,
+                    "String": "AC wiring"
+                },
+                "Bold": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                }
+            }
+        },
+        "GroupBox": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "object 410"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 9.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 189.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 783.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 177.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Caption": {
+                    "Type": 5.0,
+                    "String": "System availability"
+                },
+                "Bold": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                }
+            }
+        },
+        "GroupBox": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "object 48"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 9.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 84.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 783.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 96.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Caption": {
+                    "Type": 5.0,
+                    "String": "Transformer"
+                },
+                "Bold": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                }
+            }
+        },
+        "Label": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "object 7"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 372.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 111.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 21.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 24.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Caption": {
+                    "Type": 5.0,
+                    "String": "%"
+                },
+                "TextColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 0.0,
+                        "Green": 0.0,
+                        "Blue": 0.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "Bold": {
+                    "Type": 2.0,
+                    "Boolean": 0.0
+                },
+                "FontSize": {
+                    "Type": 3.0,
+                    "Integer": 0.0
+                },
+                "WordWrap": {
+                    "Type": 2.0,
+                    "Boolean": 0.0
+                },
+                "AlignRight": {
+                    "Type": 2.0,
+                    "Boolean": 0.0
+                },
+                "AlignTop": {
+                    "Type": 2.0,
+                    "Boolean": 0.0
+                }
+            }
+        },
+        "Label": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "object 71"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 372.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 42.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 21.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 24.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Caption": {
+                    "Type": 5.0,
+                    "String": "%"
+                },
+                "TextColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 0.0,
+                        "Green": 0.0,
+                        "Blue": 0.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "Bold": {
+                    "Type": 2.0,
+                    "Boolean": 0.0
+                },
+                "FontSize": {
+                    "Type": 3.0,
+                    "Integer": 0.0
+                },
+                "WordWrap": {
+                    "Type": 2.0,
+                    "Boolean": 0.0
+                },
+                "AlignRight": {
+                    "Type": 2.0,
+                    "Boolean": 0.0
+                },
+                "AlignTop": {
+                    "Type": 2.0,
+                    "Boolean": 0.0
+                }
+            }
+        },
+        "Label": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "object 711"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 54.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 294.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 366.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 51.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Caption": {
+                    "Type": 5.0,
+                    "String": "System availability losses reduce the system output to represent system outages or other events."
+                },
+                "TextColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 0.0,
+                        "Green": 0.0,
+                        "Blue": 0.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "Bold": {
+                    "Type": 2.0,
+                    "Boolean": 0.0
+                },
+                "FontSize": {
+                    "Type": 3.0,
+                    "Integer": 0.0
+                },
+                "WordWrap": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "AlignRight": {
+                    "Type": 2.0,
+                    "Boolean": 0.0
+                },
+                "AlignTop": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                }
+            }
+        },
+        "Label": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "object 712"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 63.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 138.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 213.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 24.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Caption": {
+                    "Type": 5.0,
+                    "String": "Transformer efficiency coefficient "
+                },
+                "TextColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 0.0,
+                        "Green": 0.0,
+                        "Blue": 0.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "Bold": {
+                    "Type": 2.0,
+                    "Boolean": 0.0
+                },
+                "FontSize": {
+                    "Type": 3.0,
+                    "Integer": 0.0
+                },
+                "WordWrap": {
+                    "Type": 2.0,
+                    "Boolean": 0.0
+                },
+                "AlignRight": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "AlignTop": {
+                    "Type": 2.0,
+                    "Boolean": 0.0
+                }
+            }
+        },
+        "Label": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "object 72"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 99.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 111.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 177.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 24.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Caption": {
+                    "Type": 5.0,
+                    "String": "Transformer losses"
+                },
+                "TextColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 0.0,
+                        "Green": 0.0,
+                        "Blue": 0.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "Bold": {
+                    "Type": 2.0,
+                    "Boolean": 0.0
+                },
+                "FontSize": {
+                    "Type": 3.0,
+                    "Integer": 0.0
+                },
+                "WordWrap": {
+                    "Type": 2.0,
+                    "Boolean": 0.0
+                },
+                "AlignRight": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "AlignTop": {
+                    "Type": 2.0,
+                    "Boolean": 0.0
+                }
+            }
+        },
+        "Label": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "object 76"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 102.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 42.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 174.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 24.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Caption": {
+                    "Type": 5.0,
+                    "String": "AC wiring losses"
+                },
+                "TextColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 0.0,
+                        "Green": 0.0,
+                        "Blue": 0.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "Bold": {
+                    "Type": 2.0,
+                    "Boolean": 0.0
+                },
+                "FontSize": {
+                    "Type": 3.0,
+                    "Integer": 0.0
+                },
+                "WordWrap": {
+                    "Type": 2.0,
+                    "Boolean": 0.0
+                },
+                "AlignRight": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "AlignTop": {
+                    "Type": 2.0,
+                    "Boolean": 0.0
+                }
+            }
+        },
+        "Numeric": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "transformer_loss"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 279.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 111.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 91.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 24.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Value": {
+                    "Type": 1.0,
+                    "Double": 0.0
+                },
+                "Mode": {
+                    "Type": 3.0,
+                    "Integer": 1.0
+                },
+                "Format": {
+                    "Type": 3.0,
+                    "Integer": 1.0
+                },
+                "Decimals": {
+                    "Type": 3.0,
+                    "Integer": 3.0
+                },
+                "Prefix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Suffix": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "ThousandsSep": {
+                    "Type": 2.0,
+                    "Boolean": 0.0
+                },
+                "Editable": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "ForeColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 0.0,
+                        "Green": 0.0,
+                        "Blue": 0.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "BackColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 255.0,
+                        "Green": 255.0,
+                        "Blue": 255.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "TabOrder": {
+                    "Type": 3.0,
+                    "Integer": 34.0
+                }
+            }
+        }
+    },
+    "VarDatabase": {},
+    "Equations": [],
+    "Callbacks": [
+        "function loss_adjustment_set() ",
+        "{",
+        "\tif (financing() != \"LCOE Calculator\" && financing() != \"None\") {",
+        "\t\tif (value('system_use_lifetime_output') == 1) {",
+        "\t\t\tproperty('adjust', 'AnalysisPeriod', value('analysis_period'));",
+        "\t\t}",
+        "\t\telse {",
+        "\t\t\tproperty('adjust', 'AnalysisPeriod', 1);",
+        "\t\t}",
+        "\t}",
+        "\telse {",
+        "\t\tproperty('adjust', 'AnalysisPeriod', 1);",
+        "\t}",
+        "}",
+        "",
+        "on_load{'PV2 Interconnection'} = define() ",
+        "{",
+        "\tloss_adjustment_set();",
+        "};"
+    ]
+}
\ No newline at end of file
diff --git a/src/casewin.cpp b/src/casewin.cpp
index 11aa81d920..7e3d0f8c5a 100644
--- a/src/casewin.cpp
+++ b/src/casewin.cpp
@@ -222,7 +222,13 @@ CaseWindow::CaseWindow( wxWindow *parent, Case *c )
 	szhl->Add( m_resultsButton, 0, wxALL|wxEXPAND, 0 );
 
 	// grid for parametric buttons etc.
-    if (!m_case->GetTechnology().Contains("Hybrid")) {
+    if (m_case->GetTechnology().Contains("wave") || m_case->GetTechnology().Contains("tidal")) {
+        m_szsims = new wxGridSizer(1, 0, 0);
+        m_szsims->Add(new wxMetroButton(m_left_panel, ID_PARAMETRICS, "Parametrics"), 0, wxALL | wxEXPAND, 0);
+        m_szsims->Add(new wxMetroButton(m_left_panel, ID_STOCHASTIC, "Stochastic"), 0, wxALL | wxEXPAND, 0);
+        m_szsims->Add(new wxMetroButton(m_left_panel, ID_MACRO, "Macros"), 0, wxALL | wxEXPAND, 0);
+    }
+    else if (!m_case->GetTechnology().Contains("Hybrid")) {
         m_szsims = new wxGridSizer(2, 0, 0);
         m_szsims->Add(new wxMetroButton(m_left_panel, ID_PARAMETRICS, "Parametrics"), 0, wxALL | wxEXPAND, 0);
         m_szsims->Add(new wxMetroButton(m_left_panel, ID_STOCHASTIC, "Stochastic"), 0, wxALL | wxEXPAND, 0);
@@ -700,6 +706,7 @@ void CaseWindow::OnCommand( wxCommandEvent &evt )
             menu.Append(ID_STOCHASTIC, "Stochastic");
             if ((m_case->GetTechnology() == "PVWatts") || (m_case->GetTechnology() == "Flat Plate PV"))
                 menu.Append(ID_PVUNCERTAINTY, "Uncertainty");
+            else if (m_case->GetTechnology().Contains("wave") || m_case->GetTechnology().Contains("tidal")); //do nothing
             else
                 menu.Append(ID_P50P90, "P50 / P90");
         }
@@ -1459,7 +1466,13 @@ void CaseWindow::UpdateConfiguration()
 	CheckAndUpdateNotes(inputPageHelpContext);
 
 	m_szsims->Clear(true);
-	if (!m_case->GetTechnology().Contains("Hybrid")) {
+	if (m_case->GetTechnology().Contains("wave") || m_case->GetTechnology().Contains("tidal")) {
+        m_szsims->SetCols(1);
+        m_szsims->Add(new wxMetroButton(m_left_panel, ID_PARAMETRICS, "Parametrics"), 0, wxALL | wxEXPAND, 0);
+        m_szsims->Add(new wxMetroButton(m_left_panel, ID_STOCHASTIC, "Stochastic"), 0, wxALL | wxEXPAND, 0);
+        m_szsims->Add(new wxMetroButton(m_left_panel, ID_MACRO, "Macros"), 0, wxALL | wxEXPAND, 0);
+    }
+    else if (!m_case->GetTechnology().Contains("Hybrid")) {
 		m_szsims->SetCols(2);
 		m_szsims->Add(new wxMetroButton(m_left_panel, ID_PARAMETRICS, "Parametrics"), 0, wxALL | wxEXPAND, 0);
 		m_szsims->Add(new wxMetroButton(m_left_panel, ID_STOCHASTIC, "Stochastic"), 0, wxALL | wxEXPAND, 0);
diff --git a/test_results_win64.csv b/test_results_win64.csv
index b2335e976f..cd254e5643 100644
--- a/test_results_win64.csv
+++ b/test_results_win64.csv
@@ -60,8 +60,8 @@ Standalone Battery,Merchant Plant,-8397703,25.7208,NA,; Warning: IRR at end of a
 Standalone Battery,Leveraged Partnership Flip,-8397703,81.3387,88.6283,; Warning: IRR at end of analysis period is not a number (NaN). This can indicate that revenues are too low to cover costs, or that they are excessively high compared to costs.
 Standalone Battery,All Equity Partnership Flip,-8397703,85.2731,88.6283,; Warning: IRR at end of analysis period is not a number (NaN). This can indicate that revenues are too low to cover costs, or that they are excessively high compared to costs.
 Standalone Battery,Sale Leaseback,-8397703,86.2847,88.6283,; Warning: IRR at end of analysis period is not a number (NaN). This can indicate that revenues are too low to cover costs, or that they are excessively high compared to costs. Warning: NPV is $-1.09395e+08. A negative NPV indicates project costs are higher than revenues.
-ETES,Single Owner,-467206720,13.3193,7.40319,; 
-PTES,Single Owner,-197686624,16.8936,10.3684,; 
+ETES,Single Owner,-467272736,13.3154,7.40298,; 
+PTES,Single Owner,-197586480,16.8906,10.3673,; 
 Physical Trough,Single Owner,376952608,12.1978,12.3469,; 
 Physical Trough,Merchant Plant,376952608,12.8693,NA,; 
 Physical Trough,Leveraged Partnership Flip,376952608,12.4668,12.3469,; 
@@ -112,10 +112,10 @@ DSGL IPH,None,10833103,NA,NA,;
 DSGL IPH,LCOH Calculator,10833103,NA,NA,; 
 MSLF IPH,None,898375040,NA,NA,; Notice: Piping geometry file\ \ Maximum fluid velocity: 3.00\ Minimum fluid velocity: 2.00\ \ To section 1 header pipe diameter: 0.4889 m (19.25 in)\ Loop No. | Diameter [m] | Diameter [in] | Diam. ID\ --------------------------------------------------\      1   |    0.4889    |    19.2500     |   1\      2   |    0.4889    |    19.2500     |   1\      3   |    0.4889    |    19.2500     |   1\      4   |    0.4889    |    19.2500     |   1\      5   |    0.4889    |    19.2500     |   1\      6   |    0.4889    |    19.2500     |   1\      7   |    0.4889    |    19.2500     |   1\      8   |    0.4889    |    19.2500     |   1\      9   |    0.4381    |    17.2500     |   2\     10   |    0.4381    |    17.2500     |   2\     11   |    0.4381    |    17.2500     |   2\     12   |    0.4381    |    17.2500     |   2\     13   |    0.4381    |    17.2500     |   2\     14   |    0.4381    |    17.2500     |   2\     15   |    0.3906    |    15.3760     |   3\     16   |    0.3906    |    15.3760     |   3\     17   |    0.3906    |    15.3760     |   3\     18   |    0.3906    |    15.3760     |   3\     19   |    0.3906    |    15.3760     |   3\     20   |    0.3398    |    13.3760     |   4\     21   |    0.3398    |    13.3760     |   4\     22   |    0.3398    |    13.3760     |   4\     23   |    0.3398    |    13.3760     |   4\     24   |    0.3111    |    12.2500     |   5\     25   |    0.3111    |    12.2500     |   5\     26   |    0.3111    |    12.2500     |   5\     27   |    0.2604    |    10.2500     |   6\     28   |    0.2604    |    10.2500     |   6\     29   |    0.2604    |    10.2500     |   6\     30   |    0.2604    |    10.2500     |   6\     31   |    0.2604    |    10.2500     |   6\     32   |    0.2604    |    10.2500     |   6\     33   |    0.2604    |    10.2500     |   6\     34   |    0.2604    |    10.2500     |   6\     35   |    0.2604    |    10.2500     |   6\     36   |    0.2604    |    10.2500     |   6\     37   |    0.2604    |    10.2500     |   6\     38   |    0.2604    |    10.2500     |   6\  Notice: At time = 1960 CR_DF__PC_MAX__TES_FULL__AUX_OFF iteration to find a defocus resulting in the maximum power cycle mass flow rate only reached a convergence = -0.00246077. Check that results at this timestep are not unreasonably biasing total simulation results
 MSLF IPH,LCOH Calculator,898375040,NA,NA,; Notice: Piping geometry file\ \ Maximum fluid velocity: 3.00\ Minimum fluid velocity: 2.00\ \ To section 1 header pipe diameter: 0.4889 m (19.25 in)\ Loop No. | Diameter [m] | Diameter [in] | Diam. ID\ --------------------------------------------------\      1   |    0.4889    |    19.2500     |   1\      2   |    0.4889    |    19.2500     |   1\      3   |    0.4889    |    19.2500     |   1\      4   |    0.4889    |    19.2500     |   1\      5   |    0.4889    |    19.2500     |   1\      6   |    0.4889    |    19.2500     |   1\      7   |    0.4889    |    19.2500     |   1\      8   |    0.4889    |    19.2500     |   1\      9   |    0.4381    |    17.2500     |   2\     10   |    0.4381    |    17.2500     |   2\     11   |    0.4381    |    17.2500     |   2\     12   |    0.4381    |    17.2500     |   2\     13   |    0.4381    |    17.2500     |   2\     14   |    0.4381    |    17.2500     |   2\     15   |    0.3906    |    15.3760     |   3\     16   |    0.3906    |    15.3760     |   3\     17   |    0.3906    |    15.3760     |   3\     18   |    0.3906    |    15.3760     |   3\     19   |    0.3906    |    15.3760     |   3\     20   |    0.3398    |    13.3760     |   4\     21   |    0.3398    |    13.3760     |   4\     22   |    0.3398    |    13.3760     |   4\     23   |    0.3398    |    13.3760     |   4\     24   |    0.3111    |    12.2500     |   5\     25   |    0.3111    |    12.2500     |   5\     26   |    0.3111    |    12.2500     |   5\     27   |    0.2604    |    10.2500     |   6\     28   |    0.2604    |    10.2500     |   6\     29   |    0.2604    |    10.2500     |   6\     30   |    0.2604    |    10.2500     |   6\     31   |    0.2604    |    10.2500     |   6\     32   |    0.2604    |    10.2500     |   6\     33   |    0.2604    |    10.2500     |   6\     34   |    0.2604    |    10.2500     |   6\     35   |    0.2604    |    10.2500     |   6\     36   |    0.2604    |    10.2500     |   6\     37   |    0.2604    |    10.2500     |   6\     38   |    0.2604    |    10.2500     |   6\  Notice: At time = 1960 CR_DF__PC_MAX__TES_FULL__AUX_OFF iteration to find a defocus resulting in the maximum power cycle mass flow rate only reached a convergence = -0.00246077. Check that results at this timestep are not unreasonably biasing total simulation results
-MEwave,Single Owner,65589748,55.7011,60.3986,; 
+MEwave,Single Owner,65589748,55.4156,60.3986,; 
 MEwave,LCOE Calculator,59434320,NA,NA,; 
 MEwave,None,594343,NA,NA,; 
-MEwave Battery,Single Owner,64959432,57.5747,60.3968,; 
+MEwave Battery,Single Owner,64959432,57.2866,60.3968,; 
 MEtidal,LCOE Calculator,2.16152e+06,NA,NA,; 
 MEtidal,None,2.16152e+06,NA,NA,; 
 Wind Power,Residential,48358.4,18.6056,NA,;