diff --git a/cases.csv b/cases.csv
index 525a78bc7..218c92504 100644
--- a/cases.csv
+++ b/cases.csv
@@ -19,6 +19,7 @@ plantchar_fuelcell,Fuel cell cost and performance characteristics (inputs\plant_
 plantchar_gas_ccs,Natural gas CCS generator cost and performance characteristics (inputs\plant_characteristics\{plantchar_gas_ccs}.csv). Options start with 'gas-ccs' and the switch should be set to the entire file name (ex: gas-ccs_ATB_2024_moderate),gas-ccs_ATB_(2024)_(conservative|moderate|advanced),gas-ccs_ATB_2024_moderate,
 plantchar_gas,Natural gas generator cost and performance characteristics (inputs\plant_characteristics\{plantchar_gas}.csv). Options start with 'gas_' and the switch should be set to the entire file name (ex: gas_ATB_2024_moderate),gas_ATB_(2024)_(moderate),gas_ATB_2024_moderate,
 plantchar_geo,Geothermal cost setting (inputs\plant_characteristics\{plantchar_geo}.csv).The options for plantchar_geo start with 'geo_' and the switch should be set to the entire file name (ex: geo_ATB_2023_conservative),geo_ATB_(2023|2024)_(conservative|moderate|advanced),geo_ATB_2024_moderate,
+plantchar_h2fuelcell,H2 fuel cell cost and performance characteristics (inputs\plant_characteristics\{plantchar_h2fuelcell}.csv). The options for plantchar_h2fuelcell start with 'h2fuelcell_' and the switch should be set to the entire file name (ex: h2fuelcell_moderate),h2fuelcell_(conservative|moderate|advanced),h2fuelcell_moderate,
 plantchar_h2combustion,H2-CT/CC cost and performance inputs (inputs/plant_characteristics/{h2combustionscen}.csv). The options for h2combustionscen start with 'h2-combustion_' and the switch should be set to the entire file name (ex: h2-combustion_ATB_2023),h2-combustion_ATB_(2024),h2-combustion_ATB_2024,
 plantchar_hydro,Hydropower cost inputs (inputs/plant_characteristics/{plantchar_hydro}.csv). The options for plantchar_hydro start with 'hydro_' and the switch should be set to the entire file name (ex: hydro_ATB_2019_low),hydro_ATB_2019_(constant|mid|low),hydro_ATB_2019_mid,
 plantchar_nuclear_smr,Small modular reactor (SMR) cost and performance characteristics (inputs\plant_characteristics\{plantchar_nuclear_smr}.csv). Options start with 'nuclear_smr' and the switch should be set to the entire file name (ex: nuclear-smr_ATB_2024_moderate),nuclear-smr_ATB_(2024)_(conservative|moderate|advanced),nuclear-smr_ATB_2024_moderate,
@@ -138,7 +139,7 @@ GSw_EmploymentFactor,Source for employment factor data - see inputs/employment/R
 GSw_EVMC,Turn on adoptable EV managed charging,0; 1,0,
 GSw_FakeData,Use fake capacity factor profiles (for TESTING ONLY when you do not want to download the real CF data),^[0-1]$,0,
 GSw_ForcePrescription,Turn on/off forced prescriptions - turning off will allow unlimited but not free builds in historical years,0; 1,1,
-GSw_FuelCell,Turn on/off fuel cells (natural gas / H2) as a technology option,0; 1,0,
+GSw_GasFuelCell,Turn on/off natural gas fuel cell (ng-fuel-cell) as a technology option,0; 1,0,
 GSw_FutureHydCF_RepYears,_-delimited years of historical hydro plant data from which to calculate capacity factors representing future hydro,N/A,2007_2008_2009_2010_2011_2012_2013_2016_2017_2018_2019_2020_2021_2022,
 GSw_GasCurve,"Select natural gas supply curve (0 = cendiv, 1 = national + cendiv, 2 = static, 3 = national)",0; 1; 2; 3,1,
 GSw_GasCC_H_1x1,Turn on/off both gas-CC_H_1x1 and gas-CC_H_1x1-CCS_mod/max plant options,0; 1,0,
@@ -161,6 +162,7 @@ GSw_GWP,Global warming potential for CH4 and N2O; either a string specifying IPC
 GSw_H2,Turn on/off the representation of hydrogen supply/demand balance at a national level without storage (1) or at a regional level with storage (2),0; 1; 2,2,
 GSw_H2_CompressorLoad,Turn on/off the accounting of electric loads from compressors used to operate the hydrogen transport network, 0; 1,0,
 GSw_H2_Demand_Case,H2 demand case as indicated by the column headers in inputs/consume/h2_exogenous_demand.csv,none; BAU; Aggressive; Decarb; Decarb_with_BAU; LTS,none,
+GSw_H2FuelCell,Turn on/off H2 fuel cell (h2-fuel-cell) as a technology option,0; 1,0,
 GSw_H2_Inputs,Input file suffix for H2 inputs,ref; low,ref,
 GSw_H2_IntraReg_Transport,if non-zero specifies the flat cost for intra-ReEDS BA hydrogen transport in 2004$/kg H2 produced. Recommended value is $0.32/kg per https://liftoff.energy.gov/wp-content/uploads/2023/05/20230523-Pathways-to-Commercial-Liftoff-Clean-Hydrogen.pdf pg 15 for transport costs,float,0.32,
 GSw_H2_MinStorHours,Minimum H2 storage duration required by zone (only used when GSw_H2=2),N/A,24,
@@ -224,7 +226,7 @@ GSw_MethaneLeakageScen,Fractional leakage of methane from upstream natural gas p
 GSw_MGA_CostDelta,MGA: Fraction by which to allow objective function to increase when using Modeling to Generate Alternatives (MGA is turned off if set to 0; a common choice for MGA is 0.01),float,0,
 GSw_MGA_Direction,MGA: Directionality of second optimization,(min|max),min,
 GSw_MGA_Objective,MGA: Objective for MGA (uses GSw_MGA_SubObjective to specify technology subset if set to capacity),(capacity|generation|transmission|rasharing|co2|employment),capacity,
-GSw_MGA_SubObjective,MGA: Technology subset to minimize or maximize the capacity or generation of (only used for GSw_MGA_Objective=(capacity or generation)),(battery|ccs|coal|dac|fossil|gas|gentech|geo|h2_combustion|hydro|nuclear|ofswind|onswind|pv|re|storage|upv|vre|wind),gentech,
+GSw_MGA_SubObjective,MGA: Technology subset to minimize or maximize the capacity or generation of (only used for GSw_MGA_Objective=(capacity or generation)),(battery|ccs|coal|dac|fossil|gas|gentech|geo|h2_combustion|h2_gen|hydro|nuclear|ofswind|onswind|pv|re|storage|upv|vre|wind),gentech,
 GSw_MinCF,Turn on/off regional min CF constraint (applied at i/r level),0; 1,1,
 GSw_Mingen,Turn on/off min-gen constraints by r/h/szn,0; 1,0,
 GSw_MingenFixed,Turn on/off fixed min-gen constraints,0; 1,1,
@@ -393,4 +395,4 @@ resource_adequacy_years,_-delimited years to include in resource adequacy calcul
 MCS_runs,Number of Monte Carlo simulation runs. Set to 0 to disable MCS. Set to an integer N > 0 to run N ReEDS simulations with sampling.,int,0,
 MCS_dist,Name of the `.yaml` file defining the MCS distributions. Use 'default' or a string beginning with 'user' to reference `inputs/userinput/mcs_distributions_{MCS_dist}.yaml`,N/A,default,
 MCS_dist_groups,Define the distribution groups to use in a Monte Carlo Simulation. Each entry should refer to a key from `inputs/userinput/mcs_distributions_{MCS_dist}.yaml` with multiple entries separated by a dot (e.g. Example1.Example2.Example3),N/A,tech,
-MCS_lhs,Option to use random sampling (0) or latin hypercube sampling (1) for Monte Carlo simulation,0; 1,0,
+MCS_lhs,Option to use random sampling (0) or latin hypercube sampling (1) for Monte Carlo simulation,0; 1,0,
\ No newline at end of file
diff --git a/docs/source/model_documentation.md b/docs/source/model_documentation.md
index 4573370f3..4ff5e2998 100644
--- a/docs/source/model_documentation.md
+++ b/docs/source/model_documentation.md
@@ -1363,6 +1363,49 @@ Transport requires the construction of hydrogen pipelines, and the model assumes
 Modeling hydrogen transport in ReEDS is an experimental feature and, because this feature adds significant runtime, the model includes the option to model zonal balancing with transport disabled or a fixed \$/kg hydrogen transport cost.
 
 
+#### Hydrogen fuel cells
+
+In addition to H<sub>2</sub>-CTs and H<sub>2</sub>-CCs, ReEDS can represent a stationary hydrogen fuel cell (`h2-fuel-cell`) as a power-sector consumer of hydrogen.
+The technology is based on a heavy-duty-vehicle proton-exchange-membrane (PEM) fuel cell adapted for stationary power, with cost and performance assumptions drawn from {cite:t}`reznicekCostAnalysisHeavyDuty2026`.
+The fuel cell draws on the same regional hydrogen balance described above as the H<sub>2</sub>-CT/H<sub>2</sub>-CC technologies; when endogenous hydrogen production is disabled, it instead consumes a drop-in hydrogen fuel at the price set by the fuel-cost switch.
+
+The hydrogen fuel cell is disabled by default.
+Three cost-and-performance trajectories (conservative, moderate, and advanced) are available; they share the same near-term cost and differ in the rate of capital-cost decline after 2025.
+Because point-source values are used, the fuel cell is assigned zero direct CO<sub>2</sub> and SO<sub>2</sub> emissions (emissions associated with upstream hydrogen production are accounted for separately).
+Financing and reserve provision are assumed to be the same as for a gas combustion turbine (Gas-CT).
+Fixed and variable O&M assumptions are taken from Exhibit 5-19 (Case B31A) of {cite:t}`schmittFossilEnergyBaseline2022`.
+
+```{admonition} Hydrogen fuel cell options
+
+- `GSw_H2FuelCell` (default `0`): Turn the hydrogen fuel cell (`h2-fuel-cell`) on (`1`) or off (`0`). Independent of the natural gas fuel cell switch (`GSw_GasFuelCell`) and the hydrogen combustion switches (`GSw_H2Combustion`).
+- `plantchar_h2fuelcell` (default `h2fuelcell_moderate`): Cost-and-performance trajectory — one of `h2fuelcell_conservative`, `h2fuelcell_moderate`, or `h2fuelcell_advanced`.
+- When `GSw_H2=0` (drop-in hydrogen fuel), the fuel cell consumes hydrogen at the price set by the fuel-cost switch rather than drawing on endogenous hydrogen production.
+
+These options are configured in `cases.csv` or a user-defined `cases_{label}.csv` file.
+```
+
+{numref}`h2-fuel-cell-assumptions` summarizes the key assumptions for the moderate cost case.
+
+```{table} Hydrogen fuel cell cost [\$2022] and operating assumptions (moderate cost case).
+:name: h2-fuel-cell-assumptions
+
+| Parameter | Value |
+|:--|:--|
+| Representative unit size | 100 MW |
+| Capital cost (2030, moderate) | ~1,118 \$/kW |
+| Fixed O&M (2030, moderate) | ~27.2 \$/kW-yr |
+| Variable O&M | 1.7054 \$/MWh |
+| Heat rate | 8.461 MMBtu/MWh |
+| Construction time | 3 years |
+| Lifetime | 40 years |
+| Ramp rate | 100% / minute |
+| Minimum generation level | 1% of nameplate |
+| Annual minimum capacity factor | 6% |
+| Forced outage rate | 5% |
+| Scheduled (planned) outage rate | 5% |
+| Start cost | 0 \$/MW-start |
+| Direct CO<sub>2</sub> / SO<sub>2</sub> emissions | 0 |
+```
 
 
 ### Direct Air Capture
diff --git a/docs/source/references.bib b/docs/source/references.bib
index b9f127887..0754fe9c3 100644
--- a/docs/source/references.bib
+++ b/docs/source/references.bib
@@ -30655,3 +30655,23 @@ @article{ramasamyUSSolarPhotovoltaic2022
 	file = {PDF:files/8171/Ramasamy et al. - 2022 - U.S. Solar Photovoltaic System and Energy Storage Cost Benchmarks, With Minimum Sustainable Price An.pdf:application/pdf},
 }
 
+
+@techreport{reznicekCostAnalysisHeavyDuty2026,
+  title = {Cost {{Analysis}} of {{Heavy-Duty Vehicle Proton Exchange Membrane Fuel Cell Stationary Power Plants}}},
+  author = {Reznicek, Evan and Berres, Andreas and Li, Yijin and others},
+  year = 2026,
+  institution = {National Laboratory of the Rockies},
+  doi = {10.2172/3018256},
+  url = {https://doi.org/10.2172/3018256},
+  langid = {english}
+}
+
+@techreport{schmittFossilEnergyBaseline2022,
+  title = {Fossil {{Energy Baseline}}, {{Revision}} 4a},
+  author = {Schmitt, T. and Leptinsky, S. and Turner, M. and Zoelle, A. and Woods, M. and Shultz, T. and James, R.},
+  year = 2022,
+  month = oct,
+  institution = {National Energy Technology Laboratory},
+  address = {Pittsburgh, PA},
+  langid = {english}
+}
diff --git a/docs/source/sources.md b/docs/source/sources.md
index 743fa64e8..9f405cb8f 100644
--- a/docs/source/sources.md
+++ b/docs/source/sources.md
@@ -1311,6 +1311,10 @@
   - [h2-combustion_ATB_2023.csv](/inputs/plant_characteristics/h2-combustion_ATB_2023.csv)
   - [h2-combustion_ATB_2024.csv](/inputs/plant_characteristics/h2-combustion_ATB_2024.csv)
     - **Description:** Hydrogen CT and CC plant costs generated in preprocessing from moderate case NREL ATB 2024 data
+  - [h2fuelcell_advanced.csv](/inputs/plant_characteristics/h2fuelcell_advanced.csv)
+  - [h2fuelcell_conservative.csv](/inputs/plant_characteristics/h2fuelcell_conservative.csv)
+  - [h2fuelcell_moderate.csv](/inputs/plant_characteristics/h2fuelcell_moderate.csv)
+    - **Description:** Hydrogen fuel cell (h2-fuel-cell) capital cost, fixed O&M, variable O&M, and heat rate by year for the advanced, conservative, and moderate cost cases. Capital cost and heat rate are based on Reznicek et al. (2026), DOI 10.2172/3018256; fixed and variable O&M are from Exhibit 5-19 (Case B31A) of NETL Fossil Energy Baseline, Revision 4a (Schmitt et al., 2022). Selected with the `plantchar_h2fuelcell` switch and enabled with `GSw_H2FuelCell`.
   - [heat_rate_adj.csv](/inputs/plant_characteristics/heat_rate_adj.csv)
     - **Description:** Heat rate adjustment multiplier by technology
   - [heat_rate_penalty_spin.csv](/inputs/plant_characteristics/heat_rate_penalty_spin.csv)
diff --git a/hourlize/inputs/configs/srun_template.sh b/hourlize/inputs/configs/srun_template.sh
index 186431629..d6aa6ec34 100644
--- a/hourlize/inputs/configs/srun_template.sh
+++ b/hourlize/inputs/configs/srun_template.sh
@@ -4,4 +4,4 @@
 #SBATCH --ntasks-per-node=1
 #SBATCH --mail-user=[your email]
 #SBATCH --mail-type=BEGIN,END,FAIL
-#SBATCH --mem=246000    # RAM in MB; up to 246000 for normal or 2000000 for bigmem on kestrel
\ No newline at end of file
+#SBATCH --mem=246000    # RAM in MB; up to 246000 for normal or 2000000 for bigmem on kestrel
diff --git a/inputs/degradation/degradation_annual_default.csv b/inputs/degradation/degradation_annual_default.csv
index 2f757287a..6bbe3c1d5 100644
--- a/inputs/degradation/degradation_annual_default.csv
+++ b/inputs/degradation/degradation_annual_default.csv
@@ -14,6 +14,7 @@ CoalOldScr,0
 CoalOldUns,0
 CofireNew,0
 CofireOld,0
+h2-fuel-cell,0
 Gas-CC,0
 Gas-CC_H_1x1,0
 Gas-CC_H_2x1,0
@@ -56,4 +57,4 @@ geohydro_allkm_1*geohydro_allkm_10,0
 egs_nearfield_1*egs_nearfield_10,0
 dr_shed_1*dr_shed_2,0
 evmc_storage_1*evmc_storage_10,0
-evmc_shape_1*evmc_shape_10,0
\ No newline at end of file
+evmc_shape_1*evmc_shape_10,0
diff --git a/inputs/emission_constraints/emitrate.csv b/inputs/emission_constraints/emitrate.csv
index fdbde77d5..3bad2e0ea 100644
--- a/inputs/emission_constraints/emitrate.csv
+++ b/inputs/emission_constraints/emitrate.csv
@@ -9,6 +9,7 @@ gas-CC_h_1x1,process,1.50E-06,9.07E-06,5.31E-02,1.00E-07,1.00E-06
 gas-CC_h_2x1,process,1.50E-06,9.07E-06,5.31E-02,1.00E-07,1.00E-06
 h2-ct,process,0,6.35E-05,0,0,0
 h2-cc,process,0,6.35E-05,0,0,0
+h2-fuel-cell,process,0,6.35E-05,0,0,0
 ng-fuel-cell,process,0,0,5.31E-02,1.00E-07,1.00E-06
 CoalOldScr,process,9.07E-05,8.62E-05,9.55E-02,1.60E-06,1.10E-05
 CoalOldUns,process,1.51E-04,8.62E-05,9.55E-02,1.60E-06,1.10E-05
@@ -27,6 +28,7 @@ gas-CC_h_1x1,upstream,0,0,6.27E-03,2.00E-08,0
 gas-CC_h_2x1,upstream,0,0,6.27E-03,2.00E-08,0
 h2-ct,upstream,0,0,0,0,0
 h2-cc,upstream,0,0,0,0,0
+h2-fuel-cell,upstream,0,0,0,0,0
 ng-fuel-cell,upstream,0,0,6.27E-03,2.00E-08,0
 CoalOldScr,upstream,0,0,2.94E-03,5.00E-08,2.08E-04
 CoalOldUns,upstream,0,0,2.94E-03,5.00E-08,2.08E-04
@@ -35,4 +37,4 @@ coal-IGCC,upstream,0,0,2.94E-03,5.00E-08,2.08E-04
 o-g-s,upstream,0,0,9.91E-03,1.70E-07,1.53E-04
 CofireOld,upstream,0,0,2.94E-03,5.00E-08,2.08E-04
 CofireNew,upstream,0,0,2.94E-03,5.00E-08,2.08E-04
-nuclear,upstream,0,0,8.40E-04,2.00E-08,2.10E-06
\ No newline at end of file
+nuclear,upstream,0,0,8.40E-04,2.00E-08,2.10E-06
diff --git a/inputs/emission_constraints/h2_leakage_rate.csv b/inputs/emission_constraints/h2_leakage_rate.csv
index 273978851..761ab6391 100644
--- a/inputs/emission_constraints/h2_leakage_rate.csv
+++ b/inputs/emission_constraints/h2_leakage_rate.csv
@@ -3,4 +3,5 @@ smr,0.01500,0.03000,0.02250,0.00210,0.00870,0.00540,0.02810,0.07010,0.04910,0.01
 smr_ccs,0.02000,0.03500,0.02750,0.00310,0.01870,0.01090,0.03060,0.07510,0.05285,0.01200,0.01000,0.01100,0.00100,0.05000,0.02550
 electrolyzer,0.03000,0.06000,0.04500,0.00310,0.04870,0.02590,0.06010,0.16210,0.11110,0.01230,0.01200,0.01215,0.00100,0.05000,0.02550
 h2-ct,0.01500,0.03000,0.02250,0,0,0,0.00010,0.00660,0.00335,0,0,0,0,0,
-h2-cc,0.01500,0.03000,0.02250,0,0,0,0.00010,0.00660,0.00335,0,0,0,0,0,
\ No newline at end of file
+h2-cc,0.01500,0.03000,0.02250,0,0,0,0.00010,0.00660,0.00335,0,0,0,0,0,
+h2-fuel-cell,0.03,0.06,0.045,0.0031,0.0487,0.0259,0.0601,0.1621,0.1111,0.0123,0.012,0.01215,0.001,0.05,0.0255
diff --git a/inputs/financials/construction_times_default.csv b/inputs/financials/construction_times_default.csv
index 6c013411e..2a589c596 100644
--- a/inputs/financials/construction_times_default.csv
+++ b/inputs/financials/construction_times_default.csv
@@ -819,6 +819,47 @@ EVMC_SHAPE,2047,1
 EVMC_SHAPE,2048,1
 EVMC_SHAPE,2049,1
 EVMC_SHAPE,2050,1
+h2-fuel-cell,2010,3
+h2-fuel-cell,2011,3
+h2-fuel-cell,2012,3
+h2-fuel-cell,2013,3
+h2-fuel-cell,2014,3
+h2-fuel-cell,2015,3
+h2-fuel-cell,2016,3
+h2-fuel-cell,2017,3
+h2-fuel-cell,2018,3
+h2-fuel-cell,2019,3
+h2-fuel-cell,2020,3
+h2-fuel-cell,2021,3
+h2-fuel-cell,2022,3
+h2-fuel-cell,2023,3
+h2-fuel-cell,2024,3
+h2-fuel-cell,2025,3
+h2-fuel-cell,2026,3
+h2-fuel-cell,2027,3
+h2-fuel-cell,2028,3
+h2-fuel-cell,2029,3
+h2-fuel-cell,2030,3
+h2-fuel-cell,2031,3
+h2-fuel-cell,2032,3
+h2-fuel-cell,2033,3
+h2-fuel-cell,2034,3
+h2-fuel-cell,2035,3
+h2-fuel-cell,2036,3
+h2-fuel-cell,2037,3
+h2-fuel-cell,2038,3
+h2-fuel-cell,2039,3
+h2-fuel-cell,2040,3
+h2-fuel-cell,2041,3
+h2-fuel-cell,2042,3
+h2-fuel-cell,2043,3
+h2-fuel-cell,2044,3
+h2-fuel-cell,2045,3
+h2-fuel-cell,2046,3
+h2-fuel-cell,2047,3
+h2-fuel-cell,2048,3
+h2-fuel-cell,2049,3
+h2-fuel-cell,2050,3
 Gas-CC,2010,3
 Gas-CC,2011,3
 Gas-CC,2012,3
diff --git a/inputs/financials/financials_tech_ATB2023.csv b/inputs/financials/financials_tech_ATB2023.csv
index ae66da536..3b537fdd5 100644
--- a/inputs/financials/financials_tech_ATB2023.csv
+++ b/inputs/financials/financials_tech_ATB2023.csv
@@ -1311,6 +1311,47 @@ Gas-CT,2047,15,30,3A,0
 Gas-CT,2048,15,30,3A,0
 Gas-CT,2049,15,30,3A,0
 Gas-CT,2050,15,30,3A,0
+h2-fuel-cell,2010,15,30,3A,0
+h2-fuel-cell,2011,15,30,3A,0
+h2-fuel-cell,2012,15,30,3A,0
+h2-fuel-cell,2013,15,30,3A,0
+h2-fuel-cell,2014,15,30,3A,0
+h2-fuel-cell,2015,15,30,3A,0
+h2-fuel-cell,2016,15,30,3A,0
+h2-fuel-cell,2017,15,30,3A,0
+h2-fuel-cell,2018,15,30,3A,0
+h2-fuel-cell,2019,15,30,3A,0
+h2-fuel-cell,2020,15,30,3A,0
+h2-fuel-cell,2021,15,30,3A,0
+h2-fuel-cell,2022,15,30,3A,0
+h2-fuel-cell,2023,15,30,3A,0
+h2-fuel-cell,2024,15,30,3A,0
+h2-fuel-cell,2025,15,30,3A,0
+h2-fuel-cell,2026,15,30,3A,0
+h2-fuel-cell,2027,15,30,3A,0
+h2-fuel-cell,2028,15,30,3A,0
+h2-fuel-cell,2029,15,30,3A,0
+h2-fuel-cell,2030,15,30,3A,0
+h2-fuel-cell,2031,15,30,3A,0
+h2-fuel-cell,2032,15,30,3A,0
+h2-fuel-cell,2033,15,30,3A,0
+h2-fuel-cell,2034,15,30,3A,0
+h2-fuel-cell,2035,15,30,3A,0
+h2-fuel-cell,2036,15,30,3A,0
+h2-fuel-cell,2037,15,30,3A,0
+h2-fuel-cell,2038,15,30,3A,0
+h2-fuel-cell,2039,15,30,3A,0
+h2-fuel-cell,2040,15,30,3A,0
+h2-fuel-cell,2041,15,30,3A,0
+h2-fuel-cell,2042,15,30,3A,0
+h2-fuel-cell,2043,15,30,3A,0
+h2-fuel-cell,2044,15,30,3A,0
+h2-fuel-cell,2045,15,30,3A,0
+h2-fuel-cell,2046,15,30,3A,0
+h2-fuel-cell,2047,15,30,3A,0
+h2-fuel-cell,2048,15,30,3A,0
+h2-fuel-cell,2049,15,30,3A,0
+h2-fuel-cell,2050,15,30,3A,0
 Gas-CT_aero,2010,15,30,3A,0
 Gas-CT_aero,2011,15,30,3A,0
 Gas-CT_aero,2012,15,30,3A,0
diff --git a/inputs/financials/financials_tech_ATB2023_CRP20.csv b/inputs/financials/financials_tech_ATB2023_CRP20.csv
index fcc9a4fee..49e421adf 100644
--- a/inputs/financials/financials_tech_ATB2023_CRP20.csv
+++ b/inputs/financials/financials_tech_ATB2023_CRP20.csv
@@ -1311,6 +1311,47 @@ Gas-CT,2047,15,20,3A,0
 Gas-CT,2048,15,20,3A,0
 Gas-CT,2049,15,20,3A,0
 Gas-CT,2050,15,20,3A,0
+h2-fuel-cell,2010,15,20,3A,0
+h2-fuel-cell,2011,15,20,3A,0
+h2-fuel-cell,2012,15,20,3A,0
+h2-fuel-cell,2013,15,20,3A,0
+h2-fuel-cell,2014,15,20,3A,0
+h2-fuel-cell,2015,15,20,3A,0
+h2-fuel-cell,2016,15,20,3A,0
+h2-fuel-cell,2017,15,20,3A,0
+h2-fuel-cell,2018,15,20,3A,0
+h2-fuel-cell,2019,15,20,3A,0
+h2-fuel-cell,2020,15,20,3A,0
+h2-fuel-cell,2021,15,20,3A,0
+h2-fuel-cell,2022,15,20,3A,0
+h2-fuel-cell,2023,15,20,3A,0
+h2-fuel-cell,2024,15,20,3A,0
+h2-fuel-cell,2025,15,20,3A,0
+h2-fuel-cell,2026,15,20,3A,0
+h2-fuel-cell,2027,15,20,3A,0
+h2-fuel-cell,2028,15,20,3A,0
+h2-fuel-cell,2029,15,20,3A,0
+h2-fuel-cell,2030,15,20,3A,0
+h2-fuel-cell,2031,15,20,3A,0
+h2-fuel-cell,2032,15,20,3A,0
+h2-fuel-cell,2033,15,20,3A,0
+h2-fuel-cell,2034,15,20,3A,0
+h2-fuel-cell,2035,15,20,3A,0
+h2-fuel-cell,2036,15,20,3A,0
+h2-fuel-cell,2037,15,20,3A,0
+h2-fuel-cell,2038,15,20,3A,0
+h2-fuel-cell,2039,15,20,3A,0
+h2-fuel-cell,2040,15,20,3A,0
+h2-fuel-cell,2041,15,20,3A,0
+h2-fuel-cell,2042,15,20,3A,0
+h2-fuel-cell,2043,15,20,3A,0
+h2-fuel-cell,2044,15,20,3A,0
+h2-fuel-cell,2045,15,20,3A,0
+h2-fuel-cell,2046,15,20,3A,0
+h2-fuel-cell,2047,15,20,3A,0
+h2-fuel-cell,2048,15,20,3A,0
+h2-fuel-cell,2049,15,20,3A,0
+h2-fuel-cell,2050,15,20,3A,0
 Gas-CT_aero,2010,15,20,3A,0
 Gas-CT_aero,2011,15,20,3A,0
 Gas-CT_aero,2012,15,20,3A,0
diff --git a/inputs/financials/financials_tech_ATB2024.csv b/inputs/financials/financials_tech_ATB2024.csv
index 1516136e4..1fbe4d4d1 100644
--- a/inputs/financials/financials_tech_ATB2024.csv
+++ b/inputs/financials/financials_tech_ATB2024.csv
@@ -1475,6 +1475,47 @@ Gas-CT,2047,15,30,3A,0
 Gas-CT,2048,15,30,3A,0
 Gas-CT,2049,15,30,3A,0
 Gas-CT,2050,15,30,3A,0
+h2-fuel-cell,2010,15,30,3A,0
+h2-fuel-cell,2011,15,30,3A,0
+h2-fuel-cell,2012,15,30,3A,0
+h2-fuel-cell,2013,15,30,3A,0
+h2-fuel-cell,2014,15,30,3A,0
+h2-fuel-cell,2015,15,30,3A,0
+h2-fuel-cell,2016,15,30,3A,0
+h2-fuel-cell,2017,15,30,3A,0
+h2-fuel-cell,2018,15,30,3A,0
+h2-fuel-cell,2019,15,30,3A,0
+h2-fuel-cell,2020,15,30,3A,0
+h2-fuel-cell,2021,15,30,3A,0
+h2-fuel-cell,2022,15,30,3A,0
+h2-fuel-cell,2023,15,30,3A,0
+h2-fuel-cell,2024,15,30,3A,0
+h2-fuel-cell,2025,15,30,3A,0
+h2-fuel-cell,2026,15,30,3A,0
+h2-fuel-cell,2027,15,30,3A,0
+h2-fuel-cell,2028,15,30,3A,0
+h2-fuel-cell,2029,15,30,3A,0
+h2-fuel-cell,2030,15,30,3A,0
+h2-fuel-cell,2031,15,30,3A,0
+h2-fuel-cell,2032,15,30,3A,0
+h2-fuel-cell,2033,15,30,3A,0
+h2-fuel-cell,2034,15,30,3A,0
+h2-fuel-cell,2035,15,30,3A,0
+h2-fuel-cell,2036,15,30,3A,0
+h2-fuel-cell,2037,15,30,3A,0
+h2-fuel-cell,2038,15,30,3A,0
+h2-fuel-cell,2039,15,30,3A,0
+h2-fuel-cell,2040,15,30,3A,0
+h2-fuel-cell,2041,15,30,3A,0
+h2-fuel-cell,2042,15,30,3A,0
+h2-fuel-cell,2043,15,30,3A,0
+h2-fuel-cell,2044,15,30,3A,0
+h2-fuel-cell,2045,15,30,3A,0
+h2-fuel-cell,2046,15,30,3A,0
+h2-fuel-cell,2047,15,30,3A,0
+h2-fuel-cell,2048,15,30,3A,0
+h2-fuel-cell,2049,15,30,3A,0
+h2-fuel-cell,2050,15,30,3A,0
 Gas-CT_aero,2010,15,30,3A,0
 Gas-CT_aero,2011,15,30,3A,0
 Gas-CT_aero,2012,15,30,3A,0
diff --git a/inputs/financials/reg_cap_cost_diff_default.csv b/inputs/financials/reg_cap_cost_diff_default.csv
index e2e9a0286..9ecb94d23 100644
--- a/inputs/financials/reg_cap_cost_diff_default.csv
+++ b/inputs/financials/reg_cap_cost_diff_default.csv
@@ -1,4 +1,4 @@
-r,BATTERY|PVB,COAL|BIO,COMBINED_CYCLE|FUEL_CELL,COMBUSTION_TURBINE|CONSUME|LFILL|OGS,NUCLEAR,CSP
+r,BATTERY|PVB,COAL|BIO,COMBINED_CYCLE|NG_FUEL_CELL,COMBUSTION_TURBINE|CONSUME|LFILL|OGS|H2_FUEL_CELL,NUCLEAR,CSP
 p01001,0.0113,-0.0237,-0.0236,-0.0204,-0.0033,-0.0128
 p01003,0.0004,-0.0451,-0.0333,-0.0317,-0.0175,-0.0162
 p01005,0.0086,-0.0331,-0.0294,-0.0245,-0.0073,-0.0164
diff --git a/inputs/national_generation/nat_gen_tech_frac.csv b/inputs/national_generation/nat_gen_tech_frac.csv
index d7402e91a..a94f38c0e 100644
--- a/inputs/national_generation/nat_gen_tech_frac.csv
+++ b/inputs/national_generation/nat_gen_tech_frac.csv
@@ -11,6 +11,7 @@ CoalOldScr,0,0,0,0
 CoalOldUns,0,0,0,0
 CofireNew,0,0,0,0
 CofireOld,0,0,0,0
+h2-fuel-cell,1,1,1,0
 Gas-CC,0,0,0,0
 Gas-CC_H_1x1,0,0,0,0
 Gas-CC_H_2x1,0,0,0,0
diff --git a/inputs/plant_characteristics/cost_opres_default.csv b/inputs/plant_characteristics/cost_opres_default.csv
index 55126c3bc..15995cfeb 100644
--- a/inputs/plant_characteristics/cost_opres_default.csv
+++ b/inputs/plant_characteristics/cost_opres_default.csv
@@ -45,6 +45,7 @@ hydNPD,1.62,0,0
 hydNPND,1.62,0,0
 hydED,1.62,0,0
 hydEND,1.62,0,0
+h2-fuel-cell,3.24,0,0
 H2-CT,3.24,0,0
 csp1_1,3.24,0,0
 csp1_2,3.24,0,0
diff --git a/inputs/plant_characteristics/cost_opres_market.csv b/inputs/plant_characteristics/cost_opres_market.csv
index 400a53a00..6fa7253d8 100644
--- a/inputs/plant_characteristics/cost_opres_market.csv
+++ b/inputs/plant_characteristics/cost_opres_market.csv
@@ -46,6 +46,7 @@
   hydED ,8.66,2.25,4.74
   hydEND ,8.66,2.25,4.74
   H2-CT,8.66,2.25,4.74
+h2-fuel-cell,8.66,2.25,4.74
   csp1_1,8.66,2.25,4.74
   csp1_2,8.66,2.25,4.74
   csp1_3,8.66,2.25,4.74
diff --git a/inputs/plant_characteristics/dollaryear.csv b/inputs/plant_characteristics/dollaryear.csv
index 31e81c5f7..a7f7d8b53 100644
--- a/inputs/plant_characteristics/dollaryear.csv
+++ b/inputs/plant_characteristics/dollaryear.csv
@@ -25,12 +25,15 @@ csp_ATB_2024_moderate,2022
 csp_SunShot2030,2017
 evmc_shape_Baseline,2020
 evmc_storage_Baseline,2020
-fuelcell_ATB_2024_advanced,2022
-fuelcell_ATB_2024_moderate,2022
+h2fuelcell_advanced,2022
+h2fuelcell_moderate,2022
+h2fuelcell_conservative,2022
 gas_ATB_2024_moderate,2022
 gas-ccs_ATB_2024_advanced,2022
 gas-ccs_ATB_2024_conservative,2022
 gas-ccs_ATB_2024_moderate,2022
+fuelcell_ATB_2024_advanced,2022
+fuelcell_ATB_2024_moderate,2022
 geo_ATB_2023_advanced,2020
 geo_ATB_2023_conservative,2020
 geo_ATB_2023_moderate,2020
@@ -65,4 +68,4 @@ upv_ATB_2023_conservative,2021
 upv_ATB_2023_moderate,2021
 upv_ATB_2024_advanced,2022
 upv_ATB_2024_conservative,2022
-upv_ATB_2024_moderate,2022
+upv_ATB_2024_moderate,2022
\ No newline at end of file
diff --git a/inputs/plant_characteristics/h2fuelcell_advanced.csv b/inputs/plant_characteristics/h2fuelcell_advanced.csv
new file mode 100644
index 000000000..9ae601123
--- /dev/null
+++ b/inputs/plant_characteristics/h2fuelcell_advanced.csv
@@ -0,0 +1,42 @@
+i,t,capcost,fom,vom,heatrate
+h2-fuel-cell,2010,1342.191,30.820,1.705,8.461
+h2-fuel-cell,2011,1342.191,30.820,1.705,8.461
+h2-fuel-cell,2012,1342.191,30.820,1.705,8.461
+h2-fuel-cell,2013,1342.191,30.820,1.705,8.461
+h2-fuel-cell,2014,1342.191,30.820,1.705,8.461
+h2-fuel-cell,2015,1342.191,30.820,1.705,8.461
+h2-fuel-cell,2016,1342.191,30.820,1.705,8.461
+h2-fuel-cell,2017,1342.191,30.820,1.705,8.461
+h2-fuel-cell,2018,1342.191,30.820,1.705,8.461
+h2-fuel-cell,2019,1342.191,30.820,1.705,8.461
+h2-fuel-cell,2020,1342.191,30.820,1.705,8.461
+h2-fuel-cell,2021,1342.191,30.820,1.705,8.461
+h2-fuel-cell,2022,1342.191,30.820,1.705,8.461
+h2-fuel-cell,2023,1342.191,30.820,1.705,8.461
+h2-fuel-cell,2024,1342.191,30.820,1.705,8.461
+h2-fuel-cell,2025,1342.191,30.820,1.705,8.461
+h2-fuel-cell,2026,1278.692,29.799,1.705,8.461
+h2-fuel-cell,2027,1215.193,28.778,1.705,8.461
+h2-fuel-cell,2028,1151.694,27.757,1.705,8.461
+h2-fuel-cell,2029,1088.196,26.736,1.705,8.461
+h2-fuel-cell,2030,1024.697,25.715,1.705,8.461
+h2-fuel-cell,2031,1015.767,25.572,1.705,8.461
+h2-fuel-cell,2032,1006.836,25.428,1.705,8.461
+h2-fuel-cell,2033,997.906,25.285,1.705,8.461
+h2-fuel-cell,2034,988.976,25.141,1.705,8.461
+h2-fuel-cell,2035,980.046,24.997,1.705,8.461
+h2-fuel-cell,2036,976.272,24.937,1.705,8.461
+h2-fuel-cell,2037,972.498,24.876,1.705,8.461
+h2-fuel-cell,2038,968.724,24.815,1.705,8.461
+h2-fuel-cell,2039,964.950,24.755,1.705,8.461
+h2-fuel-cell,2040,961.176,24.694,1.705,8.461
+h2-fuel-cell,2041,957.441,24.634,1.705,8.461
+h2-fuel-cell,2042,953.707,24.574,1.705,8.461
+h2-fuel-cell,2043,949.972,24.514,1.705,8.461
+h2-fuel-cell,2044,946.237,24.454,1.705,8.461
+h2-fuel-cell,2045,942.503,24.394,1.705,8.461
+h2-fuel-cell,2046,938.729,24.333,1.705,8.461
+h2-fuel-cell,2047,934.955,24.273,1.705,8.461
+h2-fuel-cell,2048,931.180,24.212,1.705,8.461
+h2-fuel-cell,2049,927.406,24.151,1.705,8.461
+h2-fuel-cell,2050,923.632,24.091,1.705,8.461
\ No newline at end of file
diff --git a/inputs/plant_characteristics/h2fuelcell_conservative.csv b/inputs/plant_characteristics/h2fuelcell_conservative.csv
new file mode 100644
index 000000000..504d4032e
--- /dev/null
+++ b/inputs/plant_characteristics/h2fuelcell_conservative.csv
@@ -0,0 +1,42 @@
+i,t,capcost,fom,vom,heatrate
+h2-fuel-cell,2010,1352.084,30.979,1.705,8.461
+h2-fuel-cell,2011,1352.084,30.979,1.705,8.461
+h2-fuel-cell,2012,1352.084,30.979,1.705,8.461
+h2-fuel-cell,2013,1352.084,30.979,1.705,8.461
+h2-fuel-cell,2014,1352.084,30.979,1.705,8.461
+h2-fuel-cell,2015,1352.084,30.979,1.705,8.461
+h2-fuel-cell,2016,1352.084,30.979,1.705,8.461
+h2-fuel-cell,2017,1352.084,30.979,1.705,8.461
+h2-fuel-cell,2018,1352.084,30.979,1.705,8.461
+h2-fuel-cell,2019,1352.084,30.979,1.705,8.461
+h2-fuel-cell,2020,1352.084,30.979,1.705,8.461
+h2-fuel-cell,2021,1352.084,30.979,1.705,8.461
+h2-fuel-cell,2022,1352.084,30.979,1.705,8.461
+h2-fuel-cell,2023,1352.084,30.979,1.705,8.461
+h2-fuel-cell,2024,1352.084,30.979,1.705,8.461
+h2-fuel-cell,2025,1352.084,30.979,1.705,8.461
+h2-fuel-cell,2026,1331.684,30.651,1.705,8.461
+h2-fuel-cell,2027,1311.283,30.323,1.705,8.461
+h2-fuel-cell,2028,1290.883,29.995,1.705,8.461
+h2-fuel-cell,2029,1270.483,29.667,1.705,8.461
+h2-fuel-cell,2030,1250.083,29.339,1.705,8.461
+h2-fuel-cell,2031,1239.180,29.164,1.705,8.461
+h2-fuel-cell,2032,1228.276,28.988,1.705,8.461
+h2-fuel-cell,2033,1217.373,28.813,1.705,8.461
+h2-fuel-cell,2034,1206.470,28.638,1.705,8.461
+h2-fuel-cell,2035,1195.567,28.462,1.705,8.461
+h2-fuel-cell,2036,1192.006,28.405,1.705,8.461
+h2-fuel-cell,2037,1188.444,28.348,1.705,8.461
+h2-fuel-cell,2038,1184.883,28.291,1.705,8.461
+h2-fuel-cell,2039,1181.321,28.233,1.705,8.461
+h2-fuel-cell,2040,1177.760,28.176,1.705,8.461
+h2-fuel-cell,2041,1174.198,28.119,1.705,8.461
+h2-fuel-cell,2042,1170.637,28.062,1.705,8.461
+h2-fuel-cell,2043,1167.076,28.004,1.705,8.461
+h2-fuel-cell,2044,1163.514,27.947,1.705,8.461
+h2-fuel-cell,2045,1159.953,27.890,1.705,8.461
+h2-fuel-cell,2046,1156.391,27.833,1.705,8.461
+h2-fuel-cell,2047,1152.830,27.775,1.705,8.461
+h2-fuel-cell,2048,1149.269,27.718,1.705,8.461
+h2-fuel-cell,2049,1145.707,27.661,1.705,8.461
+h2-fuel-cell,2050,1142.146,27.604,1.705,8.461
\ No newline at end of file
diff --git a/inputs/plant_characteristics/h2fuelcell_moderate.csv b/inputs/plant_characteristics/h2fuelcell_moderate.csv
new file mode 100644
index 000000000..f9ea5ae77
--- /dev/null
+++ b/inputs/plant_characteristics/h2fuelcell_moderate.csv
@@ -0,0 +1,42 @@
+i,t,capcost,fom,vom,heatrate
+h2-fuel-cell,2010,1352.084,30.979,1.705,8.461
+h2-fuel-cell,2011,1352.084,30.979,1.705,8.461
+h2-fuel-cell,2012,1352.084,30.979,1.705,8.461
+h2-fuel-cell,2013,1352.084,30.979,1.705,8.461
+h2-fuel-cell,2014,1352.084,30.979,1.705,8.461
+h2-fuel-cell,2015,1352.084,30.979,1.705,8.461
+h2-fuel-cell,2016,1352.084,30.979,1.705,8.461
+h2-fuel-cell,2017,1352.084,30.979,1.705,8.461
+h2-fuel-cell,2018,1352.084,30.979,1.705,8.461
+h2-fuel-cell,2019,1352.084,30.979,1.705,8.461
+h2-fuel-cell,2020,1352.084,30.979,1.705,8.461
+h2-fuel-cell,2021,1352.084,30.979,1.705,8.461
+h2-fuel-cell,2022,1352.084,30.979,1.705,8.461
+h2-fuel-cell,2023,1352.084,30.979,1.705,8.461
+h2-fuel-cell,2024,1352.084,30.979,1.705,8.461
+h2-fuel-cell,2025,1352.084,30.979,1.705,8.461
+h2-fuel-cell,2026,1305.171,30.224,1.705,8.461
+h2-fuel-cell,2027,1258.258,29.470,1.705,8.461
+h2-fuel-cell,2028,1211.345,28.716,1.705,8.461
+h2-fuel-cell,2029,1164.432,27.962,1.705,8.461
+h2-fuel-cell,2030,1117.519,27.208,1.705,8.461
+h2-fuel-cell,2031,1105.429,27.013,1.705,8.461
+h2-fuel-cell,2032,1093.338,26.819,1.705,8.461
+h2-fuel-cell,2033,1081.248,26.624,1.705,8.461
+h2-fuel-cell,2034,1069.158,26.430,1.705,8.461
+h2-fuel-cell,2035,1057.067,26.236,1.705,8.461
+h2-fuel-cell,2036,1053.318,26.175,1.705,8.461
+h2-fuel-cell,2037,1049.568,26.115,1.705,8.461
+h2-fuel-cell,2038,1045.818,26.055,1.705,8.461
+h2-fuel-cell,2039,1042.068,25.995,1.705,8.461
+h2-fuel-cell,2040,1038.319,25.934,1.705,8.461
+h2-fuel-cell,2041,1034.529,25.873,1.705,8.461
+h2-fuel-cell,2042,1030.740,25.812,1.705,8.461
+h2-fuel-cell,2043,1026.951,25.752,1.705,8.461
+h2-fuel-cell,2044,1023.161,25.691,1.705,8.461
+h2-fuel-cell,2045,1019.372,25.630,1.705,8.461
+h2-fuel-cell,2046,1015.622,25.569,1.705,8.461
+h2-fuel-cell,2047,1011.873,25.509,1.705,8.461
+h2-fuel-cell,2048,1008.123,25.449,1.705,8.461
+h2-fuel-cell,2049,1004.373,25.389,1.705,8.461
+h2-fuel-cell,2050,1000.623,25.328,1.705,8.461
\ No newline at end of file
diff --git a/inputs/plant_characteristics/heat_rate_adj.csv b/inputs/plant_characteristics/heat_rate_adj.csv
index 6ae14bb89..210bf6001 100644
--- a/inputs/plant_characteristics/heat_rate_adj.csv
+++ b/inputs/plant_characteristics/heat_rate_adj.csv
@@ -35,5 +35,6 @@ CofireOld,1,1.066148263
 CofireNew,1,1.066148263
 lfill-gas,1,1
 distpv,1,1
+h2-fuel-cell,1,1
 H2-CT,1,1.039104223
-H2-CC ,1,1.199888
\ No newline at end of file
+H2-CC ,1,1.199888
diff --git a/inputs/plant_characteristics/heat_rate_penalty_spin.csv b/inputs/plant_characteristics/heat_rate_penalty_spin.csv
index b8568ecda..716493e42 100644
--- a/inputs/plant_characteristics/heat_rate_penalty_spin.csv
+++ b/inputs/plant_characteristics/heat_rate_penalty_spin.csv
@@ -12,6 +12,7 @@
   CoalOldUns  ,0.055
   CofireNew ,0.055
   CofireOld ,0.055
+h2-fuel-cell,0
   Gas-CC  ,0.035
   Gas-CC_H_1x1  ,0.035
   Gas-CC_H_2x1  ,0.035
diff --git a/inputs/plant_characteristics/maxage.csv b/inputs/plant_characteristics/maxage.csv
index 17d57ece5..1b0b46a96 100644
--- a/inputs/plant_characteristics/maxage.csv
+++ b/inputs/plant_characteristics/maxage.csv
@@ -1,4 +1,5 @@
 Gas-CC,55
+h2-fuel-cell,40
 Gas-CC_H_1x1,55
 Gas-CC_H_2x1,55
 Gas-CC-CCS_mod,55
@@ -63,4 +64,4 @@ evmc_storage_1*evmc_storage_10,1
 evmc_shape_1*evmc_shape_10,1
 electrolyzer,20
 smr,25
-smr_ccs,25
\ No newline at end of file
+smr_ccs,25
diff --git a/inputs/plant_characteristics/minCF.csv b/inputs/plant_characteristics/minCF.csv
index 9f91c5b0a..8aa848139 100644
--- a/inputs/plant_characteristics/minCF.csv
+++ b/inputs/plant_characteristics/minCF.csv
@@ -1,6 +1,7 @@
 beccs_mod,0.06
 beccs_max,0.06
 biopower,0.06
+h2-fuel-cell,0.06
 Gas-CT,0.06
 Gas-CT_aero,0.06
 H2-CT,0.06
diff --git a/inputs/plant_characteristics/minloadfrac0.csv b/inputs/plant_characteristics/minloadfrac0.csv
index cbe2c7cbc..1c5378ffa 100644
--- a/inputs/plant_characteristics/minloadfrac0.csv
+++ b/inputs/plant_characteristics/minloadfrac0.csv
@@ -13,6 +13,7 @@ CoalOldScr  ,0.4
 CoalOldUns  ,0.5
 CofireNew ,0.4
 CofireOld ,0.4
+h2-fuel-cell,0.01
 Gas-CC,0.5
 Gas-CC_H_1x1,0.5
 Gas-CC_H_2x1,0.5
@@ -35,4 +36,4 @@ nuclear ,0.7
 nuclear-SMR ,0.2
 o-g-s ,0.5
 H2-CC,0.38
-H2-CT,0.42
\ No newline at end of file
+H2-CT,0.42
diff --git a/inputs/plant_characteristics/mttr.csv b/inputs/plant_characteristics/mttr.csv
index d1e297a61..411942c2d 100644
--- a/inputs/plant_characteristics/mttr.csv
+++ b/inputs/plant_characteristics/mttr.csv
@@ -93,6 +93,7 @@ geohydro_allkm_8,24
 geohydro_allkm_9,24
 geothermal,24
 h2-cc,48
+h2-fuel-cell,48
 h2-ct,48
 hydd,24
 hyded,24
diff --git a/inputs/plant_characteristics/outage_forced_static.csv b/inputs/plant_characteristics/outage_forced_static.csv
index 6eb32d1a0..238ae2241 100644
--- a/inputs/plant_characteristics/outage_forced_static.csv
+++ b/inputs/plant_characteristics/outage_forced_static.csv
@@ -54,3 +54,4 @@ dac,0.1
 dac_gas,0.1
 electrolyzer,0.1
 can-imports,0
+h2-fuel-cell,0.05
diff --git a/inputs/plant_characteristics/outage_scheduled_static.csv b/inputs/plant_characteristics/outage_scheduled_static.csv
index a2291e829..04fb212de 100644
--- a/inputs/plant_characteristics/outage_scheduled_static.csv
+++ b/inputs/plant_characteristics/outage_scheduled_static.csv
@@ -1,3 +1,4 @@
+h2-fuel-cell,0.05
 Gas-CT,0.07
 Gas-CT_aero,0.07
 Gas-CC,0.1
diff --git a/inputs/plant_characteristics/ramprate.csv b/inputs/plant_characteristics/ramprate.csv
index e1e20a0d1..9bf492a70 100644
--- a/inputs/plant_characteristics/ramprate.csv
+++ b/inputs/plant_characteristics/ramprate.csv
@@ -3,6 +3,7 @@ Hydro,1
 Biopower,0.04
 beccs_mod,0.04
 beccs_max,0.04
+h2-fuel-cell,1
 gas-CT,0.08
 gas-CT_aero,0.08
 gas-CC,0.05
@@ -46,4 +47,4 @@ pvb2_1*pvb2_10,1
 pvb3_1*pvb3_10,1
 dr_shed_1*dr_shed_2,1
 evmc_storage_1*evmc_storage_10,1
-evmc_shape_1*evmc_shape_10,1
+evmc_shape_1*evmc_shape_10,1
\ No newline at end of file
diff --git a/inputs/plant_characteristics/startcost.csv b/inputs/plant_characteristics/startcost.csv
index 02f5fbcd2..f8fb4197d 100644
--- a/inputs/plant_characteristics/startcost.csv
+++ b/inputs/plant_characteristics/startcost.csv
@@ -27,3 +27,4 @@ gas-cc_h_1x1-ccs_mod,219
 gas-cc_h_1x1-ccs_max,219
 gas-cc_h_2x1-ccs_mod,219
 gas-cc_h_2x1-ccs_max,219
+h2-fuel-cell,0
diff --git a/inputs/plant_characteristics/unitsize_atb.csv b/inputs/plant_characteristics/unitsize_atb.csv
index 8ed2284e7..eae06ca31 100644
--- a/inputs/plant_characteristics/unitsize_atb.csv
+++ b/inputs/plant_characteristics/unitsize_atb.csv
@@ -64,3 +64,4 @@ hydend,94,hydro assumption
 can-imports,20000,arbitrarily high (not disaggregated so doesn't matter)
 evmc,20000,arbitrarily high (not disaggregated so doesn't matter)
 dr_shed,20000,arbitrarily high (not disaggregated so doesn't matter)
+h2-fuel-cell,100,https://docs.nlr.gov/docs/fy26osti/91146.pdf
\ No newline at end of file
diff --git a/inputs/plant_characteristics/years_until_endogenous.csv b/inputs/plant_characteristics/years_until_endogenous.csv
index e6c02d297..1405706bd 100644
--- a/inputs/plant_characteristics/years_until_endogenous.csv
+++ b/inputs/plant_characteristics/years_until_endogenous.csv
@@ -22,6 +22,7 @@ evmc_storage_1*evmc_storage_10,0
 evmc_shape_1*evmc_shape_10,0
 egs_allkm_1*egs_allkm_10,8
 distpv,0
+h2-fuel-cell,4
 Gas-CC,0
 Gas-CC_H_1x1,0
 Gas-CC_H_2x1,0
@@ -67,4 +68,4 @@ electrolyzer,0
 smr,0
 smr_ccs,0
 dac,3
-dac_gas,3
\ No newline at end of file
+dac_gas,3
diff --git a/inputs/sets/fuel2tech.csv b/inputs/sets/fuel2tech.csv
index 93d8cbd72..f166be748 100644
--- a/inputs/sets/fuel2tech.csv
+++ b/inputs/sets/fuel2tech.csv
@@ -33,3 +33,4 @@ biomass,cofirenew
 biomass,cofireold
 h2fuel,H2-CT
 h2fuel,H2-CC
+h2fuel,h2-fuel-cell
diff --git a/inputs/sets/i.csv b/inputs/sets/i.csv
index 43f2dd162..e684c96ab 100644
--- a/inputs/sets/i.csv
+++ b/inputs/sets/i.csv
@@ -16,6 +16,7 @@ CofireNew
 CofireOld
 csp-ns
 distpv
+h2-fuel-cell
 Gas-CC
 Gas-CC_H_1x1
 Gas-CC_H_2x1
diff --git a/inputs/sets/i_subtech.csv b/inputs/sets/i_subtech.csv
index f9a56e9bb..f78783184 100755
--- a/inputs/sets/i_subtech.csv
+++ b/inputs/sets/i_subtech.csv
@@ -7,7 +7,7 @@ GAS_CC_CCS
 GAS_CT
 COMBINED_CYCLE
 COMBUSTION_TURBINE
-FUEL_CELL
+NG_FUEL_CELL
 CONV
 TEMP_DERATE
 CCS
@@ -76,6 +76,8 @@ DAC
 H2_COMBUSTION
 H2_CC
 H2_CT
+H2_FUEL_CELL
+H2_GEN
 REFURBTECH
 cf_tech
 FOSSIL
diff --git a/inputs/tech-subset-table.csv b/inputs/tech-subset-table.csv
index 0e9c7b62c..088285f9c 100644
--- a/inputs/tech-subset-table.csv
+++ b/inputs/tech-subset-table.csv
@@ -1,74 +1,75 @@
-,BIO,COAL,COAL_CCS,GAS,GAS_CC,GAS_CC_CCS,GAS_CT,COMBINED_CYCLE,COMBUSTION_TURBINE,FUEL_CELL,CONV,TEMP_DERATE,CCS,CCS_MOD,CCS_MAX,CCSFLEX,CCSFLEX_BYP,CCSFLEX_STO,CCSFLEX_DAC,BECCS,RE,VRE,RSC,WIND,ONSWIND,OFSWIND,UPV,distpv,PV,PVB,PVB1,PVB2,PVB3,CSP,CSP_STORAGE,CSP1,CSP2,CSP3,CSP4,STORAGE,STORAGE_HYBRID,STORAGE_STANDALONE,STORAGE_INTERDAY,THERMAL_STORAGE,BATTERY,DEMAND_FLEX,EVMC,EVMC_STORAGE,EVMC_SHAPE,COFIRE,HYDRO,HYDRO_D,HYDRO_ND,PSH,GEO,GEO_HYDRO,GEO_EGS,GEO_EGS_ALLKM,GEO_EGS_NF,GEO_BASE,GEO_EXTRA,CANADA,VRE_NO_CSP,VRE_UTILITY,VRE_DISTRIBUTED,NUCLEAR,OGS,CONSUME,H2,SMR,DAC,LFILL,H2_COMBUSTION,H2_CC,H2_CT,REFURBTECH,cf_tech,FOSSIL,BOILER,NONDISPATCH,DR_SHED,GENTECH
-can-imports,,,,,,,,,,,,,,,,,,,,,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,,,,,,,,,,,,,,,,,,,,
-coal-CCS_mod,,YES,YES,,,,,,,,YES,YES,YES,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,YES,,,YES
-coal-CCS_max,,YES,YES,,,,,,,,YES,YES,YES,,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,YES,,,YES
-coal-CCS-F1,,YES,YES,,,,,,,,YES,YES,YES,YES,,YES,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,YES,,,YES
-coal-CCS-F2,,YES,YES,,,,,,,,YES,YES,YES,YES,,YES,,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,YES,,,YES
-coal-CCS-F3,,YES,YES,,,,,,,,YES,YES,YES,YES,,YES,,,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,YES,,,YES
-Coal-IGCC,,YES,,,,,,,,,YES,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,YES,,,YES
-coal-new,,YES,,,,,,,,,YES,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,YES,,,YES
-CoalOldScr,,YES,,,,,,,,,YES,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,YES,,,YES
-CoalOldUns,,YES,,,,,,,,,YES,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,YES,,,YES
-CofireNew,,YES,,,,,,,,,YES,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,YES,,,YES
-CofireOld,,YES,,,,,,,,,YES,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,YES,,,YES
-Gas-CC,,,,YES,YES,,,YES,,,YES,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,,,,YES
-Gas-CC_H_1x1,,,,YES,YES,,,YES,,,YES,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,,,,YES
-Gas-CC_H_2x1,,,,YES,YES,,,YES,,,YES,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,,,,YES
-Gas-CC-CCS_mod,,,,YES,YES,YES,,YES,,,YES,YES,YES,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,,,,YES
-Gas-CC-CCS_max,,,,YES,YES,YES,,YES,,,YES,YES,YES,,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,,,,YES
-Gas-CC_H_1x1-CCS_mod,,,,YES,YES,YES,,YES,,,YES,YES,YES,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,,,,YES
-Gas-CC_H_1x1-CCS_max,,,,YES,YES,YES,,YES,,,YES,YES,YES,,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,,,,YES
-Gas-CC_H_2x1-CCS_mod,,,,YES,YES,YES,,YES,,,YES,YES,YES,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,,,,YES
-Gas-CC_H_2x1-CCS_max,,,,YES,YES,YES,,YES,,,YES,YES,YES,,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,,,,YES
-Gas-CC-CCS-F1,,,,YES,YES,YES,,YES,,,YES,YES,YES,YES,,YES,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,,,,YES
-Gas-CC-CCS-F2,,,,YES,YES,YES,,YES,,,YES,YES,YES,YES,,YES,,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,,,,YES
-Gas-CC-CCS-F3,,,,YES,YES,YES,,YES,,,YES,YES,YES,YES,,YES,,,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,,,,YES
-Gas-CT,,,,YES,,,YES,,YES,,YES,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,,,,YES
-Gas-CT_aero,,,,YES,,,YES,,YES,,YES,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,,,,YES
-ng-fuel-cell,,,,YES,,,,,,YES,,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,,,,YES
-o-g-s,,,,,,,,,,,YES,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,,,,,,,,,,,YES,YES,,,YES
-Nuclear,,,,,,,,,,,YES,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,,,,,,,,,,,,,YES,,,YES
-Nuclear-SMR,,,,,,,,,,,YES,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,,,,,,,,,,,,,YES,,,YES
-H2-CT,,,,,,,,,YES,,YES,YES,,,,,,,,,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,,YES,,,,,,,YES
-H2-CC,,,,,,,,YES,,,YES,YES,,,,,,,,,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,YES,,,,,,,,YES
-biopower,YES,,,,,,,,,,YES,YES,,,,,,,,,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,,,YES
-geothermal,,,,,,,,,,,YES,YES,,,,,,,,,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,YES
-beccs_mod,YES,,,,,,,,,,YES,YES,YES,YES,,,,,,YES,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,,,YES
-beccs_max,YES,,,,,,,,,,YES,YES,YES,,YES,,,,,YES,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,,,YES
-Hydro,,,,,,,,,,,YES,,,,,,,,,,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES
-lfill-gas,,,,,,,,,,,YES,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,,,,,,,,,,YES
-battery_li,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,,YES,,,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-dr_shed_1*dr_shed_2,,,,,,,,,,,,,,,,,,,,,,,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,,,,,YES,
-evmc_storage_1*evmc_storage_10,,,,,,,,,,,,,,,,,,,,,,,YES,,,,,,,,,,,,,,,,,YES,,YES,,,,YES,YES,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,,,,,,
-evmc_shape_1*evmc_shape_10,,,,,,,,,,,,,,,,,,,,,,,YES,,,,,,,,,,,,,,,,,,,,,,,YES,YES,,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,,,,,,
-pumped-hydro,,,,,,,,,,,,,,,,,,,,,,,YES,,,,,,,,,,,,,,,,,YES,,YES,YES,,,,,,,,,,,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-pumped-hydro-flex,,,,,,,,,,,,,,,,,,,,,,,YES,,,,,,,,,,,,,,,,,YES,,YES,,,,,,,,,,,,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-distpv,,,,,,,,,,,,,,,,,,,,,YES,YES,YES,,,,,YES,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,,YES,,,,,,,,,,,YES,YES,,,YES,,YES
-upv_1*upv_10,,,,,,,,,,,,,,,,,,,,,YES,YES,YES,,,,YES,,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,YES,,,,,,,,,,,,YES,YES,,,,,YES
-pvb1_1*pvb1_10,,,,,,,,,,,,,,,,,,,,,,,YES,,,,,,,YES,YES,,,,,,,,,YES,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,YES,,,,,YES
-pvb2_1*pvb2_10,,,,,,,,,,,,,,,,,,,,,,,YES,,,,,,,YES,,YES,,,,,,,,YES,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,YES,,,,,YES
-pvb3_1*pvb3_10,,,,,,,,,,,,,,,,,,,,,,,YES,,,,,,,YES,,,YES,,,,,,,YES,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,YES,,,,,YES
-wind-ofs_1*wind-ofs_10,,,,,,,,,,,,,,,,,,,,,YES,YES,YES,YES,,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,YES,,,,,,,,,,,,YES,YES,,,,,YES
-wind-ons_1*wind-ons_10,,,,,,,,,,,,,,,,,,,,,YES,YES,YES,YES,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,YES,,,,,,,,,,,,YES,YES,,,,,YES
-csp1_1*csp1_12,,,,,,,,,,,,,,,,,,,,,YES,,YES,,,,,,,,,,,YES,YES,YES,,,,YES,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,,,,,YES
-csp2_1*csp2_12,,,,,,,,,,,,,,,,,,,,,YES,,YES,,,,,,,,,,,YES,YES,,YES,,,YES,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,,,,,YES
-csp3_1*csp3_12,,,,,,,,,,,,,,,,,,,,,YES,,YES,,,,,,,,,,,YES,YES,,,YES,,YES,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,,,,,YES
-csp4_1*csp4_12,,,,,,,,,,,,,,,,,,,,,YES,,YES,,,,,,,,,,,YES,YES,,,,YES,YES,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,,,,,YES
-hydD,,,,,,,,,,,,,,,,,,,,,YES,,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,YES,,,,,,,,,,,,,,,,,,,,,,,,,YES,,,,,YES
-hydND,,,,,,,,,,,,,,,,,,,,,YES,,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,,YES,,,,,,,,,,,,,,,,,,,,,,,,YES,,,YES,,YES
-hydSD,,,,,,,,,,,,,,,,,,,,,YES,,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,YES,,,,,,,,,,,,,,,,,,,,,,,,,YES,,,,,YES
-hydSND,,,,,,,,,,,,,,,,,,,,,YES,,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,,YES,,,,,,,,,,,,,,,,,,,,,,,,YES,,,YES,,YES
-hydUD,,,,,,,,,,,,,,,,,,,,,YES,,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,YES,,,,,,,,,,,,,,,,,,,,,,,,,YES,,,,,YES
-hydUND,,,,,,,,,,,,,,,,,,,,,YES,,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,,YES,,,,,,,,,,,,,,,,,,,,,,,,YES,,,YES,,YES
-hydNPD,,,,,,,,,,,,,,,,,,,,,YES,,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,YES,,,,,,,,,,,,,,,,,,,,,,,,,YES,,,,,YES
-hydNPND,,,,,,,,,,,,,,,,,,,,,YES,,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,,YES,,,,,,,,,,,,,,,,,,,,,,,,YES,,,YES,,YES
-hydED,,,,,,,,,,,,,,,,,,,,,YES,,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,YES,,,,,,,,,,,,,,,,,,,,,,,,,YES,,,,,YES
-hydEND,,,,,,,,,,,,,,,,,,,,,YES,,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,,YES,,,,,,,,,,,,,,,,,,,,,,,,YES,,,YES,,YES
-electrolyzer,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,YES,,,,,,,,,,,,,
-smr,,,,,,,,,,,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,YES,YES,,,,,,,,,,,,
-smr_ccs,,,,,,,,,,,YES,,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,YES,YES,,,,,,,,,,,,
-dac,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,,,YES,,,,,,,,,,,
-dac_gas,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,,,YES,,,,,,,,,,,
-egs_allkm_1*egs_allkm_10,,,,,,,,,,,,,,,,,,,,,YES,,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,,YES,YES,,,YES,,,,,,,,,,,,,,,,,,,,,YES
-geohydro_allkm_1*geohydro_allkm_10,,,,,,,,,,,,,,,,,,,,,YES,,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,YES,,,,YES,,,,,,,,,,,,,,,,,,,,,,YES
-egs_nearfield_1*egs_nearfield_10,,,,,,,,,,,,,,,,,,,,,YES,,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,,YES,,YES,YES,,,,,,,,,,,,,,,,,,,,,,YES
+,BIO,COAL,COAL_CCS,GAS,GAS_CC,GAS_CC_CCS,GAS_CT,COMBINED_CYCLE,COMBUSTION_TURBINE,NG_FUEL_CELL,CONV,TEMP_DERATE,CCS,CCS_MOD,CCS_MAX,CCSFLEX,CCSFLEX_BYP,CCSFLEX_STO,CCSFLEX_DAC,BECCS,RE,VRE,RSC,WIND,ONSWIND,OFSWIND,UPV,distpv,PV,PVB,PVB1,PVB2,PVB3,CSP,CSP_STORAGE,CSP1,CSP2,CSP3,CSP4,STORAGE,STORAGE_HYBRID,STORAGE_STANDALONE,STORAGE_INTERDAY,THERMAL_STORAGE,BATTERY,DEMAND_FLEX,EVMC,EVMC_STORAGE,EVMC_SHAPE,COFIRE,HYDRO,HYDRO_D,HYDRO_ND,PSH,GEO,GEO_HYDRO,GEO_EGS,GEO_EGS_ALLKM,GEO_EGS_NF,GEO_BASE,GEO_EXTRA,CANADA,VRE_NO_CSP,VRE_UTILITY,VRE_DISTRIBUTED,NUCLEAR,OGS,CONSUME,H2,SMR,DAC,LFILL,H2_COMBUSTION,H2_CC,H2_CT,H2_FUEL_CELL,H2_GEN,REFURBTECH,cf_tech,FOSSIL,BOILER,NONDISPATCH,DR_SHED,GENTECH
+can-imports,,,,,,,,,,,,,,,,,,,,,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,,,,,,,,,,,,,,,,,,,,,,
+coal-CCS_mod,,YES,YES,,,,,,,,YES,YES,YES,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,YES,,,YES
+coal-CCS_max,,YES,YES,,,,,,,,YES,YES,YES,,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,YES,,,YES
+coal-CCS-F1,,YES,YES,,,,,,,,YES,YES,YES,YES,,YES,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,YES,,,YES
+coal-CCS-F2,,YES,YES,,,,,,,,YES,YES,YES,YES,,YES,,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,YES,,,YES
+coal-CCS-F3,,YES,YES,,,,,,,,YES,YES,YES,YES,,YES,,,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,YES,,,YES
+Coal-IGCC,,YES,,,,,,,,,YES,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,YES,,,YES
+coal-new,,YES,,,,,,,,,YES,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,YES,,,YES
+CoalOldScr,,YES,,,,,,,,,YES,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,YES,,,YES
+CoalOldUns,,YES,,,,,,,,,YES,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,YES,,,YES
+CofireNew,,YES,,,,,,,,,YES,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,YES,,,YES
+CofireOld,,YES,,,,,,,,,YES,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,YES,,,YES
+Gas-CC,,,,YES,YES,,,YES,,,YES,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,,,,YES
+Gas-CC_H_1x1,,,,YES,YES,,,YES,,,YES,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,,,,YES
+Gas-CC_H_2x1,,,,YES,YES,,,YES,,,YES,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,,,,YES
+Gas-CC-CCS_mod,,,,YES,YES,YES,,YES,,,YES,YES,YES,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,,,,YES
+Gas-CC-CCS_max,,,,YES,YES,YES,,YES,,,YES,YES,YES,,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,,,,YES
+Gas-CC_H_1x1-CCS_mod,,,,YES,YES,YES,,YES,,,YES,YES,YES,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,,,,YES
+Gas-CC_H_1x1-CCS_max,,,,YES,YES,YES,,YES,,,YES,YES,YES,,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,,,,YES
+Gas-CC_H_2x1-CCS_mod,,,,YES,YES,YES,,YES,,,YES,YES,YES,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,,,,YES
+Gas-CC_H_2x1-CCS_max,,,,YES,YES,YES,,YES,,,YES,YES,YES,,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,,,,YES
+Gas-CC-CCS-F1,,,,YES,YES,YES,,YES,,,YES,YES,YES,YES,,YES,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,,,,YES
+Gas-CC-CCS-F2,,,,YES,YES,YES,,YES,,,YES,YES,YES,YES,,YES,,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,,,,YES
+Gas-CC-CCS-F3,,,,YES,YES,YES,,YES,,,YES,YES,YES,YES,,YES,,,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,,,,YES
+Gas-CT,,,,YES,,,YES,,YES,,YES,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,,,,YES
+Gas-CT_aero,,,,YES,,,YES,,YES,,YES,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,,,,YES
+ng-fuel-cell,,,,YES,,,,,,YES,,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,,,,YES
+h2-fuel-cell,,,,,,,,,,,,,,,,,,,,,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,YES,,,,,,,YES
+o-g-s,,,,,,,,,,,YES,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,,,,,,,,,,,,,YES,YES,,,YES
+Nuclear,,,,,,,,,,,YES,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,,,,,,,,,,,,,,,YES,,,YES
+Nuclear-SMR,,,,,,,,,,,YES,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,,,,,,,,,,,,,,,YES,,,YES
+H2-CT,,,,,,,,,YES,,YES,YES,,,,,,,,,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,,YES,,YES,,,,,,,YES
+H2-CC,,,,,,,,YES,,,YES,YES,,,,,,,,,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,YES,,,YES,,,,,,,YES
+biopower,YES,,,,,,,,,,YES,YES,,,,,,,,,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,,,YES
+geothermal,,,,,,,,,,,YES,YES,,,,,,,,,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES
+beccs_mod,YES,,,,,,,,,,YES,YES,YES,YES,,,,,,YES,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,,,YES
+beccs_max,YES,,,,,,,,,,YES,YES,YES,,YES,,,,,YES,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,,,YES
+Hydro,,,,,,,,,,,YES,,,,,,,,,,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES
+lfill-gas,,,,,,,,,,,YES,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,,,,,,,,,,,,YES
+battery_li,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,,YES,,,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+dr_shed_1*dr_shed_2,,,,,,,,,,,,,,,,,,,,,,,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,,,,,YES,
+evmc_storage_1*evmc_storage_10,,,,,,,,,,,,,,,,,,,,,,,YES,,,,,,,,,,,,,,,,,YES,,YES,,,,YES,YES,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,,,,,,
+evmc_shape_1*evmc_shape_10,,,,,,,,,,,,,,,,,,,,,,,YES,,,,,,,,,,,,,,,,,,,,,,,YES,YES,,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,,,,,,
+pumped-hydro,,,,,,,,,,,,,,,,,,,,,,,YES,,,,,,,,,,,,,,,,,YES,,YES,YES,,,,,,,,,,,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+pumped-hydro-flex,,,,,,,,,,,,,,,,,,,,,,,YES,,,,,,,,,,,,,,,,,YES,,YES,,,,,,,,,,,,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+distpv,,,,,,,,,,,,,,,,,,,,,YES,YES,YES,,,,,YES,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,,YES,,,,,,,,,,,,,YES,YES,,,YES,,YES
+upv_1*upv_10,,,,,,,,,,,,,,,,,,,,,YES,YES,YES,,,,YES,,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,YES,,,,,,,,,,,,,,YES,YES,,,,,YES
+pvb1_1*pvb1_10,,,,,,,,,,,,,,,,,,,,,,,YES,,,,,,,YES,YES,,,,,,,,,YES,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,YES,,,,,YES
+pvb2_1*pvb2_10,,,,,,,,,,,,,,,,,,,,,,,YES,,,,,,,YES,,YES,,,,,,,,YES,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,YES,,,,,YES
+pvb3_1*pvb3_10,,,,,,,,,,,,,,,,,,,,,,,YES,,,,,,,YES,,,YES,,,,,,,YES,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,YES,,,,,YES
+wind-ofs_1*wind-ofs_10,,,,,,,,,,,,,,,,,,,,,YES,YES,YES,YES,,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,YES,,,,,,,,,,,,,,YES,YES,,,,,YES
+wind-ons_1*wind-ons_10,,,,,,,,,,,,,,,,,,,,,YES,YES,YES,YES,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,YES,,,,,,,,,,,,,,YES,YES,,,,,YES
+csp1_1*csp1_12,,,,,,,,,,,,,,,,,,,,,YES,,YES,,,,,,,,,,,YES,YES,YES,,,,YES,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,,,,,YES
+csp2_1*csp2_12,,,,,,,,,,,,,,,,,,,,,YES,,YES,,,,,,,,,,,YES,YES,,YES,,,YES,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,,,,,YES
+csp3_1*csp3_12,,,,,,,,,,,,,,,,,,,,,YES,,YES,,,,,,,,,,,YES,YES,,,YES,,YES,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,,,,,YES
+csp4_1*csp4_12,,,,,,,,,,,,,,,,,,,,,YES,,YES,,,,,,,,,,,YES,YES,,,,YES,YES,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,,,,,YES
+hydD,,,,,,,,,,,,,,,,,,,,,YES,,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,,,,,YES
+hydND,,,,,,,,,,,,,,,,,,,,,YES,,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,,YES,,,,,,,,,,,,,,,,,,,,,,,,,,YES,,,YES,,YES
+hydSD,,,,,,,,,,,,,,,,,,,,,YES,,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,,,,,YES
+hydSND,,,,,,,,,,,,,,,,,,,,,YES,,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,,YES,,,,,,,,,,,,,,,,,,,,,,,,,,YES,,,YES,,YES
+hydUD,,,,,,,,,,,,,,,,,,,,,YES,,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,,,,,YES
+hydUND,,,,,,,,,,,,,,,,,,,,,YES,,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,,YES,,,,,,,,,,,,,,,,,,,,,,,,,,YES,,,YES,,YES
+hydNPD,,,,,,,,,,,,,,,,,,,,,YES,,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,,,,,YES
+hydNPND,,,,,,,,,,,,,,,,,,,,,YES,,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,,YES,,,,,,,,,,,,,,,,,,,,,,,,,,YES,,,YES,,YES
+hydED,,,,,,,,,,,,,,,,,,,,,YES,,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,,,,,YES
+hydEND,,,,,,,,,,,,,,,,,,,,,YES,,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,,YES,,,,,,,,,,,,,,,,,,,,,,,,,,YES,,,YES,,YES
+electrolyzer,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,YES,,,,,,,,,,,,,,,
+smr,,,,,,,,,,,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,YES,YES,,,,,,,,,,,,,,
+smr_ccs,,,,,,,,,,,YES,,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,YES,YES,,,,,,,,,,,,,,
+dac,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,,,YES,,,,,,,,,,,,,
+dac_gas,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,,,YES,,,,,,,,,,,,,
+egs_allkm_1*egs_allkm_10,,,,,,,,,,,,,,,,,,,,,YES,,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,,YES,YES,,,YES,,,,,,,,,,,,,,,,,,,,,,,YES
+geohydro_allkm_1*geohydro_allkm_10,,,,,,,,,,,,,,,,,,,,,YES,,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,YES,,,,YES,,,,,,,,,,,,,,,,,,,,,,,,YES
+egs_nearfield_1*egs_nearfield_10,,,,,,,,,,,,,,,,,,,,,YES,,YES,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,YES,,YES,,YES,YES,,,,,,,,,,,,,,,,,,,,,,,,YES
diff --git a/inputs/techs/techs_default.csv b/inputs/techs/techs_default.csv
index 3142bc236..73665bab4 100644
--- a/inputs/techs/techs_default.csv
+++ b/inputs/techs/techs_default.csv
@@ -14,6 +14,7 @@ CoalOldUns,p
 CofireNew,p
 CofireOld,p
 distpv,p
+h2-fuel-cell,p
 Gas-CC,p
 Gas-CC_H_1x1,p
 Gas-CC_H_2x1,p
diff --git a/inputs/userinput/futurefiles.csv b/inputs/userinput/futurefiles.csv
index d49a76891..586e4ddac 100644
--- a/inputs/userinput/futurefiles.csv
+++ b/inputs/userinput/futurefiles.csv
@@ -323,6 +323,7 @@ plantchar_dr_shed.csv,.csv,0,None,wide,"tech,r",1,0,constant,None,None,new; chec
 plantchar_evmc_shape.csv,.csv,1,None,9999,None,9999,0,constant,None,None,new; used to create plantcharout.csv so no need to forecast,
 plantchar_evmc_storage.csv,.csv,1,None,9999,None,9999,0,constant,None,None,new; used to create plantcharout.csv so no need to forecast,
 plantchar_fuelcell.csv,.csv,1,None,9999,None,9999,0,constant,None,None,new; used to create plantcharout.csv so no need to forecast,
+plantchar_h2fuelcell.csv,.csv,1,None,9999,None,9999,0,constant,None,None,new; used to create plantcharout.csv so no need to forecast,
 plantchar_gas_ccs.csv,.csv,1,None,9999,None,9999,0,constant,None,None,new; used to create plantcharout.csv so no need to forecast,
 plantchar_gas.csv,.csv,1,None,9999,None,9999,0,constant,None,None,new; used to create plantcharout.csv so no need to forecast,
 plantchar_geo.csv,.csv,1,None,9999,None,9999,0,constant,None,None,new; used to create plantcharout.csv so no need to forecast,
@@ -500,4 +501,4 @@ wst.csv,.csv,1,None,9999,None,9999,0,constant,None,None,new,
 x_r.csv,.csv,1,None,9999,None,9999,0,constant,None,None,new,
 x.csv,.csv,1,None,9999,None,9999,0,constant,None,None,new,
 yearafter.csv,.csv,1,None,9999,None,9999,0,constant,None,None,new,
-years_until_endogenous.csv,.csv,1,None,9999,None,9999,0,constant,None,None,done,constant
+years_until_endogenous.csv,.csv,1,None,9999,None,9999,0,constant,None,None,done,constant
\ No newline at end of file
diff --git a/inputs/userinput/ivt_default.csv b/inputs/userinput/ivt_default.csv
index 5434521f6..eb23d97b8 100644
--- a/inputs/userinput/ivt_default.csv
+++ b/inputs/userinput/ivt_default.csv
@@ -16,6 +16,7 @@ CoalOldUns,1,1,1,1,1,1,1,1,1,2,2,2,2,2,2,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17
 CofireNew,1,1,1,1,1,1,1,1,1,2,2,2,2,2,2,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27
 CofireOld,1,1,1,1,1,1,1,1,1,2,2,2,2,2,2,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27
 distpv,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
+h2-fuel-cell,1,1,1,1,2,2,2,2,3,3,3,3,4,4,4,4,5,5,5,5,6,6,6,6,7,7,7,7,8,8,8,8,9,9,9,9,10,10,10,10,10
 Gas-CC,1,1,1,1,1,1,1,1,1,2,2,2,2,2,2,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27
 Gas-CC_H_1x1,1,1,1,1,1,1,1,1,1,2,2,2,2,2,2,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27
 Gas-CC_H_2x1,1,1,1,1,1,1,1,1,1,2,2,2,2,2,2,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27
@@ -73,4 +74,4 @@ hyded_pumped-hydro,1,1,1,1,1,1,1,1,1,2,2,3,3,4,4,5,5,6,6,7,7,8,8,9,9,10,10,11,11
 hyded_pumped-hydro-flex,1,1,1,1,1,1,1,1,1,2,2,3,3,4,4,5,5,6,6,7,7,8,8,9,9,10,10,11,11,12,12,13,13,14,14,15,15,16,16,17,17
 egs_allkm_1*egs_allkm_10,1,1,1,1,1,1,1,1,1,1,1,1,2,2,2,2,3,3,3,3,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4
 geohydro_allkm_1*geohydro_allkm_10,1,1,1,1,1,1,1,1,1,1,1,1,2,2,2,2,3,3,3,3,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4
-egs_nearfield_1*egs_nearfield_10,1,1,1,1,1,1,1,1,1,1,1,1,2,2,2,2,3,3,3,3,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4
\ No newline at end of file
+egs_nearfield_1*egs_nearfield_10,1,1,1,1,1,1,1,1,1,1,1,1,2,2,2,2,3,3,3,3,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4
diff --git a/inputs/userinput/ivt_small.csv b/inputs/userinput/ivt_small.csv
index c726e6900..61b9428f7 100644
--- a/inputs/userinput/ivt_small.csv
+++ b/inputs/userinput/ivt_small.csv
@@ -16,6 +16,7 @@ CoalOldUns,1,1,1,1,1,1,1,1,1,1,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2
 CofireNew,1,1,1,1,1,1,1,1,1,1,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2
 CofireOld,1,1,1,1,1,1,1,1,1,1,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2
 distpv,1,1,1,1,1,1,1,1,1,1,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2
+h2-fuel-cell,1,1,1,1,1,1,1,1,1,1,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2
 Gas-CC,1,1,1,1,1,1,1,1,1,1,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2
 Gas-CC_H_1x1,1,1,1,1,1,1,1,1,1,1,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2
 Gas-CC_H_2x1,1,1,1,1,1,1,1,1,1,1,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2
diff --git a/inputs/userinput/ivt_step.csv b/inputs/userinput/ivt_step.csv
index 6e0fea5f1..7c7da979a 100644
--- a/inputs/userinput/ivt_step.csv
+++ b/inputs/userinput/ivt_step.csv
@@ -16,6 +16,7 @@ CoalOldUns,0
 CofireNew,5
 CofireOld,0
 distpv,0
+h2-fuel-cell,5
 Gas-CC,5
 Gas-CC_H_1x1,5
 Gas-CC_H_2x1,5
diff --git a/postprocessing/bokehpivot/in/reeds2/tech_map.csv b/postprocessing/bokehpivot/in/reeds2/tech_map.csv
index c29726bbf..b178acea1 100644
--- a/postprocessing/bokehpivot/in/reeds2/tech_map.csv
+++ b/postprocessing/bokehpivot/in/reeds2/tech_map.csv
@@ -63,6 +63,7 @@ nuclear-smr,Nuclear-SMR
 caes,CAES
 pumped-hydro,Pumped-Hydro
 can-imports,Canadian Imports
+h2-fuel-cell,H2-Fuel-Cell
 canada,Canadian Imports
 h2-ct,H2-CT
 h2-cc,H2-CC
diff --git a/postprocessing/bokehpivot/in/reeds2/tech_style.csv b/postprocessing/bokehpivot/in/reeds2/tech_style.csv
index 8306c318d..dd31810c4 100644
--- a/postprocessing/bokehpivot/in/reeds2/tech_style.csv
+++ b/postprocessing/bokehpivot/in/reeds2/tech_style.csv
@@ -20,7 +20,8 @@ H2-CC,#708238,<
 H2-CT_Upgrade,#66C238,>
 H2-CT,#A8C839,>
 NG-Fuel-Cell,#AD50E2,<
-Hydrogen Combustion,#A8C839,<
+H2-Fuel-Cell,#87A21D,<
+Hydrogen Generation,#A8C839,<
 Hydropower,#187F94,s
 Hydropower Existing,#187F94,s
 Hydropower New,#187F94,s
@@ -54,4 +55,4 @@ SMR-CCS,#5F522D,-
 Electrolyzer,#896F2D,-
 Other,#ff69b4,-
 Remove,#000000,-
-Dropped,#d62728,-
+Dropped,#d62728,-
\ No newline at end of file
diff --git a/postprocessing/tech_aggregation.csv b/postprocessing/tech_aggregation.csv
index 445af35eb..f49f5b304 100644
--- a/postprocessing/tech_aggregation.csv
+++ b/postprocessing/tech_aggregation.csv
@@ -17,8 +17,8 @@ coaloldscr_coal-ccs_max,Coal-CCS_Upgrade,Coal-CCS,Thermal,Coal-CCS_Upgrade
 coalolduns_coal-ccs_max,Coal-CCS_Upgrade,Coal-CCS,Thermal,Coal-CCS_Upgrade
 cofirenew_coal-ccs_max,Coal-CCS_Upgrade,Coal-CCS,Thermal,Coal-CCS_Upgrade
 cofireold_coal-ccs_max,Coal-CCS_Upgrade,Coal-CCS,Thermal,Coal-CCS_Upgrade
-gas-ct_h2-ct,H2-CT_Upgrade,Hydrogen Combustion,Thermal,H2-CT_Upgrade
-gas-cc_h2-cc,H2-CC_Upgrade,Hydrogen Combustion,Thermal,H2-CC_Upgrade
+gas-ct_h2-ct,H2-CT_Upgrade,Hydrogen Generation,Thermal,H2-CT_Upgrade
+gas-cc_h2-cc,H2-CC_Upgrade,Hydrogen Generation,Thermal,H2-CC_Upgrade
 beccs_mod,BECCS,Biopower,Thermal,BECCS
 beccs_max,BECCS,Biopower,Thermal,BECCS
 distpv,DPV,Solar,VRE,DPV
@@ -34,8 +34,9 @@ caes,CAES,Storage,Storage,CAES
 pumped-hydro,Pumped-Hydro,Storage,Storage,Pumped-Hydro
 can-imports,Canadian Imports,Remove,Remove,Canadian Imports
 canada,Canadian Imports,Remove,Remove,Canadian Imports
-h2-ct,H2-CT,Hydrogen Combustion,Thermal,H2-CT
-h2-cc,H2-CC,Hydrogen Combustion,Thermal,H2-CC
+h2-ct,H2-CT,Hydrogen Generation,Thermal,H2-CT
+h2-cc,H2-CC,Hydrogen Generation,Thermal,H2-CC
+h2-fuel-cell,H2-Fuel-Cell,Hydrogen Generation,Remove,H2-Fuel-Cell
 smr,SMR,Remove,Remove,SMR
 smr_ccs,SMR-CCS,Remove,Remove,SMR-CCS
 electrolyzer,Electrolyzer,Remove,Remove,Electrolyzer
@@ -76,4 +77,4 @@ egs_nearfield_,Geothermal,Geothermal,Thermal,Geothermal
 gas-cc_,Gas-CC,Gas,Thermal,Gas-CC
 gas-cc-ccs_mod_,Gas-CC-CCS,Gas-CCS,Thermal,Gas-CC-CCS
 gas-cc-ccs_max_,Gas-CC-CCS,Gas-CCS,Thermal,Gas-CC-CCS
-nuclear_,Nuclear,Nuclear,Thermal,Nuclear
+nuclear_,Nuclear,Nuclear,Thermal,Nuclear
\ No newline at end of file
diff --git a/reeds/core/setup/b_inputs.gms b/reeds/core/setup/b_inputs.gms
index a008fbff4..54150c6a6 100644
--- a/reeds/core/setup/b_inputs.gms
+++ b/reeds/core/setup/b_inputs.gms
@@ -274,7 +274,7 @@ set
   evmc_storage(i)      "ev flexibility as direct load control",
   evmc_shape(i)        "ev flexibility as adoptable change to load from response to pricing",
   fossil(i)            "fossil technologies"
-  fuel_cell(i)         "fuel cell technologies",
+  ng_fuel_cell(i)      "natural gas fuel cell technologies",
   gas_cc_ccs(i)        "techs that are gas combined cycle and have CCS",
   gas_cc(i)            "techs that are gas combined cycle",
   gas_ct(i)            "techs that are gas combustion turbine",
@@ -288,9 +288,11 @@ set
   geo_egs_allkm(i)     "egs (covering deep egs depths of all km) technologies",
   geo_egs_nf(i)        "egs (near-field) technologies",
   h2_combustion(i)     "h2-ct and h2-cc technologies",
-  h2_cc(i)             "h2-cc technologies"
+  h2_cc(i)             "h2-cc technologies",
   h2_ct(i)             "h2-ct technologies",
   h2(i)                "hydrogen-producing technologies",
+  h2_fuel_cell(i)      "H2 fuel cell technologies",
+  h2_gen(i)            "hydrogen-consuming generation technologies (h2-ct, h2-cc, h2 fuel cell)",
   hyd_add_pump(i)      "hydro techs with an added pump",
   hydro_d(i)           "dispatchable hydro technologies",
   hydro_nd(i)          "non-dispatchable hydro technologies",
@@ -517,8 +519,12 @@ if(Sw_H2Combustionupgrade = 0,
   ban(i)$[i_subsets(i,'h2_combustion')$upgrade(i)] = yes ;
 ) ;
 
-if(Sw_FuelCell = 0,
-  ban(i)$i_subsets(i,'fuel_cell') = yes ;
+if(Sw_GasFuelCell = 0,
+  ban('ng-fuel-cell') = yes ;
+) ;
+
+if(Sw_H2FuelCell = 0,
+  ban('h2-fuel-cell') = yes ;
 ) ;
 
 if(Sw_LfillGas = 0,
@@ -734,7 +740,7 @@ evmc(i)$(not ban(i))                = yes$i_subsets(i,'evmc') ;
 evmc_storage(i)$(not ban(i))        = yes$i_subsets(i,'evmc_storage') ;
 evmc_shape(i)$(not ban(i))          = yes$i_subsets(i,'evmc_shape') ;
 fossil(i)$(not ban(i))              = yes$i_subsets(i,'fossil') ;
-fuel_cell(i)$(not ban(i))           = yes$i_subsets(i,'fuel_cell') ;
+ng_fuel_cell(i)$(not ban(i))        = yes$i_subsets(i,'ng_fuel_cell') ;
 gas_cc_ccs(i)$(not ban(i))          = yes$i_subsets(i,'gas_cc_ccs') ;
 gas_cc(i)$(not ban(i))              = yes$i_subsets(i,'gas_cc') ;
 gas_ct(i)$(not ban(i))              = yes$i_subsets(i,'gas_ct') ;
@@ -751,6 +757,8 @@ h2_combustion(i)$(not ban(i))       = yes$i_subsets(i,'h2_combustion') ;
 h2_cc(i)$(not ban(i))               = yes$i_subsets(i,'h2_cc') ;
 h2_ct(i)$(not ban(i))               = yes$i_subsets(i,'h2_ct') ;
 h2(i)$(not ban(i))                  = yes$i_subsets(i,'h2') ;
+h2_fuel_cell(i)$(not ban(i))        = yes$i_subsets(i,'h2_fuel_cell') ;
+h2_gen(i)$(not ban(i))              = yes$i_subsets(i,'h2_gen') ;
 hydro_d(i)$(not ban(i))             = yes$i_subsets(i,'hydro_d') ;
 hydro_nd(i)$(not ban(i))            = yes$i_subsets(i,'hydro_nd') ;
 hydro(i)$(not ban(i))               = yes$i_subsets(i,'hydro') ;
@@ -796,7 +804,7 @@ tg_i('coal',i)$coal(i) = yes ;
 tg_i('nuclear',i)$nuclear(i) = yes ;
 tg_i('battery',i)$battery(i) = yes ;
 tg_i('hydro',i)$hydro(i) = yes ;
-tg_i('h2',i)$h2_combustion(i) = yes ;
+tg_i('h2',i)$h2_gen(i) = yes ;
 tg_i('geothermal',i)$geo(i) = yes ;
 tg_i('biomass',i)$bio(i) = yes ;
 tg_i('pumped-hydro',i)$psh(i) = yes ;
@@ -1854,7 +1862,7 @@ scalar h2_demand_start  "--year-- first year that h2 demand should be modeled"
 ;
 
 * Identify the first year that hydrogen generation technologies are allowed
-h2_gen_firstyear = smin{i$[h2_combustion(i)$(not ban(i))], firstyear(i) } ;
+h2_gen_firstyear = smin{i$[h2_gen(i)$(not ban(i))], firstyear(i) } ;
 
 * Set h2_demand_start to the first year that there is data
 * in h2_exogenous_demand
@@ -5625,7 +5633,7 @@ valret(i,v)$[(Sw_Retire=2)$initv(v)$(not noretire(i))
 *All new and existing nuclear, coal, gas, and hydrogen are retirable if Sw_Retire = 3
 *Existing plants have to meet the min_retire_age before retiring
 valret(i,v)$[((Sw_Retire=3) or (Sw_Retire=5))$(not noretire(i))
-            $(coal(i) or gas(i) or nuclear(i) or ogs(i) or h2_combustion(i) or h2(i))] = yes ;
+            $(coal(i) or gas(i) or nuclear(i) or ogs(i) or h2_gen(i) or h2(i))] = yes ;
 
 *new and existings plants of any technology can be retired if Sw_Retire = 4
 valret(i,v)$[(Sw_Retire=4)$(not noretire(i))] = yes ;
@@ -5634,7 +5642,7 @@ retiretech(i,v,r,t)$[valret(i,v)$valcap(i,v,r,t)] = yes ;
 
 * when Sw_Retire = 3 ensure that plants do not retire before their minimum age
 retiretech(i,v,r,t)$[((Sw_Retire=3) or (Sw_Retire=5))$initv(v)$(not noretire(i))$(plant_age(i,v,r,t) <= min_retire_age(i))
-                    $(coal(i) or gas(i) or nuclear(i) or ogs(i) or h2_combustion(i) or h2(i))] = no ;
+                    $(coal(i) or gas(i) or nuclear(i) or ogs(i) or h2_gen(i) or h2(i))] = no ;
 
 * for sw_retire=5, don't allow nuclear to retire until 2030
 retiretech(i,v,r,t)$[(Sw_Retire=5)$nuclear(i)$(yeart(t)<=2030)] = no ;
diff --git a/reeds/core/setup/c_model.gms b/reeds/core/setup/c_model.gms
index 74f0e7c5f..74fe302d6 100644
--- a/reeds/core/setup/c_model.gms
+++ b/reeds/core/setup/c_model.gms
@@ -3563,7 +3563,7 @@ eq_h2_demand(p,t)$[(sameas(p,"H2"))$tmodel(t)$(yeart(t)>=h2_demand_start)$(Sw_H2
 
 * assuming here that h2 production and use in H2_COMBUSTION can be temporally asynchronous
 * that is, the hydrogen does not need to produced in the same hour it is consumed by h2-ct/cc's
-    + sum{(i,v,r,h)$[valgen(i,v,r,t)$h2_combustion(i)$h_rep(h)],
+    + sum{(i,v,r,h)$[valgen(i,v,r,t)$h2_gen(i)$h_rep(h)],
             GEN(i,v,r,h,t) * hours(h) * h2_combustion_intensity * heat_rate(i,v,r,t)
     }
 ;
@@ -3594,7 +3594,7 @@ eq_h2_demand_regional(r,h,t)
 
 * region-specific H2 consumption from H2-CT/CCs
 * [MW] * [metric ton/MMBtu] * [MMBtu/MWh] = [metric tons/hour]
-    + sum{(i,v)$[valgen(i,v,r,t)$h2_combustion(i)],
+    + sum{(i,v)$[valgen(i,v,r,t)$h2_gen(i)],
             GEN(i,v,r,h,t) * h2_combustion_intensity * heat_rate(i,v,r,t)
        }
 ;
@@ -3685,7 +3685,7 @@ eq_h2_min_storage_cap(r,t)$[tmodel(t)$(Sw_H2=2)$Sw_H2_MinStorHours$(not Sw_PCM)]
     =g=
 
 * [MW] * [MMBtu/MWh] * [metric tons/MMBtu] * [hours] = [metric tons]
-    sum{(i,v)$[h2_combustion(i)$valcap(i,v,r,t)],
+    sum{(i,v)$[h2_gen(i)$valcap(i,v,r,t)],
         CAP(i,v,r,t) * heat_rate(i,v,r,t) * h2_combustion_intensity * Sw_H2_MinStorHours
     }
 ;
diff --git a/reeds/core/setup/d_objective.gms b/reeds/core/setup/d_objective.gms
index 3cb691e69..91f6fc1a1 100644
--- a/reeds/core/setup/d_objective.gms
+++ b/reeds/core/setup/d_objective.gms
@@ -226,7 +226,7 @@ eq_Objfn_op(t)$tmodel(t)..
 * via the capex + opex costs of H2 production and its associated electricity demand.
               + sum{(i,v,r,h)$[valgen(i,v,r,t)$heat_rate(i,v,r,t)
                              $(not gas(i))$(not bio(i))$(not cofire(i))
-                             $((not h2_combustion(i)) or h2_combustion(i)$[(Sw_H2=0) or h_stress(h)])],
+                             $((not h2_gen(i)) or h2_gen(i)$[(Sw_H2=0) or h_stress(h)])],
                    hours(h) * heat_rate(i,v,r,t) * fuel_price(i,r,t) * GEN(i,v,r,h,t) }
 
 * --- startup/ramping costs
diff --git a/reeds/core/solve/6_data_dump.gms b/reeds/core/solve/6_data_dump.gms
index 988ffc118..5f6d32971 100644
--- a/reeds/core/solve/6_data_dump.gms
+++ b/reeds/core/solve/6_data_dump.gms
@@ -156,12 +156,12 @@ fuel_price_filt(i,r)$cap_exist_ir(i,r) = sum{t$tcur(t), fuel_price(i,r,t) } ;
 h2_usage_regional(r,h,t)$tcur(t) =
     hours(h) * ( 
         h2_exogenous_demand_regional(r,'h2',h,t)
-        + sum{(i,v)$[valgen(i,v,r,t)$h2_combustion(i)],
+        + sum{(i,v)$[valgen(i,v,r,t)$h2_gen(i)],
             GEN.l(i,v,r,h,t) * h2_combustion_intensity * heat_rate(i,v,r,t)}
     )
 ;
 
-fuel_price_filt(i,r)$[Sw_H2$h2_combustion(i)$(sum{t$tcur(t),yeart(t) } >= h2_demand_start)$cap_exist_ir(i,r)] = 
+fuel_price_filt(i,r)$[Sw_H2$h2_gen(i)$(sum{t$tcur(t),yeart(t) } >= h2_demand_start)$cap_exist_ir(i,r)] = 
     sum{t$tcur(t),
         (1 / cost_scale) * (1 / pvf_onm(t)) * h2_combustion_intensity * (
             eq_h2_demand.m('h2',t)$[Sw_H2=1]
diff --git a/reeds/core/terminus/report.gms b/reeds/core/terminus/report.gms
index 23d6e7fd2..153876a32 100644
--- a/reeds/core/terminus/report.gms
+++ b/reeds/core/terminus/report.gms
@@ -1358,7 +1358,7 @@ systemcost_techba("op_fuelcosts_objfn",i,r,t)$tmodel_new(t)  =
 *cost of coal and nuclear fuel (except coal used for cofiring)
               + sum{(v,h)$[valgen(i,v,r,t)$heat_rate(i,v,r,t)
                          $(not gas(i))$(not bio(i))$(not cofire(i))
-                         $((not h2_combustion(i)) or h2_combustion(i)$[(Sw_H2=0) or h_stress(h)])],
+                         $((not h2_gen(i)) or h2_gen(i)$[(Sw_H2=0) or h_stress(h)])],
                    hours(h) * heat_rate(i,v,r,t) * fuel_price(i,r,t) * GEN.l(i,v,r,h,t) }
 
 *cofire coal consumption - cofire bio consumption already accounted for in accounting of BIOUSED
@@ -1387,7 +1387,7 @@ systemcost_techba("op_h2_fuel_costs",i,r,t)$tmodel_new(t)  =
                   hours(h) * h2_fuel_cost(i,v,r,t) * PRODUCE.l(p,i,v,r,h,t) }
 ;
 
-systemcost_techba("op_h2combustion_fuel_costs",i,r,t)$[tmodel_new(t)$h2_combustion(i)$Sw_H2]  =
+systemcost_techba("op_h2combustion_fuel_costs",i,r,t)$[tmodel_new(t)$h2_gen(i)$Sw_H2]  =
 * fuel costs for H2-CT/CC techs
               + (1 / cost_scale) * (1 / pvf_onm(t))
 * when using national demand, calculate total annual demand and multiply by national average price
@@ -1986,7 +1986,7 @@ prod_SMR_emit(e,r,t)$tmodel_new(t) =
 
 * calculate exogenous H2 supply and H2-CT/CC consumption
 h2_demand_by_sector("cross-sector",t) = sum{p, h2_exogenous_demand(p,t) } ;
-h2_demand_by_sector("electricity",t) = sum{(i,v,r,h)$[valgen(i,v,r,t)$h2_combustion(i)],
+h2_demand_by_sector("electricity",t) = sum{(i,v,r,h)$[valgen(i,v,r,t)$h2_gen(i)],
         GEN.l(i,v,r,h,t) * hours(h) * h2_combustion_intensity * heat_rate(i,v,r,t) } ;
 
 * Marginal cost of H2 production by timeslice [$/kg]
@@ -2078,7 +2078,7 @@ h2_trans_cap(r,rr,t)$[(ord(r) < ord(rr))$tmodel_new(t)] = sum{tt$[(yeart(tt)<=ye
 h2_usage(r,h,t)$tmodel_new(t) =
     h2_exogenous_demand_regional(r,'h2',h,t)
 * [MW] * [metric tons/MMBtu] * [MMBtu/MWh] = [metric tons/h]
-    + sum{(i,v)$[valgen(i,v,r,t)$h2_combustion(i)],
+    + sum{(i,v)$[valgen(i,v,r,t)$h2_gen(i)],
           GEN.l(i,v,r,h,t) * h2_combustion_intensity * heat_rate(i,v,r,t) } ;
 
 *=========================
diff --git a/reeds/input_processing/outage_rates.py b/reeds/input_processing/outage_rates.py
index 73300cc5d..6d36110a7 100644
--- a/reeds/input_processing/outage_rates.py
+++ b/reeds/input_processing/outage_rates.py
@@ -27,8 +27,8 @@
 max_extrapolated_outage_forced = 0.4
 ## assume temperature-dependent outage rates for ng-fuel-cell to be the same as for combined_cycle plants
 primemover2techgroup = {
-    'combined_cycle': ['GAS_CC', 'FUEL_CELL'],
-    'combustion_turbine': ['GAS_CT', 'H2_COMBUSTION'],
+    'combined_cycle': ['GAS_CC', 'NG_FUEL_CELL'],
+    'combustion_turbine': ['GAS_CT', 'H2_COMBUSTION','H2_FUEL_CELL'],
     'diesel': ['OGS'],
     'hydro_and_psh': ['HYDRO', 'PSH'],
     'nuclear': ['NUCLEAR'],
diff --git a/reeds/input_processing/plantcostprep.py b/reeds/input_processing/plantcostprep.py
index 2956af204..00eaf4fc5 100644
--- a/reeds/input_processing/plantcostprep.py
+++ b/reeds/input_processing/plantcostprep.py
@@ -99,7 +99,7 @@ def deflate_func(data,case):
 ###########################
 
 conv_in = []
-conv_techs = ['gas', 'gas_ccs', 'coal', 'coal_ccs', 'biopower', 'nuclear', 'nuclear_smr','fuelcell', 'other']
+conv_techs = ['gas', 'gas_ccs', 'coal', 'coal_ccs', 'biopower', 'nuclear', 'nuclear_smr','fuelcell','h2fuelcell', 'other']
 for ct in conv_techs:
     print(f"Loading plantchar_{ct}")
     df = pd.read_csv(os.path.join(inputs_case,f'plantchar_{ct}.csv'))
diff --git a/reeds/input_processing/runfiles.csv b/reeds/input_processing/runfiles.csv
index a4e55de5f..a144010ce 100644
--- a/reeds/input_processing/runfiles.csv
+++ b/reeds/input_processing/runfiles.csv
@@ -187,6 +187,7 @@ plantchar_dr_shed_fom.csv,inputs/plant_characteristics/dr_shed_fom_{dr_shedscen}
 plantchar_evmc_shape.csv,inputs/plant_characteristics/evmc_shape_{evmcscen}.csv,1,ignore,ignore,,,,,0,,,,,,used to define plantcharout.csv
 plantchar_evmc_storage.csv,inputs/plant_characteristics/evmc_storage_{evmcscen}.csv,1,ignore,ignore,,,,,0,,,,,,used to define plantcharout.csv
 plantchar_fuelcell.csv,inputs/plant_characteristics/{plantchar_fuelcell}.csv,1,ignore,ignore,,,,,0,,,,,,used to define plantcharout.csv
+plantchar_h2fuelcell.csv,inputs/plant_characteristics/{plantchar_h2fuelcell}.csv,1,ignore,ignore,,,,,0,,,,,,used to define plantcharout.csv
 plantchar_gas_ccs.csv,inputs/plant_characteristics/{plantchar_gas_ccs}.csv,1,ignore,ignore,,,,,0,,,,,,used to define plantcharout.csv
 plantchar_gas.csv,inputs/plant_characteristics/{plantchar_gas}.csv,1,ignore,ignore,,,,,0,,,,,,used to define plantcharout.csv
 plantchar_geo.csv,inputs/plant_characteristics/{plantchar_geo}.csv,int(sw.GSw_Geothermal) != 0,ignore,ignore,,,,,0,,,,,,used to define plantcharout.csv
diff --git a/runreeds.py b/runreeds.py
index 250eea96f..f9cc15f2c 100644
--- a/runreeds.py
+++ b/runreeds.py
@@ -280,7 +280,7 @@ def check_compatibility(sw):
             f"GSw_H2_SMR is set to 0, but GSw_H2_Demand_Case is set to '{sw['GSw_H2_Demand_Case']}', which requires SMR set to 1.\n"
             "When GSw_H2_SMR is 0, GSw_H2_Demand_Case must be one of: 'none', 'Decarb', or 'LTS'."
         )
-
+    
     if ('usa' not in sw['GSw_Region'].lower()) and (int(sw['GSw_GasCurve']) != 2):
         raise ValueError(
             'Should use GSw_GasCurve=2 (fixed prices) when running sub-nationally\n'