diff --git a/examples/CosmoVolume/cosmoVolume.yml b/examples/CosmoVolume/cosmoVolume.yml
index 83d70f35c0d7ed5f0c81eb138b37eb0881125e85..548b85078952954f2bf97280be6feb25eb6ef444 100644
--- a/examples/CosmoVolume/cosmoVolume.yml
+++ b/examples/CosmoVolume/cosmoVolume.yml
@@ -23,11 +23,6 @@ Snapshots:
   basename:            cosmo # Common part of the name of output files
   time_first:          0.    # Time of the first output (in internal units)
   delta_time:          0.05  # Time difference between consecutive outputs (in internal units)
-  UnitMass_in_cgs:     1   # Grams
-  UnitLength_in_cgs:   1   # Centimeters
-  UnitVelocity_in_cgs: 1   # Centimeters per second
-  UnitCurrent_in_cgs:  1   # Amperes
-  UnitTemp_in_cgs:     1   # Kelvin
 
 # Parameters governing the conserved quantities statistics
 Statistics:
diff --git a/examples/EAGLE_12/eagle_12.yml b/examples/EAGLE_12/eagle_12.yml
index 778d04fdd02004fd10ac468321568069e39dd217..76ba002d053442e76c4234245c11ef271353761c 100644
--- a/examples/EAGLE_12/eagle_12.yml
+++ b/examples/EAGLE_12/eagle_12.yml
@@ -1,10 +1,10 @@
 # Define the system of units to use internally. 
 InternalUnitSystem:
-  UnitMass_in_cgs:     1   # Grams
-  UnitLength_in_cgs:   1   # Centimeters
-  UnitVelocity_in_cgs: 1   # Centimeters per second
-  UnitCurrent_in_cgs:  1   # Amperes
-  UnitTemp_in_cgs:     1   # Kelvin
+  UnitMass_in_cgs:     1.989e43      # 10^10 M_sun in grams
+  UnitLength_in_cgs:   3.085678e24   # Mpc in centimeters
+  UnitVelocity_in_cgs: 1e5           # km/s in centimeters per second
+  UnitCurrent_in_cgs:  1             # Amperes
+  UnitTemp_in_cgs:     1             # Kelvin
 
 # Parameters for the task scheduling
 Scheduler:
@@ -14,21 +14,16 @@ Scheduler:
 # Parameters governing the time integration
 TimeIntegration:
   time_begin: 0.    # The starting time of the simulation (in internal units).
-  time_end:   1.    # The end time of the simulation (in internal units).
-  dt_min:     1e-7  # The minimal time-step size of the simulation (in internal units).
-  dt_max:     1e-2  # The maximal time-step size of the simulation (in internal units).
+  time_end:   1e-2  # The end time of the simulation (in internal units).
+  dt_min:     1e-10 # The minimal time-step size of the simulation (in internal units).
+  dt_max:     1e-4  # The maximal time-step size of the simulation (in internal units).
 
 # Parameters governing the snapshots
 Snapshots:
   basename:            eagle # Common part of the name of output files
   time_first:          0.    # Time of the first output (in internal units)
-  delta_time:          0.05  # Time difference between consecutive outputs (in internal units)
-  UnitMass_in_cgs:     1   # Grams
-  UnitLength_in_cgs:   1   # Centimeters
-  UnitVelocity_in_cgs: 1   # Centimeters per second
-  UnitCurrent_in_cgs:  1   # Amperes
-  UnitTemp_in_cgs:     1   # Kelvin
-
+  delta_time:          1e-3  # Time difference between consecutive outputs (in internal units)
+  
 # Parameters governing the conserved quantities statistics
 Statistics:
   delta_time:          1e-2 # Time between statistics output
diff --git a/examples/EAGLE_25/eagle_25.yml b/examples/EAGLE_25/eagle_25.yml
index 731d87ea360ced596c4190880c62fdfb1cd605f8..5715920b760e60d65bf7595a2abae547e4276613 100644
--- a/examples/EAGLE_25/eagle_25.yml
+++ b/examples/EAGLE_25/eagle_25.yml
@@ -1,10 +1,10 @@
 # Define the system of units to use internally. 
 InternalUnitSystem:
-  UnitMass_in_cgs:     1   # Grams
-  UnitLength_in_cgs:   1   # Centimeters
-  UnitVelocity_in_cgs: 1   # Centimeters per second
-  UnitCurrent_in_cgs:  1   # Amperes
-  UnitTemp_in_cgs:     1   # Kelvin
+  UnitMass_in_cgs:     1.989e43      # 10^10 M_sun in grams
+  UnitLength_in_cgs:   3.085678e24   # Mpc in centimeters
+  UnitVelocity_in_cgs: 1e5           # km/s in centimeters per second
+  UnitCurrent_in_cgs:  1             # Amperes
+  UnitTemp_in_cgs:     1             # Kelvin
 
 # Parameters for the task scheduling
 Scheduler:
