diff --git a/src/main/java/controller/Controller.java b/src/main/java/controller/Controller.java
index 2a60897c6eb8ba847cb8589840c16a0f175ce0a3..2698f726020f1aa8f9bf8a9ecb9931f42b47bc40 100644
--- a/src/main/java/controller/Controller.java
+++ b/src/main/java/controller/Controller.java
@@ -16,8 +16,7 @@ import model.Board;
 import model.ModelElement;
 import model.FirefighterBoard;
 import util.Position;
-import view.Grid;
-import view.ViewElement;
+import view.*;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -83,12 +82,12 @@ public class Controller {
 
   private ViewElement getViewElement(List<ModelElement> squareState) {
     if(squareState.contains(ModelElement.FIREFIGHTER)){
-      return ViewElement.FIREFIGHTER;
+      return new FIREFIGHTER();
     }
     if (squareState.contains(ModelElement.FIRE)){
-      return ViewElement.FIRE;
+      return new FIRE();
     }
-    return ViewElement.EMPTY;
+    return new EMPTY();
   }
 
   private void initializeTimeline() {
diff --git a/src/main/java/model/Fire.java b/src/main/java/model/Fire.java
index f4b6d974f40945ae156f7e973e3c913a8c6793af..b3f769ccdca7d39a80be3855c7ee9247cb8dd56c 100644
--- a/src/main/java/model/Fire.java
+++ b/src/main/java/model/Fire.java
@@ -1,4 +1,6 @@
 package model;
 
 public class Fire {
+
+
 }
diff --git a/src/main/java/model/FireFighter.java b/src/main/java/model/FireFighter.java
index 0fa67d3f0d27114c58060aa4880775136d3e613f..a8991f4f30dd9ee4f8fc8afabd7b1ef525eb06d5 100644
--- a/src/main/java/model/FireFighter.java
+++ b/src/main/java/model/FireFighter.java
@@ -1,4 +1,6 @@
 package model;
 
 public class FireFighter {
+
+
 }
diff --git a/src/main/java/view/EMPTY.java b/src/main/java/view/EMPTY.java
new file mode 100644
index 0000000000000000000000000000000000000000..634423ecc762c904932a893e424a01d46da00a0d
--- /dev/null
+++ b/src/main/java/view/EMPTY.java
@@ -0,0 +1,10 @@
+package view;
+
+import javafx.scene.paint.Color;
+
+public class EMPTY implements ViewElement {
+    @Override
+    public Color getColor() {
+        return Color.WHITE;
+    }
+}
diff --git a/src/main/java/view/FIRE.java b/src/main/java/view/FIRE.java
new file mode 100644
index 0000000000000000000000000000000000000000..f66b7f3e3d70e9b368211ab09ccc71987196e6fc
--- /dev/null
+++ b/src/main/java/view/FIRE.java
@@ -0,0 +1,10 @@
+package view;
+
+import javafx.scene.paint.Color;
+
+public class FIRE  implements ViewElement {
+    @Override
+    public Color getColor() {
+        return Color.RED;
+    }
+}
diff --git a/src/main/java/view/FIREFIGHTER.java b/src/main/java/view/FIREFIGHTER.java
new file mode 100644
index 0000000000000000000000000000000000000000..eb56dad97d1663d90f48a544764413b9dcc802d4
--- /dev/null
+++ b/src/main/java/view/FIREFIGHTER.java
@@ -0,0 +1,10 @@
+package view;
+
+import javafx.scene.paint.Color;
+
+public class FIREFIGHTER implements ViewElement {
+    @Override
+    public Color getColor() {
+        return Color.BLUE;
+    }
+}
diff --git a/src/main/java/view/FirefighterGrid.java b/src/main/java/view/FirefighterGrid.java
index 4c9041f034ec9a4eb07ce4334de237f1e99ccdc9..031a4724f7a0ada2d7b45e06b51e9f4dacb785cd 100644
--- a/src/main/java/view/FirefighterGrid.java
+++ b/src/main/java/view/FirefighterGrid.java
@@ -10,7 +10,7 @@ import java.util.List;
 public class FirefighterGrid extends Canvas implements Grid<ViewElement>{
 
     private void paintElementAtPosition(ViewElement element, Position position) {
-        paintBox(position.row(), position.column(), element.color);
+        paintBox(position.row(), position.column(), element.getColor());
     }
     private int boxWidth;
     private int boxHeight;
diff --git a/src/main/java/view/ViewElement.java b/src/main/java/view/ViewElement.java
index ffb76112e1af543df5af41fa906082ef11be9967..d15fa5993014b7ffe1db1427965eeac20aa1af2a 100644
--- a/src/main/java/view/ViewElement.java
+++ b/src/main/java/view/ViewElement.java
@@ -2,10 +2,6 @@ package view;
 
 import javafx.scene.paint.Color;
 
-public enum ViewElement {
-  FIREFIGHTER(Color.BLUE), FIRE(Color.RED), EMPTY(Color.WHITE);
-  final Color color;
-  ViewElement(Color color) {
-    this.color = color;
-  }
+public interface ViewElement {
+ Color getColor() ;
 }