diff --git a/src/main/java/model/Element.java b/src/main/java/model/Element.java
index c1997df13df8cf0961a5ca7abcb27d30b96f52d9..5ef68d799db4ed6d4f2bbca3eee2659fde236b17 100644
--- a/src/main/java/model/Element.java
+++ b/src/main/java/model/Element.java
@@ -7,18 +7,17 @@ import java.util.Random;
 
 public abstract class Element {
     protected Position position;
-    public void initializeElements() {}
+
     private Position randomPosition() {}
-    public List<ModelElement> getState(Position position) {}
+    public List<State> getState(Position position) {}//????????????
     public List<Position> updateToNextGeneration() {}
-    private List<Position> updateFires() {}
     private List<Position> neighbors(Position position) {}
     private Position neighborClosestToFire(Position position) {}
-    public void setState(List<ModelElement> state, Position position) {}
+
     private List<Position> updatePosition();
 
     private List<Position> getPosition();
-    private List<Position> setPosition();
+    private void setPosition();
 
 
 
diff --git a/src/main/java/model/FireFighter.java b/src/main/java/model/FireFighter.java
index 11b879fdf2ff39885f1cdc646f87a491c3da77de..8121da07f08c632d94936413e640cd022c2c4feb 100644
--- a/src/main/java/model/FireFighter.java
+++ b/src/main/java/model/FireFighter.java
@@ -5,7 +5,11 @@ import util.Position;
 import java.util.List;
 import java.util.Set;
 
-public class Firefighter extends Element implements Extinguish {
+public class FireFighter extends Element implements Extinguish {
 
+    @Override
+    public void action() {
+
+    }
 }
 
diff --git a/src/main/java/model/FirefighterBoard.java b/src/main/java/model/FirefighterBoard.java
index ee29f18e646c61610d400afa8d6fe98b567f0795..ae9e565a3060f0bbf02129de49990d2166efabd5 100644
--- a/src/main/java/model/FirefighterBoard.java
+++ b/src/main/java/model/FirefighterBoard.java
@@ -86,6 +86,7 @@ public class FirefighterBoard implements Board<List<ModelElement>> {
   private List<Position> updateFirefighters() {// linh cuu hoa chia ra de dap lua
     List<Position> result = new ArrayList<>();
     List<Position> firefighterNewPositions = new ArrayList<>();
+
     for (Position firefighterPosition : firefighterPositions) {
       Position newFirefighterPosition = neighborClosestToFire(firefighterPosition);// linh ra den cho gan nhat co lua
       firefighterNewPositions.add(newFirefighterPosition);// cap nhat vi tri moi cua linh cuu hoa