@@ -23,11 +23,6 @@ Snapshots:
   basename:            eagle # Common part of the name of output files
   time_first:          0.    # Time of the first output (in internal units)
   delta_time:          0.05  # Time difference between consecutive outputs (in internal units)
-  UnitMass_in_cgs:     1   # Grams
-  UnitLength_in_cgs:   1   # Centimeters
-  UnitVelocity_in_cgs: 1   # Centimeters per second
-  UnitCurrent_in_cgs:  1   # Amperes
-  UnitTemp_in_cgs:     1   # Kelvin
 
 # Parameters governing the conserved quantities statistics
 Statistics:
diff --git a/examples/EAGLE_50/eagle_50.yml b/examples/EAGLE_50/eagle_50.yml
index 1b1f4e4dfa0559f4fcf18d99c0fc649a3b8f5307..61f9e21ff5cd6b2353ff6d708253d08a7291b6c1 100644
--- a/examples/EAGLE_50/eagle_50.yml
+++ b/examples/EAGLE_50/eagle_50.yml
@@ -1,10 +1,10 @@
 # Define the system of units to use internally. 
 InternalUnitSystem:
-  UnitMass_in_cgs:     1   # Grams
-  UnitLength_in_cgs:   1   # Centimeters
-  UnitVelocity_in_cgs: 1   # Centimeters per second
-  UnitCurrent_in_cgs:  1   # Amperes
-  UnitTemp_in_cgs:     1   # Kelvin
+  UnitMass_in_cgs:     1.989e43      # 10^10 M_sun in grams
+  UnitLength_in_cgs:   3.085678e24   # Mpc in centimeters
+  UnitVelocity_in_cgs: 1e5           # km/s in centimeters per second
+  UnitCurrent_in_cgs:  1             # Amperes
+  UnitTemp_in_cgs:     1             # Kelvin
 
 # Parameters for the task scheduling
 Scheduler:
@@ -23,11 +23,6 @@ Snapshots:
   basename:            eagle # Common part of the name of output files
   time_first:          0.    # Time of the first output (in internal units)
   delta_time:          0.05  # Time difference between consecutive outputs (in internal units)
-  UnitMass_in_cgs:     1   # Grams
-  UnitLength_in_cgs:   1   # Centimeters
-  UnitVelocity_in_cgs: 1   # Centimeters per second
-  UnitCurrent_in_cgs:  1   # Amperes
-  UnitTemp_in_cgs:     1   # Kelvin
 
 # Parameters governing the conserved quantities statistics
 Statistics:
diff --git a/examples/ExternalPointMass/externalPointMass.yml b/examples/ExternalPointMass/externalPointMass.yml
index 52330163caa13609fd7674a5cdf2921743fbe227..c6ab8af09ccc4f659c241f2ec91ff86f16043ac6 100644
--- a/examples/ExternalPointMass/externalPointMass.yml
+++ b/examples/ExternalPointMass/externalPointMass.yml
@@ -18,11 +18,6 @@ Snapshots:
   basename:            pointMass # Common part of the name of output files
   time_first:          0.        # Time of the first output (in internal units)
   delta_time:          0.02      # Time difference between consecutive outputs (in internal units)
-  UnitMass_in_cgs:     1.9885e33     # Grams
-  UnitLength_in_cgs:   3.0856776e21  # Centimeters
-  UnitVelocity_in_cgs: 1e5           # Centimeters per second
-  UnitCurrent_in_cgs:  1   # Amperes
-  UnitTemp_in_cgs:     1   # Kelvin
 
 # Parameters governing the conserved quantities statistics
 Statistics:
diff --git a/examples/MultiTypes/multiTypes.yml b/examples/MultiTypes/multiTypes.yml
index a1ff19f98e9fccab82d1749a45adf026b6675907..28d02fefa8168e35af696975a7c73a1bf767155e 100644
--- a/examples/MultiTypes/multiTypes.yml
+++ b/examples/MultiTypes/multiTypes.yml
@@ -18,11 +18,6 @@ Snapshots:
   basename:            multiTypes # Common part of the name of output files
   time_first:          0.         # Time of the first output (in internal units)
   delta_time:          0.01       # Time difference between consecutive outputs (in internal units)
-  UnitMass_in_cgs:     1   # Grams
-  UnitLength_in_cgs:   1   # Centimeters
-  UnitVelocity_in_cgs: 1   # Centimeters per second
-  UnitCurrent_in_cgs:  1   # Amperes
-  UnitTemp_in_cgs:     1   # Kelvin
 
 # Parameters governing the conserved quantities statistics
 Statistics:
