diff --git a/cara/model_scenarios_IGH_paper.py b/cara/model_scenarios_IGH_paper.py
index dcded637..5acc598b 100644
--- a/cara/model_scenarios_IGH_paper.py
+++ b/cara/model_scenarios_IGH_paper.py
@@ -888,6 +888,116 @@ classroom_model_IGH_with_mask_2windows_open_alltimes_winter_2HEPA = [MCExposureM
 
 ######
 
+classroom_model_IGH_no_mask_windows_open_breaks_endOfClass = [MCExposureModel(
+    concentration_model=MCConcentrationModel(
+        room=models.Room(volume=160),
+        ventilation=models.SlidingWindow(
+            active=models.SpecificInterval(((0.75, 0.92), (1.5, 2), (2.75, 2.92), (3.5, 4.5), (5.25, 5.42), (6, 6.5), (7.25, 7.42))),
+            inside_temp=models.PiecewiseConstant((0, 24), (295,)),
+            outside_temp=models.PiecewiseConstant((0, 24), (291,)),
+            window_height=1.6, opening_length=0.6,
+        ),
+        infected=MCInfectedPopulation(
+            number=1,
+            presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))),
+            masked=False,
+            virus=MCVirus(halflife=1.1, qID=qid),
+            expiratory_activity=2,
+            samples=200000,
+            breathing_category=3,
+        )
+    ),
+    exposed=models.Population(
+        number=19,
+        presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))),
+        activity=models.Activity.types['Seated'],
+        mask=models.Mask.types['No mask']
+    )
+)for qid in (100, 60)]
+
+classroom_model_IGH_no_mask_2windows_open_breaks_endOfClass = [MCExposureModel(
+    concentration_model=MCConcentrationModel(
+        room=models.Room(volume=160),
+        ventilation=models.SlidingWindow(
+            active=models.SpecificInterval(((0.75, 0.92), (1.5, 2), (2.75, 2.92), (3.5, 4.5), (5.25, 5.42), (6, 6.5), (7.25, 7.42))),
+            inside_temp=models.PiecewiseConstant((0, 24), (295,)),
+            outside_temp=models.PiecewiseConstant((0, 24), (291,)),
+            window_height=1.6, opening_length=2*0.6,
+        ),
+        infected=MCInfectedPopulation(
+            number=1,
+            presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))),
+            masked=False,
+            virus=MCVirus(halflife=1.1, qID=qid),
+            expiratory_activity=2,
+            samples=200000,
+            breathing_category=3,
+        )
+    ),
+    exposed=models.Population(
+        number=19,
+        presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))),
+        activity=models.Activity.types['Seated'],
+        mask=models.Mask.types['No mask']
+    )
+)for qid in (100, 60)]
+
+classroom_model_IGH_no_mask_windows_open_breaks_endOfClass_winter = [MCExposureModel(
+    concentration_model=MCConcentrationModel(
+        room=models.Room(volume=160),
+        ventilation=models.SlidingWindow(
+            active=models.SpecificInterval(((0.75, 0.92), (1.5, 2), (2.75, 2.92), (3.5, 4.5), (5.25, 5.42), (6, 6.5), (7.25, 7.42))),
+            inside_temp=models.PiecewiseConstant((0, 24), (295,)),
+            outside_temp=models.PiecewiseConstant((0, 24), (278,)),
+            window_height=1.6, opening_length=0.6,
+        ),
+        infected=MCInfectedPopulation(
+            number=1,
+            presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))),
+            masked=False,
+            virus=MCVirus(halflife=6.43, qID=qid),
+            expiratory_activity=2,
+            samples=200000,
+            breathing_category=3,
+        )
+    ),
+    exposed=models.Population(
+        number=19,
+        presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))),
+        activity=models.Activity.types['Seated'],
+        mask=models.Mask.types['No mask']
+    )
+)for qid in (100, 60)]
+
+classroom_model_IGH_no_mask_2windows_open_breaks_endOfClass_winter = [MCExposureModel(
+    concentration_model=MCConcentrationModel(
+        room=models.Room(volume=160),
+        ventilation=models.SlidingWindow(
+            active=models.SpecificInterval(((0.75, 0.92), (1.5, 2), (2.75, 2.92), (3.5, 4.5), (5.25, 5.42), (6, 6.5), (7.25, 7.42))),
+            inside_temp=models.PiecewiseConstant((0, 24), (295,)),
+            outside_temp=models.PiecewiseConstant((0, 24), (278,)),
+            window_height=1.6, opening_length=2*0.6,
+        ),
+        infected=MCInfectedPopulation(
+            number=1,
+            presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))),
+            masked=False,
+            virus=MCVirus(halflife=6.43, qID=qid),
+            expiratory_activity=2,
+            samples=200000,
+            breathing_category=3,
+        )
+    ),
+    exposed=models.Population(
+        number=19,
+        presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))),
+        activity=models.Activity.types['Seated'],
+        mask=models.Mask.types['No mask']
+    )
+)for qid in (100, 60)]
+
+
+
 classroom_model_IGH_no_mask_2windows_open_breaks_winter_bis = [MCExposureModel(
     concentration_model=MCConcentrationModel(
         room=models.Room(volume=160),
@@ -1008,114 +1118,6 @@ classroom_model_IGH_with_mask_2windows_open_breaks_winter_2HEPA = [MCExposureMod
     )
 )for qid in (100, 60)]
 
-classroom_model_IGH_no_mask_windows_open_breaks_endOfClass = [MCExposureModel(
-    concentration_model=MCConcentrationModel(
-        room=models.Room(volume=160),
-        ventilation=models.SlidingWindow(
-            active=models.SpecificInterval(((0.75, 0.92), (1.5, 2), (2.75, 2.92), (3.5, 4.5), (5.25, 5.42), (6, 6.5), (7.25, 7.42))),
-            inside_temp=models.PiecewiseConstant((0, 24), (295,)),
-            outside_temp=models.PiecewiseConstant((0, 24), (291,)),
-            window_height=1.6, opening_length=0.6,
-        ),
-        infected=MCInfectedPopulation(
-            number=1,
-            presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))),
-            masked=False,
-            virus=MCVirus(halflife=1.1, qID=qid),
-            expiratory_activity=2,
-            samples=200000,
-            breathing_category=3,
-        )
-    ),
-    exposed=models.Population(
-        number=19,
-        presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))),
-        activity=models.Activity.types['Seated'],
-        mask=models.Mask.types['No mask']
-    )
-)for qid in (100, 60)]
-
-classroom_model_IGH_no_mask_2windows_open_breaks_endOfClass = [MCExposureModel(
-    concentration_model=MCConcentrationModel(
-        room=models.Room(volume=160),
-        ventilation=models.SlidingWindow(
-            active=models.SpecificInterval(((0.75, 0.92), (1.5, 2), (2.75, 2.92), (3.5, 4.5), (5.25, 5.42), (6, 6.5), (7.25, 7.42))),
-            inside_temp=models.PiecewiseConstant((0, 24), (295,)),
-            outside_temp=models.PiecewiseConstant((0, 24), (291,)),
-            window_height=1.6, opening_length=2*0.6,
-        ),
-        infected=MCInfectedPopulation(
-            number=1,
-            presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))),
-            masked=False,
-            virus=MCVirus(halflife=1.1, qID=qid),
-            expiratory_activity=2,
-            samples=200000,
-            breathing_category=3,
-        )
-    ),
-    exposed=models.Population(
-        number=19,
-        presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))),
-        activity=models.Activity.types['Seated'],
-        mask=models.Mask.types['No mask']
-    )
-)for qid in (100, 60)]
-
-classroom_model_IGH_no_mask_windows_open_breaks_endOfClass_winter = [MCExposureModel(
-    concentration_model=MCConcentrationModel(
-        room=models.Room(volume=160),
-        ventilation=models.SlidingWindow(
-            active=models.SpecificInterval(((0.75, 0.92), (1.5, 2), (2.75, 2.92), (3.5, 4.5), (5.25, 5.42), (6, 6.5), (7.25, 7.42))),
-            inside_temp=models.PiecewiseConstant((0, 24), (295,)),
-            outside_temp=models.PiecewiseConstant((0, 24), (278,)),
-            window_height=1.6, opening_length=0.6,
-        ),
-        infected=MCInfectedPopulation(
-            number=1,
-            presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))),
-            masked=False,
-            virus=MCVirus(halflife=6.43, qID=qid),
-            expiratory_activity=2,
-            samples=200000,
-            breathing_category=3,
-        )
-    ),
-    exposed=models.Population(
-        number=19,
-        presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))),
-        activity=models.Activity.types['Seated'],
-        mask=models.Mask.types['No mask']
-    )
-)for qid in (100, 60)]
-
-classroom_model_IGH_no_mask_2windows_open_breaks_endOfClass_winter = [MCExposureModel(
-    concentration_model=MCConcentrationModel(
-        room=models.Room(volume=160),
-        ventilation=models.SlidingWindow(
-            active=models.SpecificInterval(((0.75, 0.92), (1.5, 2), (2.75, 2.92), (3.5, 4.5), (5.25, 5.42), (6, 6.5), (7.25, 7.42))),
-            inside_temp=models.PiecewiseConstant((0, 24), (295,)),
-            outside_temp=models.PiecewiseConstant((0, 24), (278,)),
-            window_height=1.6, opening_length=2*0.6,
-        ),
-        infected=MCInfectedPopulation(
-            number=1,
-            presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))),
-            masked=False,
-            virus=MCVirus(halflife=6.43, qID=qid),
-            expiratory_activity=2,
-            samples=200000,
-            breathing_category=3,
-        )
-    ),
-    exposed=models.Population(
-        number=19,
-        presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))),
-        activity=models.Activity.types['Seated'],
-        mask=models.Mask.types['No mask']
-    )
-)for qid in (100, 60)]
-
 classroom_model_IGH_with_mask_windows_open_breaks_endOfClass = [MCExposureModel(
     concentration_model=MCConcentrationModel(
         room=models.Room(volume=160),