diff --git a/src/main/java/model/ModelElement.java b/src/main/java/model/ModelElement.java
index fa0297c53fa8e6c9d2f87bcfa835e466980fb715..84c78103e16e51f6207e0bf69de9d1a3cc4b5280 100644
--- a/src/main/java/model/ModelElement.java
+++ b/src/main/java/model/ModelElement.java
@@ -2,5 +2,5 @@ package model;
 
 //this class represents two types of constant Firefighter or fire
 public enum ModelElement {
-  FIREFIGHTER, FIRE ,
+  FIREFIGHTER, FIRE ,NOT
 }
diff --git a/src/main/java/newmodel/Fboard.java b/src/main/java/newmodel/Fboard.java
index 853728fe44364c439e42b15c9af5395c70f32310..efd4721c3a079f0908d2ca314cd72feed50f37d5 100644
--- a/src/main/java/newmodel/Fboard.java
+++ b/src/main/java/newmodel/Fboard.java
@@ -36,9 +36,11 @@ public class Fboard {
             }
         }
         for(item item : items){
+            // Remove Extinguished position from the results
             if(item.getID()==0){
                 result.addAll(item.update(this));
             }
+
         }
         step++;
         return result;
@@ -64,15 +66,15 @@ public class Fboard {
         }
     }
 
+    // A revoir
     public Fire getFire() {
         Fire x = null;
         for (item e : items) {
             if (e.getID() == 1) {
-                x = (Fire) e;
-                break;
+                return (Fire) e;
             }
         }
-        return x;
+        return (Fire) items.get(0);
     }
     public List<Position> neighbors(Position position) {
         List<Position> list = new ArrayList<>();
@@ -103,17 +105,14 @@ public class Fboard {
         return position;
     }
 
-
+// A revoir
     public List<ModelElement> getState(Position position){
         List<ModelElement> result = new ArrayList<>();
         for (item e :items) {
             if (e.getPositions().contains(position) && e.getID() == 1) {
                 result.add(e.getState());
             }
-        }
-
-            for (item e :items) {
-                if (e.getPositions().contains(position) && e.getID() == 0) {
+            if (e.getPositions().contains(position) && e.getID() == 0) {
                 result.add(e.getState());
             }
         }
diff --git a/src/main/java/newmodel/Fire.java b/src/main/java/newmodel/Fire.java
index 5bf9ef0aa4c4d377b443938ba450f881f39ef95d..b9cfad73b941b6263328addef30a1787a5f918b2 100644
--- a/src/main/java/newmodel/Fire.java
+++ b/src/main/java/newmodel/Fire.java
@@ -10,7 +10,7 @@ public class Fire implements item {
     private final int initialFireCount;
 
     private List<Position> firePositions;
-    private final ModelElement state;
+    private ModelElement state;
     private final Random randomGenerator = new Random();
 
     private final int ID=1;
diff --git a/src/main/java/newmodel/FireFighter.java b/src/main/java/newmodel/FireFighter.java
index 2ca97a898347317a7955272bdf09a0a2bd617466..91a74d3e5c3bdad5171c34a8b476245348ca7d46 100644
--- a/src/main/java/newmodel/FireFighter.java
+++ b/src/main/java/newmodel/FireFighter.java
@@ -7,7 +7,7 @@ import java.util.Random;
 
 
 public class FireFighter extends Extinguisher {
-    private final ModelElement state;
+    private ModelElement state;
     private List<Position> firefighterPositions;
     private final Random randomGenerator = new Random();