diff --git a/examples/SedovBlast/sedov.yml b/examples/SedovBlast/sedov.yml
index 9fbabb4969b6accdb7323d8270b735951ac0693a..eb95fd85d5599145b2ff037256dcde72fc306209 100644
--- a/examples/SedovBlast/sedov.yml
+++ b/examples/SedovBlast/sedov.yml
@@ -18,11 +18,6 @@ Snapshots:
   basename:            sedov # Common part of the name of output files
   time_first:          0.    # Time of the first output (in internal units)
   delta_time:          0.1   # Time difference between consecutive outputs (in internal units)
-  UnitMass_in_cgs:     1   # Grams
-  UnitLength_in_cgs:   1   # Centimeters
-  UnitVelocity_in_cgs: 1   # Centimeters per second
-  UnitCurrent_in_cgs:  1   # Amperes
-  UnitTemp_in_cgs:     1   # Kelvin
 
 # Parameters governing the conserved quantities statistics
 Statistics:
diff --git a/examples/SodShock/sodShock.yml b/examples/SodShock/sodShock.yml
index 003b7286777230ceb3b84ee01c6a1f335aeb9476..19bacb57f3bfb173063dbac5d752929763dede29 100644
--- a/examples/SodShock/sodShock.yml
+++ b/examples/SodShock/sodShock.yml
@@ -18,11 +18,6 @@ Snapshots:
   basename:            sod # Common part of the name of output files
   time_first:          0.  # Time of the first output (in internal units)
   delta_time:          0.1 # Time difference between consecutive outputs (in internal units)
-  UnitMass_in_cgs:     1   # Grams
-  UnitLength_in_cgs:   1   # Centimeters
-  UnitVelocity_in_cgs: 1   # Centimeters per second
-  UnitCurrent_in_cgs:  1   # Amperes
-  UnitTemp_in_cgs:     1   # Kelvin
 
 # Parameters governing the conserved quantities statistics
 Statistics:
diff --git a/examples/UniformBox/uniformBox.yml b/examples/UniformBox/uniformBox.yml
index 069a17fb549775acf918da88221f7b3ed7e80565..7c9c74e1342bffb939131a265188cae269cc773f 100644
--- a/examples/UniformBox/uniformBox.yml
+++ b/examples/UniformBox/uniformBox.yml
@@ -18,11 +18,6 @@ Snapshots:
   basename:            uniformBox # Common part of the name of output files
   time_first:          0.         # Time of the first output (in internal units)
   delta_time:          0.01       # Time difference between consecutive outputs (in internal units)
-  UnitMass_in_cgs:     1   # Grams
-  UnitLength_in_cgs:   1   # Centimeters
-  UnitVelocity_in_cgs: 1   # Centimeters per second
-  UnitCurrent_in_cgs:  1   # Amperes
-  UnitTemp_in_cgs:     1   # Kelvin
 
 # Parameters governing the conserved quantities statistics
 Statistics:
diff --git a/examples/parameter_example.yml b/examples/parameter_example.yml
index b76b127f02f8253d5738ebdaae2a685dc74f96e0..b2000e978f48ced279e365f24bb717202584f3b1 100644
--- a/examples/parameter_example.yml
+++ b/examples/parameter_example.yml
@@ -25,11 +25,11 @@ Snapshots:
   basename:   output      # Common part of the name of output files
   time_first: 0.          # Time of the first output (in internal units)
   delta_time: 0.01        # Time difference between consecutive outputs (in internal units)
-  UnitMass_in_cgs:     1  # Unit system for the outputs (Grams)
-  UnitLength_in_cgs:   1  # Unit system for the outputs (Centimeters)
-  UnitVelocity_in_cgs: 1  # Unit system for the outputs (Centimeters per second)
-  UnitCurrent_in_cgs:  1  # Unit system for the outputs (Amperes)
-  UnitTemp_in_cgs:     1  # Unit system for the outputs (Kelvin)
+  UnitMass_in_cgs:     1  # (Optional) Unit system for the outputs (Grams)
+  UnitLength_in_cgs:   1  # (Optional) Unit system for the outputs (Centimeters)
+  UnitVelocity_in_cgs: 1  # (Optional) Unit system for the outputs (Centimeters per second)
+  UnitCurrent_in_cgs:  1  # (Optional) Unit system for the outputs (Amperes)
+  UnitTemp_in_cgs:     1  # (Optional) Unit system for the outputs (Kelvin)
 
 # Parameters governing the conserved quantities statistics
 Statistics: