diff --git a/src/main/java/model/Fire.java b/src/main/java/model/Fire.java
index 16cc16978dd0c4120604c379646f9c78f3e7f0ae..648fdf72a73ee3e6a4f787444305dfc5381a189d 100644
--- a/src/main/java/model/Fire.java
+++ b/src/main/java/model/Fire.java
@@ -16,5 +16,7 @@ public class Fire {
         this.firePositions = postion;
     }
 
-
+    public Position getFirePosition() {
+        return firePositions;
+    }
 }
diff --git a/src/main/java/model/FireFighter.java b/src/main/java/model/FireFighter.java
index b377c42abd07bba82cd4d241d5d88d9f2b83bc87..96d9f7f95fca884f083d2ba55762b172cde5dd6d 100644
--- a/src/main/java/model/FireFighter.java
+++ b/src/main/java/model/FireFighter.java
@@ -18,6 +18,7 @@ public class FireFighter {
         this.FireFighterPosition = postion;
     }
 
-
-
+    public Position getFireFighterPosition() {
+        return FireFighterPosition;
+    }
 }
diff --git a/src/main/java/model/FirefighterBoard.java b/src/main/java/model/FirefighterBoard.java
index 94e52d54583aae417fcd89f97e3a512b61a6c820..5627c7c26674dcd2a47bfbe57eb3a8e90d349761 100644
--- a/src/main/java/model/FirefighterBoard.java
+++ b/src/main/java/model/FirefighterBoard.java
@@ -57,11 +57,15 @@ public class FirefighterBoard implements Board<List<ModelElement>> {
   @Override
   public List<ModelElement> getState(Position position) {
     List<ModelElement> result = new ArrayList<>();
-    for (Position firefighterPosition : firefighterPositions)
-      if (firefighterPosition.equals(position))
+    for (FireFighter firefighter : firefighter)
+      if (firefighter.getFireFighterPosition().equals(position))
         result.add(ModelElement.FIREFIGHTER);
-    if (firePositions.contains(position))
-      result.add(ModelElement.FIRE);
+
+      for(Fire fire : fire){
+        if(fire.getFirePosition().equals(position)){
+          result.add(ModelElement.FIRE);
+        }
+      }
     return result;
   }
 
@@ -86,7 +90,7 @@ public class FirefighterBoard implements Board<List<ModelElement>> {
     List<Position> modifiedPositions = new ArrayList<>();
     if (step % 2 == 0) {
       List<Position> newFirePositions = new ArrayList<>();
-      for (Position fire : firePositions) {
+      for (Fire fire : fires) {
         newFirePositions.addAll(neighbors.get(fire));
       }
       firePositions.addAll(newFirePositions);