diff --git a/AixLib/Fluid/Storage/Examples/StorageBoiler.mo b/AixLib/Fluid/Storage/Examples/StorageBoiler.mo
index 7d7c26acd1..264d6730ad 100644
--- a/AixLib/Fluid/Storage/Examples/StorageBoiler.mo
+++ b/AixLib/Fluid/Storage/Examples/StorageBoiler.mo
@@ -1,7 +1,6 @@
 within AixLib.Fluid.Storage.Examples;
 model StorageBoiler
   extends Modelica.Icons.Example;
-  import AixLib;
 
   replaceable package Medium =
      Modelica.Media.Water.ConstantPropertyLiquidWater
@@ -28,14 +27,11 @@ model StorageBoiler
     hConIn=1500,
     hConOut=15,
     redeclare package Medium = Medium,
-    hConHC1=300)                       annotation (Placement(transformation(extent={{6,-14},
-            {-18,16}})));
-  Modelica.Thermal.HeatTransfer.Sources.FixedTemperature fixedTemperature(T = 283.15) annotation(Placement(transformation(extent={{-56,-10},
-            {-36,10}})));
-  AixLib.Fluid.Sources.Boundary_pT
-                     boundary_p(          redeclare package Medium = Medium,
-      nPorts=1)                 annotation(Placement(transformation(extent={{-48,46},
-            {-28,66}})));
+    hConHC1=300) annotation (Placement(transformation(extent={{6,-14},{-18,16}})));
+  Modelica.Thermal.HeatTransfer.Sources.FixedTemperature fixedTemperature(T = 283.15)
+  annotation(Placement(transformation(extent={{-56,-10},{-36,10}})));
+  AixLib.Fluid.Sources.Boundary_pT boundary_p(redeclare package Medium = Medium,nPorts=1)
+	annotation(Placement(transformation(extent={{-48,46},{-28,66}})));
   Modelica.Blocks.Sources.Constant SetTemp(k=273.15 + 80) annotation (Placement(
         transformation(
         extent={{-7,-7},{7,7}},
@@ -46,23 +42,22 @@ model StorageBoiler
     m_flow_nominal=0.5,
     dp_nominal=200)
     annotation (Placement(transformation(extent={{18,-34},{38,-14}})));
-  AixLib.Fluid.FixedResistances.HydraulicResistance
-                                           hydraulicResistance(zeta = 1000,
+  AixLib.Fluid.FixedResistances.HydraulicResistance hydraulicResistance(zeta = 1000,
     redeclare package Medium = Medium,
     diameter=0.05,
-    m_flow_nominal=0.001)                                                   annotation(Placement(transformation(extent={{46,-34},
+    m_flow_nominal=0.001) annotation(Placement(transformation(extent={{46,-34},
             {66,-14}})));
-  AixLib.Fluid.Sources.Boundary_ph
-                      boundary_ph1(use_p_in = true, h = 0.8e5,
+  AixLib.Fluid.Sources.Boundary_ph boundary_ph1(use_p_in = true,
+	h = 0.8e5,
     nPorts=1,
-    redeclare package Medium = Medium)                         annotation(Placement(transformation(extent={{-66,-44},
-            {-46,-24}})));
-  Modelica.Blocks.Sources.Ramp ramp(duration = 1000,               height = 0.00001e5,
-    offset=101325)                                                                     annotation(Placement(transformation(extent={{-96,-36},
-            {-76,-16}})));
-  AixLib.Fluid.Sources.Boundary_pT
-                      boundary_ph2(nPorts=1, redeclare package Medium = Medium)
-                                                     annotation(Placement(transformation(extent = {{10, -10}, {-10, 10}}, rotation = 180, origin={-38,34})));
+    redeclare package Medium = Medium)
+	annotation(Placement(transformation(extent={{-66,-44},{-46,-24}})));
+  Modelica.Blocks.Sources.Ramp ramp(duration = 1000,
+	height = 0.00001e5,
+    offset=101325) annotation(Placement(transformation(extent={{-96,-36},{-76,-16}})));
+  AixLib.Fluid.Sources.Boundary_pT boundary_ph2(nPorts=1,
+					  redeclare package Medium = Medium)
+					  annotation(Placement(transformation(extent = {{10, -10}, {-10, 10}}, rotation = 180, origin={-38,34})));
   AixLib.Fluid.FixedResistances.PressureDrop pipe1(
     redeclare package Medium = Medium,
     m_flow_nominal=0.5,
@@ -79,10 +74,7 @@ model StorageBoiler
       m_flow_nominal=pipe1.m_flow_nominal,
     per(pressure(V_flow={0,pipe.m_flow_nominal/1000,pipe.m_flow_nominal/(1000*
             0.8)}, dp={dpSet.k/0.8,dpSet.k,0}), motorCooledByFluid=false))
-                                           annotation (Placement(transformation(
-        extent={{10,10},{-10,-10}},
-        rotation=90,
-        origin={2,42})));
+		annotation (Placement(transformation(extent={{10,10},{-10,-10}},rotation=90,origin={2,42})));
   Modelica.Blocks.Sources.Constant dpSet(k=40000)
     "Constant set pressure difference for pump" annotation (Placement(
         transformation(
@@ -91,8 +83,8 @@ model StorageBoiler
         origin={37,27})));
 equation
   connect(pipe.port_b, hydraulicResistance.port_a) annotation(Line(points={{38,-24},
-          {46,-24}},                                                                           color = {0, 127, 255}));
-  connect(ramp.y, boundary_ph1.p_in) annotation(Line(points={{-75,-26},{-68,-26}},      color = {0, 0, 127}));
+          {46,-24}},color = {0, 127, 255}));
+  connect(ramp.y, boundary_ph1.p_in) annotation(Line(points={{-75,-26},{-68,-26}},color = {0, 0, 127}));
   connect(boundary_ph1.ports[1], pipe1.port_a) annotation (Line(
       points={{-46,-34},{-36,-34}},
       color={0,127,255}));
@@ -119,13 +111,19 @@ equation
           28},{24,28},{24,42},{14,42}}, color={0,0,127}));
   annotation (experiment(Tolerance=1e-6, StopTime=86400, Interval=60),
    __Dymola_Commands(file="modelica://AixLib/Resources/Scripts/Dymola/Fluid/Storage/Examples/StorageBoiler.mos" "Simulate and plot"),
-    Documentation(info = "<html><h4>
-  <span style=\"color:#008000\">Overview</span>
-</h4>
+    Documentation(
+    info="<html>
 <p>
-  This is a simple example of a storage and a boiler.
+  This is a simple example of a storage and an ideal heater.<br/>
+  The ideal heater has a constant supply temperature and supplies heat
+  to a thermal energy water storage.<br/>
+  The pressure boundary is an idealized consumer with a pressure ramp.
 </p>
 <ul>
+  <li>
+    <i>November 14, 2022</i> by Laura Maier:<br/>
+    Added simulate and plot scripts, add docu and adapt parameters.
+  </li>
   <li>
     <i>December 08, 2016&#160;</i> by Moritz Lauster:<br/>
     Adapted to AixLib conventions
diff --git a/AixLib/Fluid/Storage/Examples/StorageDetailedExample.mo b/AixLib/Fluid/Storage/Examples/StorageDetailedExample.mo
index e7f9962d81..430be90748 100644
--- a/AixLib/Fluid/Storage/Examples/StorageDetailedExample.mo
+++ b/AixLib/Fluid/Storage/Examples/StorageDetailedExample.mo
@@ -2,7 +2,6 @@ within AixLib.Fluid.Storage.Examples;
 model StorageDetailedExample "Simple usage example for StorageDetailed"
 
   extends Modelica.Icons.Example;
-  import AixLib;
   replaceable package Medium =
      Modelica.Media.Water.ConstantPropertyLiquidWater
      constrainedby Modelica.Media.Interfaces.PartialMedium;
@@ -38,8 +37,8 @@ model StorageDetailedExample "Simple usage example for StorageDetailed"
         rotation=180,
         origin={22,46})));
   AixLib.Fluid.Sources.Boundary_pT
-                      boundary_ph5(          redeclare package Medium = Medium,
-      nPorts=1)                                      annotation(Placement(transformation(extent = {{10, -10}, {-10, 10}}, rotation=0,     origin={12,-20})));
+                      boundary_ph5(redeclare package Medium = Medium,
+      nPorts=1) annotation(Placement(transformation(extent = {{10, -10}, {-10, 10}}, rotation=0,     origin={12,-20})));
   AixLib.Fluid.Sources.MassFlowSource_T boundary1(
     m_flow=0,
     redeclare package Medium = Medium,
@@ -71,12 +70,12 @@ model StorageDetailedExample "Simple usage example for StorageDetailed"
         origin={14,20})));
   AixLib.Fluid.Sources.Boundary_pT
                       boundary_ph1(redeclare package Medium = Medium, nPorts=1)
-                                                     annotation(Placement(transformation(extent={{5,-5},{-5,5}},          rotation=0,     origin={13,7})));
+    annotation(Placement(transformation(extent={{5,-5},{-5,5}},rotation=0,origin={13,7})));
 equation
   connect(boundary.m_flow_in, const.y)
     annotation (Line(points={{34,38},{34,38},{51,38}}, color={0,0,127}));
   connect(boundary1.ports[1], bufferStorage.fluidportTop2) annotation (Line(points={{-34,46},
-          {-14,46},{-14,24.12},{-13.125,24.12}},                                                                                    color={0,127,255}));
+          {-14,46},{-14,24.12},{-13.125,24.12}},color={0,127,255}));
   connect(bufferStorage.fluidportTop1, boundary.ports[1]) annotation (Line(points={{-6.5,24.12},{-6.5,45.06},{12,45.06},{12,46}}, color={0,127,255}));
   connect(bufferStorage.fluidportBottom1, boundary_ph5.ports[1]) annotation (Line(points={{-6.625,-0.24},{-6.625,-20.12},{2,-20.12},{2,-20}}, color={0,127,255}));
   connect(boundary2.ports[1], bufferStorage.fluidportBottom2) annotation (Line(points={{-36,-20},{-14,-20},{-14,-0.12},{-12.875,-0.12}}, color={0,127,255}));
@@ -96,6 +95,10 @@ equation
   mass flow with a higher temperature than the initial temperature.
 </p>
 <ul>
+  <li>November 14, 2022, by Laura Maier:<br/>
+    <a href=\"https://github.com/RWTH-EBC/AixLib/issues/1223\">#1223</a>:
+    Parameter tuning and refactoring.
+  </li>
   <li>November 27, 2019, by Philipp Mehrfeld:<br/>
     <a href=\"https://github.com/RWTH-EBC/AixLib/issues/793\">#793</a>:
     Add one heating coil to example.
diff --git a/AixLib/Fluid/Storage/Examples/StorageSimpleExample.mo b/AixLib/Fluid/Storage/Examples/StorageSimpleExample.mo
new file mode 100644
index 0000000000..06091af0e3
--- /dev/null
+++ b/AixLib/Fluid/Storage/Examples/StorageSimpleExample.mo
@@ -0,0 +1,288 @@
+within AixLib.Fluid.Storage.Examples;
+model StorageSimpleExample "Example model with simple storage"
+  extends Modelica.Icons.Example;
+  StorageSimple storageSimple(
+    redeclare package Medium = Medium,
+    use_TOut=true,
+    n=3,
+    d=0.7,
+    h=0.78,
+    lambda_ins=0.032,
+    s_ins=0.01,
+    hConIn=1500,
+    hConOut=15,
+    V_HE=0.04,
+    k_HE=1500,
+    A_HE=10,
+    m_flow_nominal_layer=m_flow_nominal_gen,
+    m_flow_nominal_HE=m_flow_nominal_gen,
+    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
+    T_start=fill(308.15, 3))
+    "300 l storage"
+    annotation (Placement(transformation(extent={{22,-22},{-20,22}})));
+  HeatExchangers.HeatingRod heatingRod(
+    redeclare package Medium = Medium,
+    m_flow_nominal=m_flow_nominal_gen,
+    dp_nominal=dp_nominal_hr,
+    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
+    Q_flow_nominal=8000,
+    V=0.01,
+    eta=0.98,
+    use_countNumSwi=false)
+              annotation (Placement(transformation(extent={{-70,12},{-50,32}})));
+  replaceable package Medium = AixLib.Media.Water
+    annotation (choicesAllMatching=true);
+  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal_gen=
+  heatingRod.Q_flow_nominal/(dT_gen*Medium.cp_const)
+  "Nominal mass flow rate in generation cycle";
+
+  parameter Modelica.Units.SI.PressureDifference dp_nominal_hr = 1000
+    "Pressure difference in heating rod";
+
+  parameter Modelica.Units.SI.TemperatureDifference dT_gen = 8
+  "Temperature difference in generation cycle";
+
+  parameter Real bandwidth=5 "Bandwidth around reference signal";
+
+  AixLib.Systems.HydraulicModules.SimpleConsumer simpleConsumer(
+    redeclare package Medium = Medium,
+    kA=heatingRod.Q_flow_nominal/dT_gen,
+    V=0.2,
+    m_flow_nominal=m_flow_nominal_gen,
+    functionality="Q_flow_input") annotation (Placement(transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=-90,
+        origin={62,4})));
+  AixLib.Fluid.Sources.Boundary_pT pressureBoundary(
+    redeclare package Medium = Medium,
+    p=200000,
+    nPorts=1)
+    annotation (Placement(transformation(extent={{-24,-52},{-38,-38}})));
+  AixLib.Fluid.Movers.SpeedControlled_y pumpGen(redeclare package Medium = Medium,
+    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
+      redeclare
+      AixLib.Fluid.Movers.Data.Pumps.Wilo.CronolineIL80slash220dash4slash4 per)
+    annotation (Placement(transformation(extent={{-48,-20},{-68,-40}})));
+  AixLib.Fluid.Movers.SpeedControlled_y pumpCon(redeclare package Medium = Medium,
+    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
+      redeclare
+      AixLib.Fluid.Movers.Data.Pumps.Wilo.CronolineIL80slash220dash4slash4 per)
+    "Consumer pump"
+    annotation (Placement(transformation(extent={{44,-20},{24,-40}})));
+  AixLib.Fluid.Sources.Boundary_pT pressureBoundary1(
+    redeclare package Medium = Medium,
+    p=200000,
+    nPorts=1) annotation (Placement(transformation(extent={{70,-52},{56,-38}})));
+  Modelica.Blocks.Logical.OnOffController storageHysteresis(bandwidth=bandwidth,
+      pre_y_start=true)
+    annotation (Placement(transformation(extent={{-72,54},{-60,66}})));
+  AixLib.Controls.Continuous.LimPID PIDHR(
+    controllerType=Modelica.Blocks.Types.SimpleController.PI,
+    Ti=10,
+    yMax=1,
+    yMin=0,
+    initType=Modelica.Blocks.Types.Init.InitialOutput,
+    xi_start=1) "PID controller for heating rod"
+    annotation (Placement(transformation(extent={{-54,78},{-38,94}})));
+  Modelica.Blocks.Logical.Switch HROffOrPI
+    annotation (Placement(transformation(extent={{-22,62},{-12,72}})));
+  Modelica.Blocks.Sources.Constant TUpperHysteresis(k=273.15 + 40)
+    annotation (Placement(transformation(extent={{-98,60},{-84,74}})));
+  Modelica.Blocks.Interfaces.RealOutput PelHR
+    "Electrical power used to provide current heat flow"
+    annotation (Placement(transformation(extent={{76,46},{96,66}})));
+  Modelica.Blocks.Sources.Cosine dailyHeatDemand(
+    amplitude=-2000,
+    f=1/86400,
+    phase=3.1415926535898,
+    offset=-4000)
+                 annotation (Placement(transformation(extent={{96,10},{82,24}})));
+  Modelica.Blocks.Sources.Constant Off(k=0)
+    annotation (Placement(transformation(extent={{-44,52},{-36,60}})));
+  Modelica.Thermal.HeatTransfer.Celsius.FixedTemperature fixedTemperature(T=18)
+    annotation (Placement(transformation(extent={{40,-6},{28,6}})));
+  Modelica.Blocks.Logical.LessThreshold    greaterZero
+    annotation (Placement(transformation(extent={{18,-88},{30,-76}})));
+  AixLib.Fluid.Sensors.MassFlowRate senMasFlo_gen(redeclare package Medium = Medium)
+    "Mass flow rate sensor at generation side" annotation (Placement(
+        transformation(
+        extent={{-7,-7},{7,7}},
+        rotation=90,
+        origin={-87,-17})));
+  Controls.Continuous.LimPID PIDPumpGen(
+    controllerType=Modelica.Blocks.Types.SimpleController.PI,
+    k=0.5,
+    Ti=10,
+    yMax=1,
+    yMin=0,
+    initType=Modelica.Blocks.Types.Init.InitialOutput,
+    xi_start=1) "PID controller for generation system pump"
+    annotation (Placement(transformation(extent={{-68,-86},{-56,-74}})));
+  AixLib.Fluid.Sensors.MassFlowRate senMasFlo_con(redeclare package Medium = Medium)
+    "Mass fow rate sensor at consumer side" annotation (Placement(
+        transformation(
+        extent={{-7,-7},{7,7}},
+        rotation=0,
+        origin={47,37})));
+  Modelica.Blocks.Sources.Constant m_flow_set(k=m_flow_nominal_gen)
+    "Set mass flow rate"
+    annotation (Placement(transformation(extent={{-96,-88},{-82,-74}})));
+  Controls.Continuous.LimPID PIDPumpCon(
+    controllerType=Modelica.Blocks.Types.SimpleController.PI,
+    yMax=1,
+    yMin=0,
+    initType=Modelica.Blocks.Types.Init.InitialOutput,
+    xi_start=1) "PID controller for consumer pump"
+    annotation (Placement(transformation(extent={{44,-64},{56,-76}})));
+  Modelica.Blocks.Logical.Switch PumpOnOffCon
+    annotation (Placement(transformation(extent={{70,-90},{84,-76}})));
+  Modelica.Blocks.Sources.Constant Offpump(k=0)
+    annotation (Placement(transformation(extent={{48,-94},{56,-86}})));
+  Modelica.Blocks.Logical.Switch PumpOnOffGen
+    annotation (Placement(transformation(extent={{-28,-90},{-14,-76}})));
+  Modelica.Blocks.Math.Add add
+    annotation (Placement(transformation(extent={{-72,80},{-62,90}})));
+  Modelica.Blocks.Sources.Constant addToSetTemp(k=bandwidth/2)
+    annotation (Placement(transformation(extent={{-96,82},{-88,90}})));
+
+  FixedResistances.PressureDrop res(
+    redeclare package Medium = Medium,
+    m_flow_nominal=m_flow_nominal_gen,
+    dp_nominal=20000) annotation (Placement(transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=90,
+        origin={-88,6})));
+  FixedResistances.PressureDrop res1(
+    redeclare package Medium = Medium,
+    m_flow_nominal=m_flow_nominal_gen,
+    dp_nominal=20000) annotation (Placement(transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=0,
+        origin={22,36})));
+equation
+  connect(heatingRod.port_b, storageSimple.port_a_heatGenerator) annotation (
+      Line(points={{-50,22},{-30,22},{-30,19.36},{-16.64,19.36}}, color={0,127,255}));
+  connect(pumpGen.port_a, storageSimple.port_b_heatGenerator) annotation (Line(
+        points={{-48,-30},{-26,-30},{-26,-17.6},{-16.64,-17.6}}, color={0,127,255}));
+  connect(pressureBoundary.ports[1], pumpGen.port_a) annotation (Line(points={{-38,
+          -45},{-42,-45},{-42,-30},{-48,-30}}, color={0,127,255}));
+  connect(pumpCon.port_b, storageSimple.port_a_consumer)
+    annotation (Line(points={{24,-30},{1,-30},{1,-22}}, color={0,127,255}));
+  connect(pressureBoundary1.ports[1], pumpCon.port_a)
+    annotation (Line(points={{56,-45},{56,-30},{44,-30}}, color={0,127,255}));
+  connect(simpleConsumer.port_b, pumpCon.port_a)
+    annotation (Line(points={{62,-6},{62,-30},{44,-30}}, color={0,127,255}));
+  connect(storageHysteresis.y, HROffOrPI.u2) annotation (Line(points={{-59.4,60},
+          {-59.4,67},{-23,67}}, color={255,0,255}));
+  connect(HROffOrPI.y, heatingRod.u) annotation (Line(points={{-11.5,67},{-8,67},
+          {-8,38},{-84,38},{-84,28},{-72,28}}, color={0,0,127}));
+  connect(PIDHR.y, HROffOrPI.u1) annotation (Line(points={{-37.2,86},{-32,86},{
+          -32,71},{-23,71}}, color={0,0,127}));
+  connect(TUpperHysteresis.y, storageHysteresis.reference) annotation (Line(
+        points={{-83.3,67},{-83.3,64},{-74,64},{-74,63.6},{-73.2,63.6}},
+                                                                color={0,0,127}));
+  connect(heatingRod.Pel, PelHR) annotation (Line(points={{-49,28},{-2,28},{-2,56},
+          {86,56}}, color={0,0,127}));
+  connect(dailyHeatDemand.y, simpleConsumer.Q_flow) annotation (Line(points={{81.3,17},
+          {75.65,17},{75.65,10},{72,10}},   color={0,0,127}));
+  connect(Off.y, HROffOrPI.u3) annotation (Line(points={{-35.6,56},{-35.6,63},{-23,
+          63}}, color={0,0,127}));
+  connect(fixedTemperature.port, storageSimple.heatPort)
+    annotation (Line(points={{28,0},{17.8,0}}, color={191,0,0}));
+  connect(dailyHeatDemand.y, greaterZero.u) annotation (Line(points={{81.3,17},{
+          68,17},{68,34},{100,34},{100,-100},{12,-100},{12,-82},{16.8,-82}},
+        color={0,0,127}));
+  connect(pumpGen.port_b, senMasFlo_gen.port_a) annotation (Line(points={{-68,-30},
+          {-87,-30},{-87,-24}}, color={0,127,255}));
+  connect(senMasFlo_con.port_b, simpleConsumer.port_a)
+    annotation (Line(points={{54,37},{62,37},{62,14}}, color={0,127,255}));
+  connect(m_flow_set.y, PIDPumpGen.u_s) annotation (Line(points={{-81.3,-81},{-76,
+          -81},{-76,-80},{-69.2,-80}}, color={0,0,127}));
+  connect(senMasFlo_gen.m_flow, PIDPumpGen.u_m) annotation (Line(points={{-94.7,
+          -17},{-100,-17},{-100,-100},{-62,-100},{-62,-87.2}}, color={0,0,127}));
+  connect(m_flow_set.y, PIDPumpCon.u_s) annotation (Line(points={{-81.3,-81},{-40,
+          -81},{-40,-66},{2,-66},{2,-70},{42.8,-70}}, color={0,0,127}));
+  connect(PIDPumpCon.y, PumpOnOffCon.u1) annotation (Line(points={{56.6,-70},{
+          60,-70},{60,-77.4},{68.6,-77.4}}, color={0,0,127}));
+  connect(greaterZero.y, PumpOnOffCon.u2) annotation (Line(points={{30.6,-82},{68.6,
+          -82},{68.6,-83}}, color={255,0,255}));
+  connect(Offpump.y, PumpOnOffCon.u3) annotation (Line(points={{56.4,-90},{62,-90},
+          {62,-88.6},{68.6,-88.6}}, color={0,0,127}));
+  connect(PumpOnOffCon.y, pumpCon.y) annotation (Line(points={{84.7,-83},{90,-83},
+          {90,-60},{34,-60},{34,-42}}, color={0,0,127}));
+  connect(senMasFlo_con.m_flow, PIDPumpCon.u_m) annotation (Line(points={{47,
+          44.7},{47,40},{100,40},{100,-60},{50,-60},{50,-62.8}}, color={0,0,127}));
+  connect(PIDPumpGen.y, PumpOnOffGen.u1) annotation (Line(points={{-55.4,-80},{
+          -52,-80},{-52,-72},{-38,-72},{-38,-76},{-29.4,-76},{-29.4,-77.4}},
+        color={0,0,127}));
+  connect(storageHysteresis.y, PumpOnOffGen.u2) annotation (Line(points={{-59.4,
+          60},{-58,60},{-58,50},{-100,50},{-100,-100},{-40,-100},{-40,-83},{-29.4,
+          -83}}, color={255,0,255}));
+  connect(PumpOnOffGen.y, pumpGen.y) annotation (Line(points={{-13.3,-83},{-8,-83},
+          {-8,-60},{-58,-60},{-58,-42}}, color={0,0,127}));
+  connect(Offpump.y, PumpOnOffGen.u3) annotation (Line(points={{56.4,-90},{60,-90},
+          {60,-100},{-44,-100},{-44,-88.6},{-29.4,-88.6}}, color={0,0,127}));
+  connect(add.y, PIDHR.u_s) annotation (Line(points={{-61.5,85},{-61.5,86},{-55.6,
+          86}}, color={0,0,127}));
+  connect(TUpperHysteresis.y, add.u2) annotation (Line(points={{-83.3,67},{-82,67},
+          {-82,82},{-73,82}}, color={0,0,127}));
+  connect(addToSetTemp.y, add.u1) annotation (Line(points={{-87.6,86},{-87.6,88},
+          {-73,88}}, color={0,0,127}));
+  connect(senMasFlo_gen.port_b, res.port_a) annotation (Line(points={{-87,-10},
+          {-87,-7},{-88,-7},{-88,-4}}, color={0,127,255}));
+  connect(res.port_b, heatingRod.port_a)
+    annotation (Line(points={{-88,16},{-88,22},{-70,22}}, color={0,127,255}));
+  connect(storageSimple.port_b_consumer, res1.port_a) annotation (Line(points={
+          {1,22},{2,22},{2,36},{12,36}}, color={0,127,255}));
+  connect(res1.port_b, senMasFlo_con.port_a) annotation (Line(points={{32,36},{
+          36,36},{36,37},{40,37}}, color={0,127,255}));
+  connect(storageSimple.TLayer[3], PIDHR.u_m) annotation (Line(points={{19.165,
+          7.04},{26,7.04},{26,42},{-46,42},{-46,76.4}}, color={0,0,127}));
+  connect(storageSimple.TLayer[3], storageHysteresis.u) annotation (Line(points
+        ={{19.165,7.04},{24,7.04},{24,40},{-74,40},{-74,50},{-73.2,50},{-73.2,
+          56.4}}, color={0,0,127}));
+  annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram(
+        coordinateSystem(preserveAspectRatio=false), graphics={
+        Rectangle(
+          extent={{-100,-60},{100,-100}},
+          fillColor={215,215,215},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None),
+        Text(
+          extent={{-98,-60},{-68,-66}},
+          textString="Pump control",
+          textColor={0,0,0}),
+        Rectangle(
+          extent={{-100,100},{0,52}},
+          fillColor={170,255,255},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None,
+          lineColor={0,0,0}),
+        Text(
+          extent={{-96,98},{-66,92}},
+          textColor={0,0,0},
+          textString="HR control")}),
+    experiment(
+      StopTime=38200,
+      Interval=900,
+      Tolerance=1e-06,
+      __Dymola_Algorithm="Dassl"),
+          __Dymola_Commands(file="modelica://AixLib/Resources/Scripts/Dymola/Fluid/Storage/Examples/StorageSimpleExample.mos" "Simulate and plot"),
+    Documentation(info="<html><p>
+  This is an example of the simple storage model with two hydronic
+  circuits.<br/>
+  A heating rod indirectly supplies heat to the thermal energy
+  storage.<br/>
+  A simplified consumer extracts heat from the consumer water
+  circuit<br/>
+  based on a daily load profile.
+</p>
+</html>",revisions="<html>
+<ul>
+  <li>
+    <i>November 14 2022</i> by Laura Maier:<br/>
+    First implementation
+  </li>
+</ul>
+</html>"));
+end StorageSimpleExample;
diff --git a/AixLib/Fluid/Storage/Examples/StorageSolarCollector.mo b/AixLib/Fluid/Storage/Examples/StorageSolarCollector.mo
index b4cd8d2ac3..7da7c25c65 100644
--- a/AixLib/Fluid/Storage/Examples/StorageSolarCollector.mo
+++ b/AixLib/Fluid/Storage/Examples/StorageSolarCollector.mo
@@ -1,7 +1,6 @@
 within AixLib.Fluid.Storage.Examples;
 model StorageSolarCollector
   extends Modelica.Icons.Example;
-  import AixLib;
 
   replaceable package Medium = AixLib.Media.Water;
 
@@ -20,30 +19,29 @@ model StorageSolarCollector
     hConIn=1500,
     hConOut=15,
     redeclare package Medium = Medium,
-    hConHC1=1500)                      annotation (Placement(transformation(extent={{-10,14},
-            {-30,34}})));
-  Modelica.Thermal.HeatTransfer.Sources.FixedTemperature fixedTemperature(T = 283.15) annotation(Placement(transformation(extent={{-60,14},
+    hConHC1=1500)
+		annotation (Placement(transformation(extent={{-10,14},{-30,34}})));
+  Modelica.Thermal.HeatTransfer.Sources.FixedTemperature fixedTemperature(T = 283.15)
+	annotation(Placement(transformation(extent={{-60,14},
             {-40,34}})));
-  AixLib.Fluid.Sources.Boundary_pT
-                     boundary_p(          redeclare package Medium = Medium,
-      nPorts=1)                 annotation(Placement(transformation(extent={{86,74},
+  AixLib.Fluid.Sources.Boundary_pT boundary_p(redeclare package Medium = Medium,nPorts=1)
+	annotation(Placement(transformation(extent={{86,74},
             {66,94}})));
   AixLib.Fluid.FixedResistances.PressureDrop
                    res1(
     redeclare package Medium = Medium,
     m_flow_nominal=solarThermal.m_flow_nominal,
-    dp_nominal=2000)                     annotation(Placement(transformation(extent={{-6,-10},
-            {14,10}})));
-  AixLib.Fluid.Sources.Boundary_pT
-                      boundary_ph2(nPorts=1, redeclare package Medium = Medium)
-                                                     annotation(Placement(transformation(extent = {{10, -10}, {-10, 10}}, rotation = 180, origin={-76,52})));
+    dp_nominal=2000)
+	annotation(Placement(transformation(extent={{-6,-10},{14,10}})));
+  AixLib.Fluid.Sources.Boundary_pT boundary_ph2(nPorts=1, redeclare package Medium = Medium)
+	annotation(Placement(transformation(extent = {{10, -10}, {-10, 10}}, rotation = 180, origin={-76,52})));
   AixLib.Fluid.FixedResistances.PressureDrop
                    res(
     redeclare package Medium = Medium,
     allowFlowReversal=true,
     m_flow_nominal=solarThermal.m_flow_nominal,
-    dp_nominal=2000)                      annotation(Placement(transformation(extent={{-40,-26},
-            {-20,-6}})));
+    dp_nominal=2000)
+	annotation(Placement(transformation(extent={{-40,-26},{-20,-6}})));
   AixLib.Fluid.Solar.Thermal.SolarThermal solarThermal(
     vol(T(start=298.15, fixed=true)),
     Collector=AixLib.DataBase.SolarThermal.FlatCollector(),
@@ -55,8 +53,8 @@ model StorageSolarCollector
   Modelica.Blocks.Sources.Pulse pulse(period = 3600,
     width=10,
     amplitude=0.05,
-    offset=0)                                                                                 annotation(Placement(transformation(extent={{-96,-14},
-            {-76,6}})));
+    offset=0)
+	annotation(Placement(transformation(extent={{-96,-14},{-76,6}})));
   AixLib.Fluid.Actuators.Valves.TwoWayEqualPercentage valve(
     redeclare package Medium = Medium,
     m_flow_nominal=solarThermal.m_flow_nominal,
@@ -64,18 +62,20 @@ model StorageSolarCollector
         extent={{-10,9},{10,-9}},
         rotation=90,
         origin={69,42})));
-  AixLib.Fluid.Sensors.TemperatureTwoPort
-                            temperatureSensor(redeclare package Medium = Medium,
-      m_flow_nominal=0.01)                    annotation(Placement(transformation(extent={{48,-10},
-            {68,10}})));
+  AixLib.Fluid.Sensors.TemperatureTwoPort temperatureSensor(redeclare package Medium = Medium,
+      m_flow_nominal=0.01)
+	  annotation(Placement(transformation(extent={{48,-10},{68,10}})));
   Modelica.Blocks.Continuous.LimPID PI(controllerType = Modelica.Blocks.Types.SimpleController.PI,
     k=0.005,
-    Ti=60,                                                                                                            yMax = 0.999, yMin = 0) annotation(Placement(transformation(extent = {{-6, 6}, {6, -6}}, rotation = 90, origin={90,14})));
-  Modelica.Blocks.Sources.Constant const(k = 273.15 + 70) annotation(Placement(transformation(extent={{74,-10},
-            {80,-4}})));
-  Modelica.Blocks.Math.Add add(k2 = -1) annotation(Placement(transformation(extent = {{-4, -4}, {4, 4}}, rotation = 90, origin={88,30})));
-  Modelica.Blocks.Sources.Constant const1(k = 1) annotation(Placement(transformation(extent={{70,20},
-            {78,28}})));
+    Ti=60,
+	yMax = 0.999,
+	yMin = 0) annotation(Placement(transformation(extent = {{-6, 6}, {6, -6}}, rotation = 90, origin={90,14})));
+  Modelica.Blocks.Sources.Constant const(k = 273.15 + 70)
+	annotation(Placement(transformation(extent={{74,-10},{80,-4}})));
+  Modelica.Blocks.Math.Add add(k2 = -1)
+	annotation(Placement(transformation(extent = {{-4, -4}, {4, 4}}, rotation = 90, origin={88,30})));
+  Modelica.Blocks.Sources.Constant const1(k = 1)
+	annotation(Placement(transformation(extent={{70,20},{78,28}})));
   Modelica.Blocks.Sources.CombiTimeTable hotSummerDay(
     extrapolation=Modelica.Blocks.Types.Extrapolation.Periodic,
     table=[0,21,0; 3600,20.6,0; 7200,20.5,0; 10800,20.4,0; 14400,20,6; 18000,20.5,
@@ -102,17 +102,17 @@ model StorageSolarCollector
     annotation (Placement(transformation(extent={{-68,-26},{-48,-6}})));
 equation
   connect(hotSummerDay.y[2], solarThermal.Irradiation) annotation(Line(points={{31,42},
-          {31,10},{34,10}},                                                                                           color = {0, 0, 127}));
+          {31,10},{34,10}},color = {0, 0, 127}));
   connect(hotSummerDay.y[1], solarThermal.T_air) annotation(Line(points={{31,42},
-          {31,22},{28,22},{28,10}},                                                                 color = {0, 0, 127}));
+          {31,22},{28,22},{28,10}},color = {0, 0, 127}));
   connect(solarThermal.port_b, temperatureSensor.port_a) annotation(Line(points={{44,0},{
-          48,0}},                                                                                     color = {0, 127, 255}));
+          48,0}},color = {0, 127, 255}));
   connect(solarThermal.port_a,res1. port_b) annotation(Line(points={{24,0},{14,
-          0}},                                                                            color = {0, 127, 255}));
+          0}},color = {0, 127, 255}));
   connect(temperatureSensor.port_b, valve.port_a)
     annotation (Line(points={{68,0},{68,32},{69,32}}, color={0,127,255}));
