diff --git a/src/main/java/model/Elements/Extinguisher/Cloud.java b/src/main/java/model/Elements/Extinguisher/Cloud.java
index d097e0f9c4c9c71397276dfd7701fdb7fd59970a..19524e17a42bee6a842f888c3a12cb82546d278e 100644
--- a/src/main/java/model/Elements/Extinguisher/Cloud.java
+++ b/src/main/java/model/Elements/Extinguisher/Cloud.java
@@ -30,6 +30,11 @@ public class Cloud extends Extinguisher {
 
         extinguish(firefighterBoard,newPosition);
 
+        for (Position neighbor : this.neighbour.getNeighbors().get(newPosition)) {
+            extinguish(firefighterBoard,neighbor);
+            modifiedPositions.add(neighbor);
+        }
+
         return modifiedPositions;
     }
 
diff --git a/src/main/java/model/Elements/Extinguisher/Extinguisher.java b/src/main/java/model/Elements/Extinguisher/Extinguisher.java
index 7d45c8895786bfe9bb477e8fcd27d69f7b44277f..fe39516b0dd364c8964dc91f65da0d6ed2cc2071 100644
--- a/src/main/java/model/Elements/Extinguisher/Extinguisher.java
+++ b/src/main/java/model/Elements/Extinguisher/Extinguisher.java
@@ -10,11 +10,12 @@ import util.TargetStrategy;
 import java.util.List;
 
 public abstract class Extinguisher implements model.Elements.element {
+
     protected final TargetStrategy targetStrategy = new TargetStrategy();
     protected Neighbour neighbour;
-
     protected Position position;
     protected ModelElement element;
+
     public Extinguisher(Position position){
         this.position = position;
     }
@@ -35,7 +36,6 @@ public abstract class Extinguisher implements model.Elements.element {
         if (board.getFires().containsKey(position)) {
             board.getFires().remove(position);
         }
-
     }
 
     public abstract List<Position> update(Board<List<ModelElement>> firefighterBoard);
diff --git a/src/main/java/model/Elements/Fire.java b/src/main/java/model/Elements/Fire.java
index 7de2d8460beb718d8b3b765e09c41223276cdaf5..a552a629a6916ec3507607a3880854109d7163c3 100644
--- a/src/main/java/model/Elements/Fire.java
+++ b/src/main/java/model/Elements/Fire.java
@@ -60,7 +60,7 @@ public class Fire implements element {
         return modifiedPositions;
     }
 
-    public List<Position>removeMountainAndRoads(Board<List<ModelElement>> firefighterBoard,Position position){
+    private List<Position>removeMountainAndRoads(Board<List<ModelElement>> firefighterBoard,Position position){
         List<Position>neighboursAvailable;
 
         neighboursAvailable = this.neighbour.getNeighbors().get(position);