diff --git a/.gitignore b/.gitignore
index 3d84ee95..07955cbb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,7 @@
 **/*.gpr
 **/*.dat
 **/*.cmd
+**/data
 **/data/*.inc
 **/model/Balmorel.l*
 **/output/economic/*.*
diff --git a/base/data b/base/data
deleted file mode 160000
index ebe4d2ca..00000000
--- a/base/data
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit ebe4d2ca7a771b8f026ae3d0d3de1eebb7914297
diff --git a/base/output/OUTPUT_SUMMARY.inc b/base/output/OUTPUT_SUMMARY.inc
index bfdaba32..bf7b9bfa 100644
--- a/base/output/OUTPUT_SUMMARY.inc
+++ b/base/output/OUTPUT_SUMMARY.inc
@@ -69,6 +69,7 @@ PARAMETER EMI_YCRAG(Y,C,RRR,AAA,G,FFF,TECH_TYPE,UNITS) "Annual CO2 emissions(kto
 PARAMETER CURT_YCRAGFST(Y,C,RRR,AAA,G,FFF,SSS,TTT,COMMODITY,TECH_TYPE,UNITS) "Hourly energy curtailment per country, region, area, technology, fuel, hour and technology type (MWh)";
 PARAMETER CURT_YCRAGF(Y,C,RRR,AAA,G,FFF,COMMODITY,TECH_TYPE,UNITS) "Hourly energy curtailment per country, region, area, technology, fuel, hour and technology type (MWh)";
 PARAMETER EL_BALANCE_YCRST(Y,C,RRR,EL_BAL_TYPE,SSS,TTT,UNITS) "Hourly electricity balance per country, region, and type (MWh)";
+PARAMETER STORAGE_LEVEL(Y, C, RRR, AAA, G, COMMODITY, TECH_TYPE, SSS, TTT, UNITS) "Hourly storage content (MWh)";
 PARAMETER H_BALANCE_YCRAST(Y,C,RRR,AAA,H_BAL_TYPE,SSS,TTT,UNITS) "Hourly heat balance per country, region, area and type (MWh)";
 $ifi %HYDROGEN%==yes PARAMETER H2_PRICE_YCR(Y,C,RRR,PRICE_CATEGORY,UNITS) "Average Hydrogen Prices for each region (money/MWh)";
 $ifi %HYDROGEN%==yes PARAMETER H2_PRICE_YCRST(Y,C,RRR,SSS,TTT,UNITS) "Hourly hydrogen Prices for each region (money/MWh)";
@@ -229,6 +230,14 @@ $ifi %DECOM%==yes G_STO_YCRAF(Y,C,IR,IA,IGE,FFF,'ELECTRICITY',TECH_TYPE,'DECOMMI
 $ifi %DECOM%==yes -IOF0001*VDECOM_EXO_ACCUM.L(Y,IA,IGE)*(1$(NOT IGHYRS(IGE)) + HYRSMAXVOL_G(IA,IGE)$IGHYRS(IGE))
 ;
 
+** ELECTRICITY STORAGE CONTENTS
+STORAGE_LEVEL(Y, C, IR, IA, IGE, 'ELECTRICITY', 'INTERSEASONAL-ELECT-STORAGE', S, T, 'MWh')$(CCCRRR(C,IR) and RRRAAA(IR,IA) and IAGK_HASORPOT(Y,IA,IGE) AND (IGESTOS(IGE) OR IGHYRS(IGE))) =
+    VESTOVOLT.L(Y, IA, IGE, S, T)
+;
+STORAGE_LEVEL(Y, C, IR, IA, IGE, 'ELECTRICITY', 'INTRASEASONAL-ELECT-STORAGE', S, T, 'MWh')$(CCCRRR(C,IR) and RRRAAA(IR,IA) and IAGK_HASORPOT(Y,IA,IGE) AND IGESTO(IGE)) =
+    VESTOVOLT.L(Y, IA, IGE, S, T)
+;
+
 * ------------- END OF ELECTRICITY CAPACITY --------------
 
 * ------------- HEAT STORAGE --------------
@@ -249,6 +258,14 @@ $ifi %DECOM%==yes G_STO_YCRAF(Y,C,IR,IA,IGH,FFF,'HEAT',TECH_TYPE,'DECOMMISSIONIN
 $ifi %DECOM%==yes -IOF0001*VDECOM_EXO_ACCUM.L(Y,IA,IGH)
 ;
 
+** HEAT STORAGE CONTENTS
+STORAGE_LEVEL(Y, C, IR, IA, IGH, 'HEAT', 'INTERSEASONAL-HEAT-STORAGE', S, T, 'MWh')$(CCCRRR(C,IR) and RRRAAA(IR,IA) and IAGK_HASORPOT(Y,IA,IGH) AND IGHSTOS(IGH)) =
+    VHSTOVOLT.L(Y, IA, IGH, S, T)
+;
+STORAGE_LEVEL(Y, C, IR, IA, IGH, 'HEAT', 'INTRASEASONAL-HEAT-STORAGE', S, T, 'MWh')$(CCCRRR(C,IR) and RRRAAA(IR,IA) and IAGK_HASORPOT(Y,IA,IGH) AND IGHSTO(IGH)) =
+    VHSTOVOLT.L(Y, IA, IGH, S, T)
+;
+
 * ------------- END OF HEAT STORAGE --------------
 
 $ifi not %HYDROGEN%==yes  $goto NO_HYDROGEN_STORAGE
@@ -269,6 +286,12 @@ IOF0001*VGKNACCUMNET.L(Y,IA,IHYDROGEN_GH2STO)
 $ifi %DECOM%==yes G_STO_YCRAF(Y,C,IR,IA,IHYDROGEN_GH2STO,FFF,'HYDROGEN',TECH_TYPE,'DECOMMISSIONING','GWh')$(CCCRRR(C,IR) and RRRAAA(IR,IA) and IAGK_HASORPOT(Y,IA,IHYDROGEN_GH2STO) AND IGF(IHYDROGEN_GH2STO,FFF) AND GTECH_TYPE(IHYDROGEN_GH2STO,TECH_TYPE) AND IGDECOMEXOPOT(Y,IA,IHYDROGEN_GH2STO))=
 $ifi %DECOM%==yes -IOF0001*VDECOM_EXO_ACCUM.L(Y,IA,IHYDROGEN_GH2STO)
 ;
+
+** HYDROGEN STORAGE CONTENTS
+STORAGE_LEVEL(Y, C, IR, IA, IHYDROGEN_GH2STO, 'HYDROGEN', 'H2-STORAGE', S, T, 'MWh')$(CCCRRR(C,IR) and RRRAAA(IR,IA) and IAGK_HASORPOT(Y,IA,IHYDROGEN_GH2STO)) =
+    VHYDROGEN_STOVOL_T.L(Y, IA, IHYDROGEN_GH2STO, S, T)
+;
+
 * ------------- END OF HYDROGEN STORAGE --------------
 $label NO_HYDROGEN_STORAGE
 
@@ -1626,7 +1649,7 @@ H_BALANCE_YCRAST(Y,C,IR,IA,'PRICE',S,T,'Money_per_MWh')$(CCCRRR(C,IR) AND RRRAAA
 
 execute_unload "MainResults.gdx" ECO_G_YCRAG,ECO_X_YCR,OBJ_YCR,EL_PRICE_YCR,EL_PRICE_YCRST,PRO_YCRAGFST,EL_DEMAND_YCRST,EL_DEMAND_YCR,
 H_DEMAND_YCRAST,H_DEMAND_YCRA,PRO_YCRAGF,H_PRICE_YCRAST,H_PRICE_YCRA,G_CAP_YCRAF,G_STO_YCRAF,X_CAP_YCR,X_FLOW_YCRST,X_FLOW_YCR,F_CONS_YCRAST,F_CONS_YCRA,EMI_YCRAG,
-EL_BALANCE_YCRST,CURT_YCRAGFST,CURT_YCRAGF,H_BALANCE_YCRAST
+EL_BALANCE_YCRST,CURT_YCRAGFST,CURT_YCRAGF,H_BALANCE_YCRAST,STORAGE_LEVEL
 
 $ifi %HEATTRANS%==yes ,XH_CAP_YCA,XH_FLOW_YCAST,XH_FLOW_YCA,ECO_XH_YCRA
 $ifi %HYDROGEN%==yes  ,H2_PRICE_YCRST,H2_PRICE_YCR,BIOMETH_PRICE_YST,XH2_CAP_YCR, XH2_FLOW_YCRST,XH2_FLOW_YCR,ECO_XH2_YCR,H2_DEMAND_YCRST,H2_DEMAND_YCR