diff --git a/src/main/java/app/SimulatorApplication.java b/src/main/java/app/SimulatorApplication.java
index 8a95de536414992c4eb2f3f96a6b3f40ecd9f44a..f3f9e3853f733407ae300daa9b3d1edaea1a9587 100644
--- a/src/main/java/app/SimulatorApplication.java
+++ b/src/main/java/app/SimulatorApplication.java
@@ -17,13 +17,13 @@ public class SimulatorApplication extends javafx.application.Application {
   private static final int COLUMN_COUNT = 20;
   private static final int SQUARE_WIDTH = 50;
   private static final int SQUARE_HEIGHT = 50;
-  public static final int INITIAL_FIRE_COUNT = 1;
-  public static final int INITIAL_FIREFIGHTER_COUNT = 4;
-  public static final int INITIAL_MOTORFIREFIGHTER_COUNT = 1;
-  public static final int INITIAL_CLOUD_COUNT = 4;
-  public static final int INITIAL_MOUNTAIN_COUNT = 5;
-  public static final int INITIAL_ROAD_COUNT = 2;
-  public static final int INITIAL_ROCKERIES_COUNT = 5;
+  public static final int INITIAL_FIRE_COUNT = 10;
+  public static final int INITIAL_FIREFIGHTER_COUNT = 1;
+  public static final int INITIAL_MOTORFIREFIGHTER_COUNT = 0;
+  public static final int INITIAL_CLOUD_COUNT = 0;
+  public static final int INITIAL_MOUNTAIN_COUNT = 0;
+  public static final int INITIAL_ROAD_COUNT = 0;
+  public static final int INITIAL_ROCKERIES_COUNT = 0;
 
   private Stage primaryStage;
   private Parent view;
diff --git a/src/main/java/controller/Controller.java b/src/main/java/controller/Controller.java
index 926f018395b88bf77f74eb5ffab82b84ddd53808..57c09656d3cb18f596c8033f2a3ec14e313c493b 100644
--- a/src/main/java/controller/Controller.java
+++ b/src/main/java/controller/Controller.java
@@ -70,7 +70,7 @@ public class Controller {
     }
     grid.repaint(updatedSquares, updatedClearSquares, board);
     updateGenerationLabel(board.stepNumber());
-    //board.testScreen();
+    //board.testScreen(); //test screen debug
   }
   private void repaintGrid(){
 
diff --git a/src/main/java/model/Fire.java b/src/main/java/model/Fire.java
index 95f249337cb924ec06af036344753976046e7602..2a63ed1555b0e91f2c8b0d8289c4e41c82bf11fc 100644
--- a/src/main/java/model/Fire.java
+++ b/src/main/java/model/Fire.java
@@ -1,5 +1,6 @@
 package model;
 
+import javafx.scene.layout.HBox;
 import javafx.scene.paint.Color;
 import util.Position;
 import view.FirefighterGrid;
@@ -20,11 +21,29 @@ public class Fire implements Item{
     public List<Position> update(FirefighterBoard board) {
         ArrayList<Position> result = new ArrayList<Position>();
         List<Position> neighborslist = board.neighbors(position);
+        Box box = board.getBoxByPosition(position);;
+        Box neighborbox;
+        Item neighboritem;
+        boolean canSpread = false;
+        if (box instanceof Rockeries) {
+            canSpread = fireSpread();
+        }
         for (Position neighborposition : neighborslist) {
-            if ((board.getItemByPosition(neighborposition) == null && board.getBoxByPosition(neighborposition) == null ) || (board.getBoxByPosition(position) instanceof Rockeries && fireSpread())) {
-                board.itemList().add(new Fire(neighborposition));
-                result.add(neighborposition);
+            neighborbox = board.getBoxByPosition(neighborposition);
+            neighboritem = board.getItemByPosition(neighborposition);
+            if (neighboritem == null && (neighborbox == null || neighborbox instanceof Rockeries)){
+                if (box instanceof Rockeries ){
+                    if (canSpread){
+                        board.itemList().add(new Fire(neighborposition));
+                        result.add(neighborposition);
+                    }
+
+                } else {
+                    board.itemList().add(new Fire(neighborposition));
+                    result.add(neighborposition);
+                }
             }
+
         }
         return result;
     }
diff --git a/src/main/java/model/Firefighter.java b/src/main/java/model/Firefighter.java
index dd1459d10dd4599e3b3a5caa6668b6adda17c49b..48ab4868b6c1f74ea86931eeb8f117f5d54e1492 100644
--- a/src/main/java/model/Firefighter.java
+++ b/src/main/java/model/Firefighter.java
@@ -33,7 +33,8 @@ public class Firefighter extends Extinguisher implements Item{
                 return result;
             }
             for (Position adjacent : board.neighbors(current)) {
-                if (seen.contains(adjacent)) continue;
+                System.out.println(board.getItemByPosition(adjacent));
+                if (seen.contains(adjacent) || board.getItemByPosition(adjacent) != null || board.getBoxByPosition(adjacent) instanceof Mountain) continue;
                 toVisit.add(adjacent);
                 seen.add(adjacent);
                 firstMove.put(adjacent, firstMove.get(current));
diff --git a/src/main/java/model/FirefighterBoard.java b/src/main/java/model/FirefighterBoard.java
index 67f271297606a5aef64fce4f2a846b4fb0e7bf5c..bc5745bfcc0ed5ebabe40dd20a2efdc4d9d79ff9 100644
--- a/src/main/java/model/FirefighterBoard.java
+++ b/src/main/java/model/FirefighterBoard.java
@@ -147,7 +147,7 @@ public class FirefighterBoard implements Board {
   public void testScreen(){
     Position position;
 
-    //System.out.println(itemList.toString());
+    System.out.println(itemList.toString());
 
     for (int row = 0; row < rowCount; row++){
       for (int column = 0; column < columnCount; column++){