diff --git a/src/main/java/model/Fire.java b/src/main/java/model/Fire.java
index 4e4693f81e9062066a3c641356706400188bf6f1..52ca6554d2723448fa82efa1a5afd6241517a6fc 100644
--- a/src/main/java/model/Fire.java
+++ b/src/main/java/model/Fire.java
@@ -10,4 +10,11 @@ public class Fire {
     public Fire(Position position){
           this.firePositions = position;
     }
+    public Position getFirePositions(){
+        return this.firePositions;
+
+    }
+    public void setFirePositions(Position firePositions){
+        this.firePositions = firePositions;
+    }
 }
diff --git a/src/main/java/model/FireFighter.java b/src/main/java/model/FireFighter.java
index bd80252585f2b5dcca8a646813b8f96c16d9a0fa..96ccf72945b1500d319e723865aa3870ee105350 100644
--- a/src/main/java/model/FireFighter.java
+++ b/src/main/java/model/FireFighter.java
@@ -10,6 +10,13 @@ public class FireFighter {
 
     public FireFighter(Position firefighterPositions) {
         this.firefighterPositions = firefighterPositions;
+
     }
 
+    public void setFirefighterPositions(Position firefighterPositions) {
+            this.firefighterPositions = firefighterPositions;
+    }
+    public Position getFirefighterPositions() {
+        return firefighterPositions;
+    }
 }
diff --git a/src/main/java/model/FirefighterBoard.java b/src/main/java/model/FirefighterBoard.java
index 9c552466b714544d8c209dc4e6d44206206f95b5..b0f46a915b51ad68f585dc6ca9dd830a6e9005e5 100644
--- a/src/main/java/model/FirefighterBoard.java
+++ b/src/main/java/model/FirefighterBoard.java
@@ -43,9 +43,9 @@ public class FirefighterBoard implements Board<List<ModelElement>> {
     firefighter= new ArrayList<>();
     fire = new HashSet<>();
     for (int index = 0; index < initialFireCount; index++)
-      fire.add(randomPosition());
+      fire.add(new Fire(randomPosition()));
     for (int index = 0; index < initialFirefighterCount; index++)
-      firefighter.add(randomPosition());
+      firefighter.add(new FireFighter(randomPosition()));
   }
 
   private Position randomPosition() {
@@ -55,10 +55,10 @@ 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.getFirefighterPositions().equals(position))
         result.add(ModelElement.FIREFIGHTER);
-    if (firePositions.contains(position))
+    if (fire.contains(position))
       result.add(ModelElement.FIRE);
     return result;
   }