diff --git a/src/main/java/model/FirefighterBoard.java b/src/main/java/model/FirefighterBoard.java
index 2978c8f2c120ac8c6591b9da9b15d52ed90180c3..ca2bd264f8d379f9d1c0c8d43ef7abd76ebbc5e5 100644
--- a/src/main/java/model/FirefighterBoard.java
+++ b/src/main/java/model/FirefighterBoard.java
@@ -63,8 +63,10 @@ public class FirefighterBoard implements Board<List<ModelElement>> {
 
   public List<Position> updateToNextGeneration() {
 
-    List<Position> modifiedElements;
-    modifiedElements = fireFighters.firefighterPositions;
+    List<Position> modifiedElements = new ArrayList<>();
+    modifiedElements.addAll(fire.firePositions);
+    modifiedElements.addAll(fireFighters.firefighterPositions);
+    modifiedElements.addAll(cloud.cloudPositions);
 
     fireFighters.nextMove();
     //System.out.println(fireFighters.firefighterPositions);
@@ -81,7 +83,6 @@ public class FirefighterBoard implements Board<List<ModelElement>> {
 
     step++;
 
-
     modifiedElements.addAll(fire.firePositions);
     modifiedElements.addAll(fireFighters.firefighterPositions);
     modifiedElements.addAll(cloud.cloudPositions);