-  connect(const.y, PI.u_s) annotation(Line(points={{80.3,-7},{90,-7},{90,6.8}},          color = {0, 0, 127}));
-  connect(PI.y, add.u2) annotation(Line(points={{90,20.6},{90,25.2},{90.4,25.2}},           color = {0, 0, 127}));
+  connect(const.y, PI.u_s) annotation(Line(points={{80.3,-7},{90,-7},{90,6.8}},color = {0, 0, 127}));
+  connect(PI.y, add.u2) annotation(Line(points={{90,20.6},{90,25.2},{90.4,25.2}},color = {0, 0, 127}));
   connect(temperatureSensor.T, PI.u_m) annotation (Line(
       points={{58,11},{58,14},{82.8,14}},
       color={0,0,127}));
@@ -144,13 +144,16 @@ equation
           -4},{-72,-8},{-70,-8}}, color={0,0,127}));
   annotation (experiment(Tolerance=1e-6, StopTime = 172800, Interval = 60),
   __Dymola_Commands(file="modelica://AixLib/Resources/Scripts/Dymola/Fluid/Storage/Examples/StorageSolarCollector.mos" "Simulate and plot"),
-  Documentation(info = "<html><h4>
-  <span style=\"color:#008000\">Overview</span>
-</h4>
+  Documentation(info = "<html>
 <p>
   This is a simple example of a storage and a solar collector.
 </p>
 <ul>
+  <li>
+    <i>November 17, 2022</i> by Laura Maier:<br/>
+    Replace pump, polish example to make it more realistic, and add
+    simulate and plot script.
+  </li>
   <li>
     <i>October 11, 2016</i> by Marcus Fuchs:<br/>
     Replace pipe
diff --git a/AixLib/Fluid/Storage/Examples/package.order b/AixLib/Fluid/Storage/Examples/package.order
index bbe4b95681..fe5f06d624 100644
--- a/AixLib/Fluid/Storage/Examples/package.order
+++ b/AixLib/Fluid/Storage/Examples/package.order
@@ -1,6 +1,7 @@
 ExpansionVessel
 StorageBoiler
 StorageDetailedExample
+StorageSimpleExample
 StorageSolarCollector
 Stratified
 StratifiedEnhancedInternalHex
diff --git a/AixLib/Fluid/Storage/StorageDetailed.mo b/AixLib/Fluid/Storage/StorageDetailed.mo
index 8bd7a0dfa6..7762529b6e 100644
--- a/AixLib/Fluid/Storage/StorageDetailed.mo
+++ b/AixLib/Fluid/Storage/StorageDetailed.mo
@@ -35,8 +35,8 @@ model StorageDetailed
     "Start Temperature of fluid in each layer. e.g. for a 3 layer model: {20, 20, 20}"
     annotation (Dialog(tab="Initialization", group="Storage specific"));
 
-  replaceable parameter DataBase.Storage.StorageDetailedBaseDataDefinition data
-    constrainedby DataBase.Storage.StorageDetailedBaseDataDefinition
+  replaceable parameter AixLib.DataBase.Storage.StorageDetailedBaseDataDefinition data
+    constrainedby AixLib.DataBase.Storage.StorageDetailedBaseDataDefinition
     "Data record for Storage" annotation (choicesAllMatching);
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -778,6 +778,9 @@ for i in 2:(n-1) loop
                  Diagram(coordinateSystem(preserveAspectRatio=false,
           extent={{-80,-100},{80,100}})),
     Documentation(revisions="<html><ul>
+  <li>November 14, 2022, by Laura Maier:<br/>
+  Add adapt name and do some spring cleaning
+  </li>
   <li>November 27, 2019, by Philipp Mehrfeld:<br/>
     - <a href=
     \"https://github.com/RWTH-EBC/AixLib/issues/793\">#793</a><br/>
@@ -893,7 +896,15 @@ for i in 2:(n-1) loop
 </p>
 <p>
   <a href=
-  \"AixLib.Fluid.Storage.Examples.BufferStorageCharging\">AixLib.Fluid.Storage.Examples.BufferStorageCharging</a>
+  \"AixLib.Fluid.Storage.Examples.StorageDetailed\">AixLib.Fluid.Storage.Examples.StorageDetailed</a>
+</p>
+<p>
+  <a href=
+  \"AixLib.Fluid.Storage.Examples.StorageBoiler\">AixLib.Fluid.Storage.Examples.StorageBoiler</a>
+</p>
+<p>
+  <a href=
+  \"AixLib.Fluid.Storage.Examples.StorageSolarCollector\">AixLib.Fluid.Storage.Examples.StorageSolarCollector</a>
 </p>
 </html>"));
 end StorageDetailed;
diff --git a/AixLib/Fluid/Storage/StorageSimple.mo b/AixLib/Fluid/Storage/StorageSimple.mo
index 74006e767c..e6b49327b0 100644
--- a/AixLib/Fluid/Storage/StorageSimple.mo
+++ b/AixLib/Fluid/Storage/StorageSimple.mo
@@ -10,16 +10,45 @@ model StorageSimple
   parameter Modelica.Units.SI.Length d "storage diameter";
   parameter Modelica.Units.SI.Length h "storage height";
   parameter Modelica.Units.SI.ThermalConductivity lambda_ins
-    "thermal conductivity of insulation"                                                         annotation(Dialog(group = "Heat losses"));
+    "thermal conductivity of insulation"
+ annotation(Dialog(group = "Heat losses"));
   parameter Modelica.Units.SI.Length s_ins "thickness of insulation" annotation(Dialog(group = "Heat losses"));
-  parameter Modelica.Units.SI.CoefficientOfHeatTransfer hConIn "Iinternal heat transfer coefficient"  annotation(Dialog(group="Heat losses"));
-  parameter Modelica.Units.SI.CoefficientOfHeatTransfer hConOut "External heat transfer coefficient"   annotation(Dialog(group="Heat losses"));
+  parameter Modelica.Units.SI.CoefficientOfHeatTransfer hConIn "Iinternal heat transfer coefficient"
+  annotation(Dialog(group="Heat losses"));
+  parameter Modelica.Units.SI.CoefficientOfHeatTransfer hConOut "External heat transfer coefficient"
+  annotation(Dialog(group="Heat losses"));
   parameter Modelica.Units.SI.Volume V_HE "heat exchanger volume" annotation(Dialog(group = "Heat exchanger"));
   parameter Modelica.Units.SI.CoefficientOfHeatTransfer k_HE
-    "heat exchanger heat transfer coefficient"                                                         annotation(Dialog(group = "Heat exchanger"));
-  parameter Modelica.Units.SI.Area A_HE "heat exchanger area" annotation(Dialog(group = "Heat exchanger"));
-  parameter Modelica.Units.SI.RelativePressureCoefficient beta = 350e-6 annotation(Dialog(group = "Bouyancy"));
+    "heat exchanger heat transfer coefficient" annotation(Dialog(group = "Heat exchanger"));
+  parameter Modelica.Units.SI.Area A_HE "heat exchanger area"
+  annotation(Dialog(group = "Heat exchanger"));
+  parameter Modelica.Units.SI.RelativePressureCoefficient beta = 350e-6
+  annotation(Dialog(group = "Bouyancy"));
   parameter Real kappa = 0.4 annotation(Dialog(group = "Bouyancy"));
+
+  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal_layer
+    "Nominal mass flow rate in layers";
+  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal_HE
+    "Nominal mass flow rate of heat exchanger layers";
+
+  //Optional temperature outputs
+  parameter Boolean use_TOut = true "Use temperature real outputs";
+
+  parameter Modelica.Fluid.Types.Dynamics energyDynamics=Modelica.Fluid.Types.Dynamics.DynamicFreeInitial
+    "Type of energy balance: dynamic (3 initialization options) or steady state in layers and layers_HE";
+
+  //Initialization parameters
+  parameter Modelica.Units.SI.Temperature T_start[n]
+    "Start value of temperature of each layer, e.g. for 3 layers: {20, 20, 20}" annotation(Dialog(tab="Initialization"));
+  parameter Modelica.Media.Interfaces.Types.AbsolutePressure p_start=Medium.p_default
+    "Start value of pressure" annotation(Dialog(tab="Initialization"));
+
+  //Mass flow rates to regulate zero flow
+  parameter Modelica.Units.SI.MassFlowRate m_flow_small_layer=1E-4*abs(m_flow_nominal_layer)
+    "Small mass flow rate for regularization of zero flow" annotation(Dialog(tab="Advanced"));
+   parameter Modelica.Units.SI.MassFlowRate m_flow_small_layer_HE=1E-4*abs(m_flow_nominal_HE)
+    "Small mass flow rate for regularization of zero flow" annotation(Dialog(tab="Advanced"));
+
   Modelica.Fluid.Interfaces.FluidPort_a
                     port_a_consumer(redeclare final package Medium = Medium)
                                     annotation(Placement(transformation(extent = {{-10, -108}, {10, -88}}), iconTransformation(extent = {{-10, -110}, {10, -90}})));
@@ -35,17 +64,20 @@ model StorageSimple
     each final V = V / n,
     redeclare final package Medium = Medium,
     each final nPorts=2,
-    each final m_flow_nominal=m_flow_nominal_layer)      annotation(Placement(transformation(extent = {{-10, -10}, {10, 10}}, rotation = 90, origin = {0, 0})));
+    each final m_flow_nominal=m_flow_nominal_layer)
+  annotation(Placement(transformation(extent = {{-10, -10}, {10, 10}}, rotation = 90, origin = {0, 0})));
   Modelica.Thermal.HeatTransfer.Interfaces.HeatPort_a heatPort
-    "connect to ambient temperature around the storage"                                                            annotation(Placement(transformation(extent = {{-116, -10}, {-96, 10}}), iconTransformation(extent = {{-90, -10}, {-70, 10}})));
+    "connect to ambient temperature around the storage"
+  annotation(Placement(transformation(extent = {{-116, -10}, {-96, 10}}),
+       iconTransformation(extent = {{-90, -10}, {-70, 10}})));
   Modelica.Fluid.Interfaces.FluidPort_b
-                    port_b_heatGenerator(redeclare final package Medium = Medium)
-                                         annotation(Placement(transformation(extent = {{74, -98}, {94, -78}}), iconTransformation(extent = {{74, -90}, {94, -70}})));
+    port_b_heatGenerator(redeclare final package Medium = Medium)
+  annotation(Placement(transformation(extent = {{74, -98}, {94, -78}}), iconTransformation(extent = {{74, -90}, {94, -70}})));
   Modelica.Fluid.Interfaces.FluidPort_a
-                    port_a_heatGenerator(redeclare final package Medium = Medium)
-                                         annotation(Placement(transformation(extent = {{74, 78}, {94, 98}}), iconTransformation(extent = {{74, 78}, {94, 98}})));
+    port_a_heatGenerator(redeclare final package Medium = Medium)
+        annotation(Placement(transformation(extent = {{74, 78}, {94, 98}}), iconTransformation(extent = {{74, 78}, {94, 98}})));
   Fluid.MixingVolumes.MixingVolume
-                     layer_HE[n](
+    layer_HE[n](
     each final energyDynamics=energyDynamics,
     each final p_start=p_start,
     T_start=T_start,
@@ -53,7 +85,7 @@ model StorageSimple
     each final V = V_HE / n,
     redeclare final package Medium = Medium,
     each final nPorts=2,
-    each final m_flow_nominal=m_flow_nominal_HE)               annotation(Placement(transformation(extent = {{-10, -10}, {10, 10}}, rotation = 90, origin = {84, 0})));
+    each final m_flow_nominal=m_flow_nominal_HE) annotation(Placement(transformation(extent = {{-10, -10}, {10, 10}}, rotation = 90, origin = {84, 0})));
 
   Modelica.Thermal.HeatTransfer.Components.ThermalConductor heatTransfer_HE[n](each final G = k_HE * A_HE / n) annotation(Placement(transformation(extent = {{32, -10}, {52, 10}})));
   Modelica.Thermal.HeatTransfer.Components.ThermalConductor heatTransfer[n](final G = cat(1, {G_top_bottom}, array(G_middle for k in 2:n - 1), {G_top_bottom})) annotation(Placement(transformation(extent = {{-80, -10}, {-60, 10}})));
@@ -76,81 +108,41 @@ model StorageSimple
     each final dx=dx,
     each final kappa=kappa) annotation (Placement(transformation(extent={{-10,-10},{
             10,10}}, origin={-28,0})));
-  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal_layer
-    "Nominal mass flow rate in layers";
-  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal_HE
-    "Nominal mass flow rate of heat exchanger layers";
 
-  parameter Modelica.Fluid.Types.Dynamics energyDynamics=Modelica.Fluid.Types.Dynamics.DynamicFreeInitial
-    "Type of energy balance: dynamic (3 initialization options) or steady state in layers and layers_HE";
-
-  //Initialization parameters
-  parameter Modelica.Units.SI.Temperature T_start[n]
-    "Start value of temperature of each layer, e.g. for 3 layers: {20, 20, 20}" annotation(Dialog(tab="Initialization"));
-  parameter Modelica.Media.Interfaces.Types.AbsolutePressure p_start=Medium.p_default
-    "Start value of pressure" annotation(Dialog(tab="Initialization"));
-
-  //Mass flow rates to regulate zero flow
-  parameter Modelica.Units.SI.MassFlowRate m_flow_small_layer=1E-4*abs(m_flow_nominal_layer)
-    "Small mass flow rate for regularization of zero flow" annotation(Dialog(tab="Advanced"));
-   parameter Modelica.Units.SI.MassFlowRate m_flow_small_layer_HE=1E-4*abs(m_flow_nominal_HE)
-    "Small mass flow rate for regularization of zero flow" annotation(Dialog(tab="Advanced"));
-
-  Modelica.Blocks.Interfaces.RealOutput TTopLayer(
-    final quantity="ThermodynamicTemperature",
-    final unit="K",
-    min=0,
-    displayUnit="degC") "Temperature in the top layer" annotation (Placement(
-        transformation(
-        origin={-99,85},
-        extent={{5,5},{-5,-5}},
-        rotation=0), iconTransformation(
-        extent={{5,5},{-5,-5}},
-        rotation=0,
-        origin={-76,88})));
-  Modelica.Blocks.Interfaces.RealOutput TBottomLayer(
-    final quantity="ThermodynamicTemperature",
-    final unit="K",
-    min=0,
-    displayUnit="degC") "Temperature in the bottom layer" annotation (Placement(
-        transformation(
-        origin={-99,-83},
-        extent={{5,5},{-5,-5}},
-        rotation=0), iconTransformation(
-        extent={{5,5},{-5,-5}},
-        rotation=0,
-        origin={-76,-80})));
-  Modelica.Blocks.Interfaces.RealOutput TTopLayer_HE(
-    final quantity="ThermodynamicTemperature",
-    final unit="K",
-    min=0,
-    displayUnit="degC") "Temperature in the top layer" annotation (Placement(
+  Modelica.Blocks.Interfaces.RealOutput TLayer[n](
+    each final quantity="ThermodynamicTemperature",
+    each final unit="K",
+    each min=0,
+    each displayUnit="degC") if use_TOut "Temperature in the top layer" annotation (Placement(
         transformation(
-        origin={97,71},
-        extent={{-5,5},{5,-5}},
+        origin={-112,30},
+        extent={{12,12},{-12,-12}},
         rotation=0), iconTransformation(
-        extent={{-5,5},{5,-5}},
+        extent={{7.5,7.5},{-7.5,-7.5}},
         rotation=0,
-        origin={102,88})));
-  Modelica.Blocks.Interfaces.RealOutput TBottomLayer_HE(
-    final quantity="ThermodynamicTemperature",
-    final unit="K",
-    min=0,
-    displayUnit="degC") "Temperature in the top layer" annotation (Placement(
+        origin={-86.5,29.5})));
+  Modelica.Blocks.Interfaces.RealOutput TLayer_HE[n](
+    each final quantity="ThermodynamicTemperature",
+    each final unit="K",
+    each min=0,
+    each displayUnit="degC") if use_TOut "Temperature in the top layer" annotation (Placement(
         transformation(
-        origin={95,-69},
-        extent={{-5,5},{5,-5}},
+        origin={112,30},
+        extent={{-12,12},{12,-12}},
         rotation=0), iconTransformation(
-        extent={{-5,5},{5,-5}},
+        extent={{-7.5,7.5},{7.5,-7.5}},
         rotation=0,
-        origin={102,-80})));
+        origin={94.5,29.5})));
 protected
   parameter Modelica.Units.SI.Volume V = A * h;
   parameter Modelica.Units.SI.Area A = Modelica.Constants.pi * d ^ 2 / 4;
   parameter Modelica.Units.SI.Length dx = V / A / n;
