diff --git a/src/main/java/model/FirefighterBoard.java b/src/main/java/model/FirefighterBoard.java
index e8989d50b10bee48f8bf3bb17ad3948bf6373f42..2978c8f2c120ac8c6591b9da9b15d52ed90180c3 100644
--- a/src/main/java/model/FirefighterBoard.java
+++ b/src/main/java/model/FirefighterBoard.java
@@ -63,6 +63,9 @@ public class FirefighterBoard implements Board<List<ModelElement>> {
 
   public List<Position> updateToNextGeneration() {
 
+    List<Position> modifiedElements;
+    modifiedElements = fireFighters.firefighterPositions;
+
     fireFighters.nextMove();
     //System.out.println(fireFighters.firefighterPositions);
 
@@ -77,13 +80,13 @@ public class FirefighterBoard implements Board<List<ModelElement>> {
       fire.nextMove();
 
     step++;
-    List<Position> result = new ArrayList<>();
 
-    result.addAll(fire.firePositions);
-    result.addAll(fireFighters.firefighterPositions);
-    result.addAll(cloud.cloudPositions);
 
-    return result;
+    modifiedElements.addAll(fire.firePositions);
+    modifiedElements.addAll(fireFighters.firefighterPositions);
+    modifiedElements.addAll(cloud.cloudPositions);
+
+    return modifiedElements;
   }
 
   @Override
diff --git a/src/main/java/view/FirefighterGrid.java b/src/main/java/view/FirefighterGrid.java
index a4306b3f80d321a4af6a890c6e1f9328e5ae23bc..e1ab0d72f19361200d9de198ace59b3cdca96065 100644
--- a/src/main/java/view/FirefighterGrid.java
+++ b/src/main/java/view/FirefighterGrid.java
@@ -19,18 +19,18 @@ public class FirefighterGrid extends Canvas implements Grid<ViewElement>{
 
     @Override
     public void repaint(List<Pair<Position, ViewElement>> positionedElements) {
-        clear();
+        clear(positionedElements);
         paint(positionedElements);
         paintLines();
     }
-    /*
+
     private void clear(List<Pair<Position, ViewElement>> positionedElements) {
         for (Pair<Position, ViewElement> positionElement : positionedElements) {
             Position position = positionElement.getKey();
             clearSquare(position.row(), position.column());
         }
     }
-     */
+
 
     private void paint(List<Pair<Position, ViewElement>> positionedElements) {
         for(Pair<Position, ViewElement> pair : positionedElements){
@@ -91,9 +91,9 @@ public class FirefighterGrid extends Canvas implements Grid<ViewElement>{
         getGraphicsContext2D().setFill(color);
         getGraphicsContext2D().fillRect(row*squareHeight,column*squareWidth,squareHeight,squareWidth);
     }
-    /*
+
     private void clearSquare(int row, int column){
         getGraphicsContext2D().clearRect(row*squareHeight,column*squareWidth,squareHeight,squareWidth);
     }
-     */
+
 }
\ No newline at end of file