diff --git a/config.yaml b/config.yaml
index 608ebc99..59fa084b 100644
--- a/config.yaml
+++ b/config.yaml
@@ -2,7 +2,7 @@ logging_level: INFO
 
 results_dir: 'results/'
 summary_dir: results
-run: '190511-h2_network'
+run: '190512-underground_h2'
 
 scenario:
   sectors: [E] # ,E+EV,E+BEV,E+BEV+V2G] # [ E+EV, E+BEV, E+BEV+V2G ]
@@ -85,7 +85,7 @@ sector:
   'co2_vent' : True
   'SMR' : True
   'ccs_fraction' : 0.9
-
+  'hydrogen_underground_storage' : True
 
 
 costs:
diff --git a/data/costs.csv b/data/costs.csv
index 2756f737..c866b09e 100644
--- a/data/costs.csv
+++ b/data/costs.csv
@@ -92,6 +92,8 @@ fuel cell,2030,lifetime,20,years,NREL http://www.nrel.gov/docs/fy09osti/45873.pd
 fuel cell,2030,efficiency,0.58,per unit,NREL http://www.nrel.gov/docs/fy09osti/45873.pdf; budischak2013 conservative 2020
 hydrogen storage,2030,investment,11.2,USD/kWh,budischak2013
 hydrogen storage,2030,lifetime,20,years,budischak2013
+hydrogen underground storage,2030,investment,0.5,EUR/kWh,maximum from https://www.nrel.gov/docs/fy10osti/46719.pdf
+hydrogen underground storage,2030,lifetime,40,years,http://www.acatech.de/fileadmin/user_upload/Baumstruktur_nach_Website/Acatech/root/de/Publikationen/Materialien/ESYS_Technologiesteckbrief_Energiespeicher.pdf
 methanation,2030,investment,1000,EUR/kWH2,Schaber thesis
 methanation,2030,lifetime,25,years,Schaber thesis
 methanation,2030,FOM,3,%/year,Schaber thesis
diff --git a/scripts/prepare_sector_network.py b/scripts/prepare_sector_network.py
index ded0596a..a0186c45 100644
--- a/scripts/prepare_sector_network.py
+++ b/scripts/prepare_sector_network.py
@@ -528,6 +528,12 @@ def add_storage(network):
                  p_nom_extendable=True,
                  carrier="H2 pipeline")
 
+    if options['hydrogen_underground_storage']:
+        h2_capital_cost = costs.at["hydrogen underground storage","fixed"]
+    else:
+        h2_capital_cost = costs.at["hydrogen storage","fixed"]
+
+
     network.madd("Store",
                  ["EU H2 Store"],
                  bus="EU H2",
@@ -536,8 +542,7 @@ def add_storage(network):
                  e_nom_extendable=True,
                  e_cyclic=True,
                  carrier="H2 Store",
-                 capital_cost=costs.at["hydrogen storage","fixed"])
-
+                 capital_cost=h2_capital_cost)
 
 
     network.add("Carrier","battery")
@@ -1186,7 +1191,7 @@ def add_industry(network):
 
     network.add("Bus",
                 "Fischer-Tropsch-demand",
-                carrier="Fischer-Tropsch")
+                carrier="Fischer-Tropsch-demand")
 
     #use madd to get carrier inserted
     network.madd("Store",