-  parameter Modelica.Units.SI.ThermalConductance G_middle=2*Modelica.Constants.pi*h/n/(1/(hConIn*d/2) + 1/lambda_ins*log((d/2 + s_ins)/(d/2))
-       + 1/(hConOut*(d/2 + s_ins)));
-  parameter Modelica.Units.SI.ThermalConductance G_top_bottom = G_middle + lambda_ins / s_ins * A;
+  parameter Modelica.Units.SI.ThermalConductance G_middle=
+  2*Modelica.Constants.pi*h/n/(1/(hConIn*d/2) + 1/lambda_ins*
+  log((d/2 + s_ins)/(d/2)) + 1/(hConOut*(d/2 + s_ins)));
+  parameter Modelica.Units.SI.ThermalConductance G_top_bottom=
+   G_middle + lambda_ins / s_ins * A;
+
 equation
   //Connect layers to the upper and lower ports
   connect(port_a_consumer, layer[1].ports[1]) annotation (Line(
@@ -189,28 +181,29 @@ equation
     connect(bouyancy[k].port_a, layer[k + 1].heatPort);
     connect(bouyancy[k].port_b, layer[k].heatPort);
   end for;
-  connect(heatPort, heatPort) annotation(Line(points = {{-106, 0}, {-106, 0}}, color = {191, 0, 0}));
+  connect(heatPort, heatPort) annotation(Line(points={{-106,0},{-106,0}},      color = {191, 0, 0}));
 
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////  connection of Temperature Sensor//////////////////////////
 ///////////////////////////////////////////////////////////////////////////////
 
-  TBottomLayer = layer[1].heatPort.T;
-
-  TTopLayer = layer[n].heatPort.T;
+  if use_TOut then
+    for k in 1:n loop
 
-  TBottomLayer_HE = layer_HE[1].heatPort.T;
+      TLayer[k] = layer[k].heatPort.T;
 
-  TTopLayer_HE = layer_HE[n].heatPort.T;
+      TLayer_HE[k] = layer_HE[k].heatPort.T;
 
+    end for;
+  end if;
   annotation (Icon(coordinateSystem(preserveAspectRatio = false, extent = {{-100, -100}, {100, 100}}), graphics={  Polygon(points = {{-154, 3}, {-136, -7}, {-110, -3}, {-84, -7}, {-48, -5}, {-18, -9}, {6, -3}, {6, -41}, {-154, -41}, {-154, 3}}, lineColor = {0, 0, 255}, pattern = LinePattern.None, fillColor = {0, 0, 255},
-            fillPattern =                                                                                                   FillPattern.Solid, origin = {78, -59}, rotation = 360), Polygon(points = {{-154, 3}, {-134, -3}, {-110, 1}, {-84, -1}, {-56, -5}, {-30, -11}, {6, -3}, {6, -41}, {-154, -41}, {-154, 3}}, lineColor = {0, 0, 255}, pattern = LinePattern.None, fillColor = {14, 110, 255},
-            fillPattern =                                                                                                   FillPattern.Solid, origin = {78, -27}, rotation = 360), Rectangle(extent = {{-80, -71}, {80, 71}}, lineColor = {0, 0, 255}, pattern = LinePattern.None, fillColor = {85, 170, 255},
-            fillPattern =                                                                                                   FillPattern.Solid, origin = {4, 1}, rotation = 360), Polygon(points = {{-24, -67}, {-16, -67}, {-8, -67}, {4, -67}, {12, -67}, {36, -67}, {76, -67}, {110, -67}, {136, -67}, {136, 39}, {-24, 35}, {-24, -67}}, lineColor = {0, 0, 255}, pattern = LinePattern.None, fillColor = {170, 213, 255},
-            fillPattern =                                                                                                   FillPattern.Solid, origin = {-52, 33}, rotation = 360), Polygon(points = {{-39, -30}, {-31, -30}, {-11, -30}, {23, -30}, {67, -30}, {93, -30}, {121, -30}, {121, 24}, {-39, 26}, {-39, -30}}, lineColor = {0, 0, 255}, pattern = LinePattern.None, fillColor = {255, 170, 170},
-            fillPattern =                                                                                                   FillPattern.Solid, origin = {-37, 38}, rotation = 360), Polygon(points = {{-80, 100}, {-80, 54}, {-62, 54}, {-30, 54}, {32, 54}, {80, 54}, {80, 82}, {80, 100}, {-80, 100}}, lineColor = {0, 0, 255}, pattern = LinePattern.None, fillColor = {255, 62, 62},
-            fillPattern =                                                                                                   FillPattern.Solid, origin = {4, 0}, rotation = 360), Rectangle(extent = {{-76, 100}, {84, -100}}, lineColor = {0, 0, 0},
-            lineThickness =                                                                                                   1), Line(points = {{-21, 94}, {-21, 132}}, color = {0, 0, 0}, smooth = Smooth.Bezier, thickness = 1, arrow = {Arrow.Filled, Arrow.None}, origin = {-56, 67}, rotation = 270, visible = use_heatingCoil1), Line(points = {{-54, 88}, {68, 56}}, color = {0, 0, 0}, thickness = 1, smooth = Smooth.Bezier, visible = use_heatingCoil1), Line(points = {{68, 56}, {-48, 44}}, color = {0, 0, 0}, thickness = 1, smooth = Smooth.Bezier, visible = use_heatingCoil1), Line(points = {{-48, 44}, {62, 6}}, color = {0, 0, 0}, thickness = 1, smooth = Smooth.Bezier, visible = use_heatingCoil1), Line(points = {{62, 6}, {-44, -16}}, color = {0, 0, 0}, thickness = 1, smooth = Smooth.Bezier, visible = use_heatingCoil1), Line(points = {{76, -81}, {-26, -81}}, color = {0, 0, 0}, thickness = 1, smooth = Smooth.Bezier, visible = use_heatingCoil1), Line(points = {{0, -9}, {0, 9}}, color = {0, 0, 0}, smooth = Smooth.Bezier, thickness = 1, arrow = {Arrow.Filled, Arrow.None}, origin = {-34, -81}, rotation = 90, visible = use_heatingCoil1), Line(points = {{62, -42}, {-44, -16}}, color = {0, 0, 0}, thickness = 1, smooth = Smooth.Bezier, visible = use_heatingCoil1), Line(points = {{62, -42}, {-42, -80}}, color = {0, 0, 0}, thickness = 1, smooth = Smooth.Bezier, visible = use_heatingCoil1), Line(points = {{48, 88}, {-54, 88}}, color = {0, 0, 0}, thickness = 1, smooth = Smooth.Bezier, visible = use_heatingCoil1)}), Documentation(info="<html><p>
+            fillPattern = FillPattern.Solid, origin = {78, -59}, rotation = 360), Polygon(points = {{-154, 3}, {-134, -3}, {-110, 1}, {-84, -1}, {-56, -5}, {-30, -11}, {6, -3}, {6, -41}, {-154, -41}, {-154, 3}}, lineColor = {0, 0, 255}, pattern = LinePattern.None, fillColor = {14, 110, 255},
+            fillPattern = FillPattern.Solid, origin = {78, -27}, rotation = 360), Rectangle(extent = {{-80, -71}, {80, 71}}, lineColor = {0, 0, 255}, pattern = LinePattern.None, fillColor = {85, 170, 255},
+            fillPattern = FillPattern.Solid, origin = {4, 1}, rotation = 360), Polygon(points = {{-24, -67}, {-16, -67}, {-8, -67}, {4, -67}, {12, -67}, {36, -67}, {76, -67}, {110, -67}, {136, -67}, {136, 39}, {-24, 35}, {-24, -67}}, lineColor = {0, 0, 255}, pattern = LinePattern.None, fillColor = {170, 213, 255},
+            fillPattern = FillPattern.Solid, origin = {-52, 33}, rotation = 360), Polygon(points = {{-39, -30}, {-31, -30}, {-11, -30}, {23, -30}, {67, -30}, {93, -30}, {121, -30}, {121, 24}, {-39, 26}, {-39, -30}}, lineColor = {0, 0, 255}, pattern = LinePattern.None, fillColor = {255, 170, 170},
+            fillPattern = FillPattern.Solid, origin = {-37, 38}, rotation = 360), Polygon(points = {{-80, 100}, {-80, 54}, {-62, 54}, {-30, 54}, {32, 54}, {80, 54}, {80, 82}, {80, 100}, {-80, 100}}, lineColor = {0, 0, 255}, pattern = LinePattern.None, fillColor = {255, 62, 62},
+            fillPattern = FillPattern.Solid, origin = {4, 0}, rotation = 360), Rectangle(extent = {{-76, 100}, {84, -100}}, lineColor = {0, 0, 0},
+            lineThickness = 1), Line(points = {{-21, 94}, {-21, 132}}, color = {0, 0, 0}, smooth = Smooth.Bezier, thickness = 1, arrow = {Arrow.Filled, Arrow.None}, origin = {-56, 67}, rotation = 270, visible = use_heatingCoil1), Line(points = {{-54, 88}, {68, 56}}, color = {0, 0, 0}, thickness = 1, smooth = Smooth.Bezier, visible = use_heatingCoil1), Line(points = {{68, 56}, {-48, 44}}, color = {0, 0, 0}, thickness = 1, smooth = Smooth.Bezier, visible = use_heatingCoil1), Line(points = {{-48, 44}, {62, 6}}, color = {0, 0, 0}, thickness = 1, smooth = Smooth.Bezier, visible = use_heatingCoil1), Line(points = {{62, 6}, {-44, -16}}, color = {0, 0, 0}, thickness = 1, smooth = Smooth.Bezier, visible = use_heatingCoil1), Line(points = {{76, -81}, {-26, -81}}, color = {0, 0, 0}, thickness = 1, smooth = Smooth.Bezier, visible = use_heatingCoil1), Line(points = {{0, -9}, {0, 9}}, color = {0, 0, 0}, smooth = Smooth.Bezier, thickness = 1, arrow = {Arrow.Filled, Arrow.None}, origin = {-34, -81}, rotation = 90, visible = use_heatingCoil1), Line(points = {{62, -42}, {-44, -16}}, color = {0, 0, 0}, thickness = 1, smooth = Smooth.Bezier, visible = use_heatingCoil1), Line(points = {{62, -42}, {-42, -80}}, color = {0, 0, 0}, thickness = 1, smooth = Smooth.Bezier, visible = use_heatingCoil1), Line(points = {{48, 88}, {-54, 88}}, color = {0, 0, 0}, thickness = 1, smooth = Smooth.Bezier, visible = use_heatingCoil1)}), Documentation(info="<html><p>
   <b><span style=\"color: #008000;\">Overview</span></b>
 </p>
 <p>
@@ -257,21 +250,13 @@ equation
   <b><span style=\"color: #008000;\">Example Results</span></b>
 </p>
 <p>
-  <a href=
-  \"AixLib.HVAC.Storage.Examples.StorageBoiler\">AixLib.HVAC.Storage.Examples.StorageBoiler</a>
-</p>
-<p>
-  <a href=
-  \"AixLib.HVAC.Storage.Examples.StorageSolarCollector\">AixLib.HVAC.Storage.Examples.StorageSolarCollector</a>
+  <a href=\"modelica://AixLib.Fluid.Storage.Examples.StorageSimpleExample\">AixLib.Fluid.Storage.Examples.StorageSimpleExample</a>
 </p>
 <ul>
-  <li>November 2022 by Laura Maier:
-  </li>
-  <li style=\"list-style: none; display: inline\">
-    <p>
+  <li>
+    <i>November 2022</i> by Laura Maier:<br/>
       Rename model and specify difference compared to detailed thermal
       energy storage model
-    </p>
   </li>
   <li>
     <i>November 2014&#160;</i> by Marcus Fuchs:<br/>
diff --git a/AixLib/Resources/ReferenceResults/Dymola/AixLib_Fluid_Storage_Examples_BufferStorage.txt b/AixLib/Resources/ReferenceResults/Dymola/AixLib_Fluid_Storage_Examples_BufferStorage.txt
deleted file mode 100644
index d900fc152b..0000000000
--- a/AixLib/Resources/ReferenceResults/Dymola/AixLib_Fluid_Storage_Examples_BufferStorage.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-last-generated=2022-05-23
-statistics-simulation=
-{
-  "linear": "0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 0",
-  "nonlinear": "1, 1, 1, 1, 1, 1, 1, 1",
-  "number of continuous time states": "66",
-  "numerical Jacobians": "0"
-}
-time=[0e+00, 8.64e+04]
-bufferStorage.heatingCoil1.Therm1[4].Q_flow=[0e+00, 2.089322357177734e+02, 2.10279296875e+02, 2.456749267578125e+02, 3.512670288085938e+02, 5.345086669921875e+02, 7.674417114257812e+02, 1.007915405273438e+03, 1.22147998046875e+03, 1.390572021484375e+03, 1.512841064453125e+03, 1.594987426757812e+03, 1.6470283203125e+03, 1.678455688476562e+03, 1.696874267578125e+03, 1.707472900390625e+03, 1.713564697265625e+03, 1.717232666015625e+03, 1.719527709960938e+03, 1.721064819335938e+03, 1.7221396484375e+03, 1.722940185546875e+03, 1.723549438476562e+03, 1.72402587890625e+03, 1.724404418945312e+03, 1.724701293945312e+03, 1.724939208984375e+03, 1.7251328125e+03, 1.7252919921875e+03, 1.725425048828125e+03, 1.7255390625e+03, 1.725636596679688e+03, 1.725722412109375e+03, 1.725800903320312e+03, 1.725869873046875e+03, 1.725932373046875e+03, 1.725990478515625e+03, 1.726046020507812e+03, 1.72609814453125e+03, 1.726147338867188e+03, 1.726194580078125e+03, 1.72623974609375e+03, 1.726284301757812e+03, 1.726326782226562e+03, 1.726365966796875e+03, 1.7264052734375e+03, 1.726442626953125e+03, 1.726479125976562e+03, 1.72651513671875e+03, 1.726549438476562e+03, 1.726583251953125e+03, 1.726616088867188e+03, 1.72664794921875e+03, 1.726678833007812e+03, 1.726708984375e+03, 1.726738159179688e+03, 1.726766479492188e+03, 1.726794067382812e+03, 1.726820922851562e+03, 1.726847045898438e+03, 1.726872436523438e+03, 1.726897216796875e+03, 1.726921264648438e+03, 1.726944458007812e+03, 1.726967041015625e+03, 1.726989135742188e+03, 1.727010620117188e+03, 1.727031616210938e+03, 1.727051879882812e+03, 1.727071655273438e+03, 1.7270908203125e+03, 1.727109497070312e+03, 1.727127563476562e+03, 1.727145263671875e+03, 1.727162475585938e+03, 1.727179321289062e+03, 1.727195556640625e+03, 1.727211303710938e+03, 1.727226684570312e+03, 1.727241577148438e+03, 1.727256103515625e+03, 1.727270263671875e+03, 1.727284057617188e+03, 1.72729736328125e+03, 1.727310424804688e+03, 1.727323120117188e+03, 1.72733544921875e+03, 1.727347412109375e+03, 1.727359130859375e+03, 1.727370361328125e+03, 1.727381469726562e+03, 1.727392211914062e+03, 1.727402587890625e+03, 1.727412719726562e+03, 1.727422607421875e+03, 1.72743212890625e+03, 1.72744140625e+03, 1.727450561523438e+03, 1.727459350585938e+03, 1.727467895507812e+03, 1.727476318359375e+03]
-bufferStorage.layer[4].T=[3.031499938964844e+02, 3.029797973632812e+02, 3.028795471191406e+02, 3.032489929199219e+02, 3.046163635253906e+02, 3.071959228515625e+02, 3.107314147949219e+02, 3.147044677734375e+02, 3.186065368652344e+02, 3.220921325683594e+02, 3.250028381347656e+02, 3.273210144042969e+02, 3.291090393066406e+02, 3.304604187011719e+02, 3.314702758789062e+02, 3.322204895019531e+02, 3.3277734375e+02, 3.331911315917969e+02, 3.33499267578125e+02, 3.337293701171875e+02, 3.33901611328125e+02, 3.3403076171875e+02, 3.341277465820312e+02, 3.342007751464844e+02, 3.342558288574219e+02, 3.342974243164062e+02, 3.343289489746094e+02, 3.343529357910156e+02, 3.343712768554688e+02, 3.343853759765625e+02, 3.343963012695312e+02, 3.344048156738281e+02, 3.344115295410156e+02, 3.344169006347656e+02, 3.344212341308594e+02, 3.344248046875e+02, 3.344277648925781e+02, 3.344302673339844e+02, 3.344324340820312e+02, 3.34434326171875e+02, 3.3443603515625e+02, 3.344375610351562e+02, 3.3443896484375e+02, 3.344402770996094e+02, 3.344414672851562e+02, 3.34442626953125e+02, 3.344437255859375e+02, 3.344447631835938e+02, 3.344457397460938e+02, 3.344467163085938e+02, 3.344476318359375e+02, 3.344485168457031e+02, 3.344494018554688e+02, 3.344502258300781e+02, 3.344510498046875e+02, 3.344518127441406e+02, 3.344525756835938e+02, 3.344533386230469e+02, 3.344540405273438e+02, 3.344547424316406e+02, 3.344554443359375e+02, 3.344560852050781e+02, 3.344567260742188e+02, 3.344573669433594e+02, 3.344579772949219e+02, 3.344585571289062e+02, 3.344591369628906e+02, 3.344596862792969e+02, 3.344602355957031e+02, 3.344607849121094e+02, 3.344612731933594e+02, 3.344617919921875e+02, 3.344622802734375e+02, 3.344627380371094e+02, 3.344631958007812e+02, 3.344636535644531e+02, 3.344640808105469e+02, 3.344645080566406e+02, 3.344649353027344e+02, 3.3446533203125e+02, 3.344657287597656e+02, 3.344660949707031e+02, 3.344664611816406e+02, 3.344668273925781e+02, 3.344671630859375e+02, 3.344674987792969e+02, 3.344678344726562e+02, 3.344681701660156e+02, 3.344684753417969e+02, 3.344687805175781e+02, 3.344690856933594e+02, 3.344693603515625e+02, 3.344696350097656e+02, 3.344699096679688e+02, 3.344701843261719e+02, 3.344704284667969e+02, 3.344706726074219e+02, 3.344709167480469e+02, 3.344711608886719e+02, 3.344714050292969e+02, 3.344716186523438e+02]
-bufferStorage.portHC1In.p=[1.155022890625e+05, 1.155022890625e+05]
-bufferStorage.portHC1Out.p=[1.01325e+05, 1.01325e+05]
diff --git a/AixLib/Resources/ReferenceResults/Dymola/AixLib_Fluid_Storage_Examples_StorageBoiler.txt b/AixLib/Resources/ReferenceResults/Dymola/AixLib_Fluid_Storage_Examples_StorageBoiler.txt
index 3fd7720941..076f52238e 100644
--- a/AixLib/Resources/ReferenceResults/Dymola/AixLib_Fluid_Storage_Examples_StorageBoiler.txt
+++ b/AixLib/Resources/ReferenceResults/Dymola/AixLib_Fluid_Storage_Examples_StorageBoiler.txt
@@ -1,4 +1,4 @@
-last-generated=2022-10-14
+last-generated=2022-11-14
 statistics-initialization=
 {
   "nonlinear": "1, 0, 1",
diff --git a/AixLib/Resources/ReferenceResults/Dymola/AixLib_Fluid_Storage_Examples_StorageSimpleExample.txt b/AixLib/Resources/ReferenceResults/Dymola/AixLib_Fluid_Storage_Examples_StorageSimpleExample.txt
new file mode 100644
index 0000000000..019bccd2d0
--- /dev/null
+++ b/AixLib/Resources/ReferenceResults/Dymola/AixLib_Fluid_Storage_Examples_StorageSimpleExample.txt
@@ -0,0 +1,19 @@
+last-generated=2024-07-19
+statistics-initialization=
+{
+  "nonlinear": "1, 1",
+  "numerical Jacobians": "0"
+}
+statistics-simulation=
+{
+  "linear": "0",
+  "nonlinear": "1, 1",
+  "number of continuous time states": "17",
+  "numerical Jacobians": "0"
+}
+time=[0e+00, 3.82e+04]
+storageSimple.layer[1].T=[3.081499938964844e+02, 3.0203369140625e+02, 3.020262145996094e+02, 3.030592041015625e+02, 3.041108093261719e+02, 3.05084228515625e+02, 3.060161437988281e+02, 3.069316711425781e+02, 3.078396911621094e+02, 3.087430725097656e+02, 3.09643798828125e+02, 3.105423889160156e+02, 3.114380187988281e+02, 3.119525756835938e+02, 3.12040283203125e+02, 3.120256958007812e+02, 3.117852478027344e+02, 3.11421142578125e+02, 3.110231018066406e+02, 3.106282958984375e+02, 3.102425231933594e+02, 3.098611145019531e+02, 3.101453247070312e+02, 3.107952880859375e+02, 3.116080932617188e+02, 3.118058166503906e+02, 3.118460998535156e+02, 3.117107543945312e+02, 3.113701171875e+02, 3.109298095703125e+02, 3.104658813476562e+02, 3.100075073242188e+02, 3.098019104003906e+02, 3.101642761230469e+02, 3.108425598144531e+02, 3.116089172363281e+02, 3.116306457519531e+02, 3.115786743164062e+02, 3.113437194824219e+02, 3.109141235351562e+02, 3.103918151855469e+02, 3.098479919433594e+02, 3.096583862304688e+02, 3.100101928710938e+02, 3.10638916015625e+02, 3.113363342285156e+02, 3.1146044921875e+02, 3.1129833984375e+02, 3.110296325683594e+02, 3.105544738769531e+02, 3.099633178710938e+02, 3.094346313476562e+02, 3.096449584960938e+02, 3.101358337402344e+02, 3.10747802734375e+02, 3.1137548828125e+02, 3.111861267089844e+02, 3.109288330078125e+02, 3.105250244140625e+02, 3.099334716796875e+02, 3.092505798339844e+02, 3.094269104003906e+02, 3.098194885253906e+02, 3.103453674316406e+02, 3.108960571289062e+02, 3.113836975097656e+02, 3.108283386230469e+02, 3.104540405273438e+02, 3.098953247070312e+02, 3.091796569824219e+02, 3.092002868652344e+02, 3.094959106445312e+02, 3.099388122558594e+02, 3.104101257324219e+02, 3.108821105957031e+02, 3.111583862304688e+02, 3.10532958984375e+02, 3.100602722167969e+02, 3.094071655273438e+02, 3.08997314453125e+02, 3.09083740234375e+02, 3.094109497070312e+02, 3.098098754882812e+02, 3.102144775390625e+02, 3.106148376464844e+02, 3.110127258300781e+02, 3.105955505371094e+02, 3.100368347167969e+02, 3.094150390625e+02, 3.087933044433594e+02, 3.088247985839844e+02, 3.090565795898438e+02, 3.093900451660156e+02, 3.09739501953125e+02, 3.100850219726562e+02, 3.104288330078125e+02, 3.107727661132812e+02, 3.109007263183594e+02, 3.100841369628906e+02, 3.094706726074219e+02, 3.087001647949219e+02]
+storageSimple.layer[2].T=[3.081499938964844e+02, 3.059116516113281e+02, 3.049413146972656e+02, 3.050283813476562e+02, 3.056400146484375e+02, 3.064623107910156e+02, 3.073539428710938e+02, 3.082625732421875e+02, 3.091695556640625e+02, 3.100715942382812e+02, 3.109727478027344e+02, 3.118750610351562e+02, 3.127760620117188e+02, 3.129989013671875e+02, 3.124057312011719e+02, 3.121861267089844e+02, 3.12007080078125e+02, 3.117476806640625e+02, 3.114145812988281e+02, 3.110441589355469e+02, 3.106628723144531e+02, 3.102817687988281e+02, 3.112699279785156e+02, 3.121864318847656e+02, 3.130276794433594e+02, 3.127052001953125e+02, 3.121888122558594e+02, 3.119433898925781e+02, 3.116895751953125e+02, 3.113485107421875e+02, 3.109401550292969e+02, 3.105018615722656e+02, 3.105771789550781e+02, 3.115113220214844e+02, 3.123318176269531e+02, 3.131065673828125e+02, 3.125550537109375e+02, 3.119961853027344e+02, 3.116755065917969e+02, 3.113357543945312e+02, 3.109092407226562e+02, 3.1041845703125e+02, 3.106063842773438e+02, 3.114749755859375e+02, 3.122218017578125e+02, 3.129290161132812e+02, 3.126810913085938e+02, 3.11908447265625e+02, 3.114662170410156e+02, 3.11053466796875e+02, 3.105621948242188e+02, 3.101932678222656e+02, 3.110826416015625e+02, 3.117919616699219e+02, 3.124363708496094e+02, 3.130687561035156e+02, 3.123748474121094e+02, 3.115936279296875e+02, 3.110752868652344e+02, 3.105586547851562e+02, 3.099694213867188e+02, 3.109053344726562e+02, 3.115596313476562e+02, 3.121282653808594e+02, 3.12685791015625e+02, 3.131592407226562e+02, 3.119225158691406e+02, 3.111629943847656e+02, 3.105674438476562e+02, 3.099387817382812e+02, 3.106792602539062e+02, 3.113067626953125e+02, 3.118144836425781e+02, 3.122944946289062e+02, 3.127721252441406e+02, 3.129905395507812e+02, 3.11699951171875e+02, 3.108680725097656e+02, 3.101845703125e+02, 3.101690063476562e+02, 3.108517456054688e+02, 3.113499450683594e+02, 3.117803955078125e+02, 3.121910095214844e+02, 3.125962829589844e+02, 3.130016479492188e+02, 3.122177734375e+02, 3.110869140625e+02, 3.102754821777344e+02, 3.098274841308594e+02, 3.105620422363281e+02, 3.110448913574219e+02, 3.114318237304688e+02, 3.117910766601562e+02, 3.121398620605469e+02, 3.124879455566406e+02, 3.128378295898438e+02, 3.129142150878906e+02, 3.114522705078125e+02, 3.104564514160156e+02, 3.096329040527344e+02]
+storageSimple.layer[3].T=[3.081499938964844e+02, 3.077958984375e+02, 3.076525573730469e+02, 3.075568542480469e+02, 3.080307922363281e+02, 3.088034362792969e+02, 3.096834716796875e+02, 3.105914916992188e+02, 3.114976806640625e+02, 3.123969116210938e+02, 3.132967529296875e+02, 3.142007751464844e+02, 3.151049499511719e+02, 3.150216369628906e+02, 3.136073608398438e+02, 3.12806884765625e+02, 3.123643188476562e+02, 3.120484313964844e+02, 3.117392272949219e+02, 3.114022827148438e+02, 3.110421142578125e+02, 3.106709594726562e+02, 3.133664245605469e+02, 3.145230102539062e+02, 3.153803100585938e+02, 3.145346374511719e+02, 3.132630920410156e+02, 3.125332946777344e+02, 3.120858764648438e+02, 3.117206420898438e+02, 3.113451843261719e+02, 3.109403686523438e+02, 3.119169311523438e+02, 3.137843322753906e+02, 3.147015991210938e+02, 3.154788513183594e+02, 3.143585205078125e+02, 3.130913391113281e+02, 3.123266906738281e+02, 3.118164978027344e+02, 3.113749694824219e+02, 3.109192504882812e+02, 3.122108764648438e+02, 3.137977294921875e+02, 3.146170959472656e+02, 3.153274230957031e+02, 3.147187194824219e+02, 3.132409057617188e+02, 3.122966918945312e+02, 3.116597900390625e+02, 3.111265258789062e+02, 3.111869201660156e+02, 3.133373718261719e+02, 3.14200927734375e+02, 3.1485986328125e+02, 3.154933776855469e+02, 3.143296508789062e+02, 3.128995056152344e+02, 3.119470520019531e+02, 3.112532958984375e+02, 3.106746520996094e+02, 3.1315283203125e+02, 3.139902954101562e+02, 3.145755310058594e+02, 3.151345520019531e+02, 3.155803833007812e+02, 3.137341613769531e+02, 3.124002380371094e+02, 3.1146435546875e+02, 3.107199096679688e+02, 3.128846435546875e+02, 3.137551879882812e+02, 3.14288330078125e+02, 3.147686767578125e+02, 3.152468872070312e+02, 3.153956604003906e+02, 3.135404052734375e+02, 3.121695556640625e+02, 3.111683349609375e+02, 3.118755187988281e+02, 3.132581481933594e+02, 3.13839599609375e+02, 3.142799072265625e+02, 3.146903991699219e+02, 3.15095703125e+02, 3.155031127929688e+02, 3.144226379394531e+02, 3.127382507324219e+02, 3.114888305664062e+02, 3.112445373535156e+02, 3.129310913085938e+02, 3.13545166015625e+02, 3.139505004882812e+02, 3.143115234375e+02, 3.146597900390625e+02, 3.150083618164062e+02, 3.153602905273438e+02, 3.153776245117188e+02, 3.134306335449219e+02, 3.119240417480469e+02, 3.10781982421875e+02]
+heatingRod.Pel=[0e+00, 8.16326513671875e+03, 8.16326513671875e+03, 8.16326513671875e+03, 8.16326513671875e+03, 8.16326513671875e+03, 8.16326513671875e+03, 8.16326513671875e+03, 8.16326513671875e+03, 8.16326513671875e+03, 8.16326513671875e+03, 8.16326513671875e+03, 8.16326513671875e+03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 8.16326513671875e+03, 8.16326513671875e+03, 8.16326513671875e+03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 8.16326513671875e+03, 8.16326513671875e+03, 8.16326513671875e+03, 8.16326513671875e+03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 8.16326513671875e+03, 8.16326513671875e+03, 8.16326513671875e+03, 8.16326513671875e+03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 8.16326513671875e+03, 8.16326513671875e+03, 8.16326513671875e+03, 8.16326513671875e+03, 8.16326513671875e+03, 0e+00, 0e+00, 0e+00, 0e+00, 8.16326513671875e+03, 8.16326513671875e+03, 8.16326513671875e+03, 8.16326513671875e+03, 8.16326513671875e+03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 8.16326513671875e+03, 8.16326513671875e+03, 8.16326513671875e+03, 8.16326513671875e+03, 8.16326513671875e+03, 0e+00, 0e+00, 0e+00, 0e+00, 8.16326513671875e+03, 8.16326513671875e+03, 8.16326513671875e+03, 8.16326513671875e+03, 8.16326513671875e+03, 8.16326513671875e+03, 8.16326513671875e+03, 0e+00, 0e+00, 0e+00, 8.16326513671875e+03, 8.16326513671875e+03, 8.16326513671875e+03, 8.16326513671875e+03, 8.16326513671875e+03, 8.16326513671875e+03, 8.16326513671875e+03, 8.16326513671875e+03, 0e+00, 0e+00, 0e+00, 0e+00]
+simpleConsumer.Q_flow=[-2e+03, -2.000771728515625e+03, -2.003086059570312e+03, -2.00694140625e+03, -2.012334838867188e+03, -2.019261962890625e+03, -2.027717651367188e+03, -2.037695190429688e+03, -2.04918701171875e+03, -2.062184326171875e+03, -2.0766767578125e+03, -2.092653564453125e+03, -2.110102294921875e+03, -2.129009033203125e+03, -2.14935986328125e+03, -2.171138671875e+03, -2.194328857421875e+03, -2.218912353515625e+03, -2.2448701171875e+03, -2.272182373046875e+03, -2.300828125e+03, -2.330784912109375e+03, -2.36202978515625e+03, -2.39453857421875e+03, -2.4282861328125e+03, -2.463246826171875e+03, -2.499393310546875e+03, -2.536697509765625e+03, -2.575131103515625e+03, -2.614664306640625e+03, -2.655266357421875e+03, -2.69690625e+03, -2.739551513671875e+03, -2.783169677734375e+03, -2.8277265625e+03, -2.873188232421875e+03, -2.919519287109375e+03, -2.966684326171875e+03, -3.014646484375e+03, -3.063369140625e+03, -3.112814697265625e+03, -3.162944580078125e+03, -3.213720703125e+03, -3.265103515625e+03, -3.31705322265625e+03, -3.369530029296875e+03, -3.422493408203125e+03, -3.47590234375e+03, -3.5297158203125e+03, -3.58389208984375e+03, -3.638389404296875e+03, -3.693166015625e+03, -3.74817919921875e+03, -3.80338671875e+03, -3.85874609375e+03, -3.91421435546875e+03, -3.969748779296875e+03, -4.025306640625e+03, -4.080844970703125e+03, -4.13632080078125e+03, -4.19169140625e+03, -4.2469140625e+03, -4.30194677734375e+03, -4.35674560546875e+03, -4.41126953125e+03, -4.4654765625e+03, -4.51932373046875e+03, -4.5727705078125e+03, -4.625774902343751e+03, -4.678296874999999e+03, -4.73029541015625e+03, -4.78172998046875e+03, -4.8325615234375e+03, -4.88275048828125e+03, -4.9322587890625e+03, -4.98104736328125e+03, -5.02907861328125e+03, -5.07631591796875e+03, -5.12272265625e+03, -5.16826318359375e+03, -5.21290234375e+03, -5.25660498046875e+03, -5.29933837890625e+03, -5.34106884765625e+03, -5.3817646484375e+03, -5.42139453125e+03, -5.4599267578125e+03, -5.4973330078125e+03, -5.53358349609375e+03, -5.56865087890625e+03, -5.6025078125e+03, -5.6351279296875e+03, -5.666486328125e+03, -5.69655859375e+03, -5.72532177734375e+03, -5.75275341796875e+03, -5.77883251953125e+03, -5.80353955078125e+03, -5.82685400390625e+03, -5.84875927734375e+03, -5.86923779296875e+03]
diff --git a/AixLib/Resources/Scripts/Dymola/Fluid/Storage/Examples/StorageBoiler.mos b/AixLib/Resources/Scripts/Dymola/Fluid/Storage/Examples/StorageBoiler.mos
index f6cb445dbd..4646f88499 100644
--- a/AixLib/Resources/Scripts/Dymola/Fluid/Storage/Examples/StorageBoiler.mos
+++ b/AixLib/Resources/Scripts/Dymola/Fluid/Storage/Examples/StorageBoiler.mos
@@ -1,3 +1,6 @@
 simulateModel("AixLib.Fluid.Storage.Examples.StorageBoiler", tolerance=1e-6, stopTime=86400, method="dassl", resultFile="StorageBoiler");
-createPlot(id=1, position={104, 0, 742, 420}, y={"bufferStorage.layer[10].T","bufferStorage.layer[5].T","bufferStorage.layer[1].T"}, range={0.0, 90000.0, 25.0, 65.0}, grid=true, filename="StorageBoiler.mat", colors={{28,108,200},{238,46,47},{110,110,110}}, displayUnits={"degC","degC","degC"});
-createPlot(id=2, position={104, 0, 742, 420}, y={"hea.Q_flow"}, range={0.0, 90000.0, 25.0, 65.0}, grid=true, filename="StorageBoiler.mat", colors={{28,108,200}}, displayUnits={"W"});
\ No newline at end of file
+createPlot(id=1, position={104, 0, 742, 420}, y={"bufferStorage.layer[10].T","bufferStorage.layer[5].T","bufferStorage.layer[1].T"}, 
+range={0.0, 90000.0, 25.0, 65.0}, grid=true, filename="StorageBoiler.mat", subPlot=1, colors={{28,108,200},{238,46,47},{110,110,110}},
+displayUnits={"degC","degC","degC"});
+createPlot(id=1, position={104, 0, 742, 420}, y={"hea.Q_flow"}, 
+range={0.0, 90000.0, 25.0, 65.0}, grid=true, filename="StorageBoiler.mat", subPlot=2, colors={{28,108,200}}, displayUnits={"W"});
\ No newline at end of file
diff --git a/AixLib/Resources/Scripts/Dymola/Fluid/Storage/Examples/StorageDetailedExample.mos b/AixLib/Resources/Scripts/Dymola/Fluid/Storage/Examples/StorageDetailedExample.mos
index f322712580..48026162a0 100644
--- a/AixLib/Resources/Scripts/Dymola/Fluid/Storage/Examples/StorageDetailedExample.mos
+++ b/AixLib/Resources/Scripts/Dymola/Fluid/Storage/Examples/StorageDetailedExample.mos
@@ -1,4 +1,7 @@
 simulateModel("AixLib.Fluid.Storage.Examples.StorageDetailedExample", tolerance=1e-6, stopTime=86400, method="dassl", resultFile="StorageDetailed");
-createPlot(id=1, position={405, 134, 811, 420}, y={"bufferStorage.heatingCoil1.Therm1[4].Q_flow"}, range={0.0, 90000.0, -200.0, 1800.0}, grid=true, filename="BufferStorage.mat", colors={{28,108,200}});
-createPlot(id=2, position={104, 0, 742, 420}, y={"bufferStorage.layer[4].T"}, range={0.0, 90000.0, 25.0, 65.0}, grid=true, filename="BufferStorage.mat", colors={{28,108,200}}, displayUnits={"degC"});
-createPlot(id=3, position={235, 62, 807, 420}, y={"bufferStorage.portHC1In.p", "bufferStorage.portHC1Out.p"}, range={0.0, 90000.0, 1.0, 1.16}, grid=true, filename="BufferStorage.mat", colors={{28,108,200}, {238,46,47}}, displayUnits={"bar", "bar"});
+createPlot(id=1, position={405, 134, 811, 420}, y={"bufferStorage.heatingCoil1.Therm1[4].Q_flow"},
+range={0.0, 90000.0, -200.0, 1800.0}, grid=true, filename="StorageDetailed.mat", subPlot=1, colors={{28,108,200}});
+createPlot(id=1, position={104, 0, 742, 420}, y={"bufferStorage.layer[4].T"},
+range={0.0, 90000.0, 25.0, 65.0}, grid=true, filename="StorageDetailed.mat", subPlot=2, colors={{28,108,200}}, displayUnits={"degC"});
+createPlot(id=1, position={235, 62, 807, 420}, y={"bufferStorage.portHC1In.p", "bufferStorage.portHC1Out.p"},
+range={0.0, 90000.0, 1.0, 1.16}, grid=true, filename="StorageDetailed.mat", subPlot=3, colors={{28,108,200}, {238,46,47}}, displayUnits={"bar", "bar"});
diff --git a/AixLib/Resources/Scripts/Dymola/Fluid/Storage/Examples/StorageSimpleExample.mos b/AixLib/Resources/Scripts/Dymola/Fluid/Storage/Examples/StorageSimpleExample.mos
new file mode 100644
index 0000000000..95c521556b
--- /dev/null
+++ b/AixLib/Resources/Scripts/Dymola/Fluid/Storage/Examples/StorageSimpleExample.mos
@@ -0,0 +1,7 @@
+simulateModel("AixLib.Fluid.Storage.Examples.StorageSimpleExample", tolerance=1e-6, stopTime=38200, method="dassl", resultFile="StorageSimple");
+createPlot(id=1, position={104, 0, 742, 420}, y={"storageSimple.layer[1].T","storageSimple.layer[2].T","storageSimple.layer[3].T"}, 
+grid=true, filename="StorageSimple.mat", subPlot=1, colors={{28,108,200},{100,108,150},{50,70,20}});
+createPlot(id=1, position={104, 0, 742, 420}, y={"heatingRod.Pel"}, 
+grid=true, filename="StorageSimple.mat", subPlot=2, colors={{28,108,200}});
+createPlot(id=1, position={104, 0, 742, 420}, y={"simpleConsumer.Q_flow"}, 
+grid=true, filename="StorageSimple.mat", subPlot=3, colors={{28,108,200}});
diff --git a/AixLib/Resources/Scripts/Dymola/Fluid/Storage/Examples/StorageSolarCollector.mos b/AixLib/Resources/Scripts/Dymola/Fluid/Storage/Examples/StorageSolarCollector.mos
index fb6c5d1843..03f2ed4c41 100644
--- a/AixLib/Resources/Scripts/Dymola/Fluid/Storage/Examples/StorageSolarCollector.mos
+++ b/AixLib/Resources/Scripts/Dymola/Fluid/Storage/Examples/StorageSolarCollector.mos
@@ -1,4 +1,10 @@
 simulateModel("AixLib.Fluid.Storage.Examples.StorageSolarCollector", tolerance=1e-6, stopTime=172800, method="dassl", resultFile="StorageSolarCollector");
-createPlot(id=1, position={104, 0, 742, 420}, y={"bufferStorage.layer[10].T","bufferStorage.layer[5].T","bufferStorage.layer[1].T"}, range={0.0, 90000.0, 25.0, 65.0}, grid=true, filename="StorageSolarCollector.mat", colors={{110,110,110},{28,108,200},{238,46,47}}, displayUnits={"degC","degC","degC"});
-createPlot(id=2, position={104, 0, 742, 420}, y={"temperatureSensor.T"}, range={0.0, 90000.0, 25.0, 65.0}, grid=true, filename="StorageSolarCollector.mat", colors={{28,108,200}}, displayUnits={"degC"});
-createPlot(id=3, position={104, 0, 742, 420}, y={"solarThermal.Irradiation","solarThermal.heater.Q_flow"}, range={0.0, 90000.0, 25.0, 65.0}, grid=true, filename="StorageSolarCollector.mat", colors={{28,108,200},{238,46,47}});
\ No newline at end of file
+createPlot(id=1, position={104, 0, 742, 420}, y={"bufferStorage.layer[10].T","bufferStorage.layer[5].T","bufferStorage.layer[1].T"},
+range={0.0, 90000.0, 25.0, 65.0}, grid=true, filename="StorageSolarCollector.mat", subPlot=1,
+colors={{110,110,110},{28,108,200},{238,46,47}}, displayUnits={"degC","degC","degC"});
+createPlot(id=1, position={104, 0, 742, 420}, y={"temperatureSensor.T"}, 
+range={0.0, 90000.0, 25.0, 65.0}, grid=true, filename="StorageSolarCollector.mat", subPlot=2,
+colors={{28,108,200}}, displayUnits={"degC"});
+createPlot(id=1, position={104, 0, 742, 420}, y={"solarThermal.Irradiation","solarThermal.heater.Q_flow"}, 
+range={0.0, 90000.0, 25.0, 65.0}, grid=true, filename="StorageSolarCollector.mat", subPlot=3, 
+colors={{28,108,200},{238,46,47}});
\ No newline at end of file