diff --git a/GameEngine/src/main/java/gameEngine/scenes/EditorScene.java b/GameEngine/src/main/java/gameEngine/scenes/EditorScene.java
index 8b15577..3f0aac9 100644
--- a/GameEngine/src/main/java/gameEngine/scenes/EditorScene.java
+++ b/GameEngine/src/main/java/gameEngine/scenes/EditorScene.java
@@ -8,9 +8,12 @@
 import gameEngine.entites.gameComponents.Draggable;
 import gameEngine.entites.gameComponents.EntityView;
 import gameEngine.entites.gameComponents.TextMesh;
+import gameEngine.input.Input;
+import gameEngine.views.Color;
 import gameEngine.views.Window;
 import org.joml.Vector3f;
 
+import java.awt.event.KeyEvent;
 import java.util.HashMap;
 
 import static org.lwjgl.opengl.GL11.glClearColor;
@@ -21,16 +24,7 @@
     public HashMap<String, Entity> editorEntities = new HashMap<>();
     private Entity selectedEntity = null;
     public ConnectionManager connectionManager = new ConnectionManager();
-
-    public Entity getEditorEntity(String eid) {
-        return editorEntities.get(eid);
-    }
-    public void addEditorEntity(String eid, Entity entity) {
-        editorEntities.put(eid, entity);
-    }
-    public void removeEditorEntity(String eid) {
-        editorEntities.remove(eid);
-    }
+    private Color editorBackColor = new Color(1,1,1,0);
 
     public EditorScene(float windowWidth, float windowHeight){
         System.out.println("Active Editor scene");
@@ -38,13 +32,6 @@
         gameEditor.setScene(this);
         glClearColor(1, 1, 1, 0);
     }
-//    public EditorScene(HashMap<String, Entity> editorEntities){
-//        this.editorEntities = editorEntities;
-//        System.out.println("Active Editor scene");
-//        gameEditor = new GameEditor(this);
-//        gameEditor.setScene(this);
-//        glClearColor(1, 1, 1, 0);
-//    }
 
     @Override
     public void update(float dt) {
@@ -61,6 +48,17 @@
         gameEditor.update();
     }
 
+    public Entity getEditorEntity(String eid) {
+        return editorEntities.get(eid);
+    }
+    public void addEditorEntity(String eid, Entity entity) {
+        editorEntities.put(eid, entity);
+    }
+    public void removeEditorEntity(String eid) {
+        editorEntities.remove(eid);
+    }
+
+
     private GameObject createGameObject(){
         int entitiesLength = editorEntities.size();
         String newId = Integer.toString(entitiesLength);
@@ -143,4 +141,6 @@
             }
         }
     }
+
+
 }
diff --git a/GameEngine/src/main/java/gameEngine/scenes/GameScene.java b/GameEngine/src/main/java/gameEngine/scenes/GameScene.java
index e956210..defd4c6 100644
--- a/GameEngine/src/main/java/gameEngine/scenes/GameScene.java
+++ b/GameEngine/src/main/java/gameEngine/scenes/GameScene.java
@@ -3,13 +3,17 @@
 import gameEngine.entites.Entity;
 import gameEngine.entites.GameObject;
 import gameEngine.entites.gameComponents.*;
+import gameEngine.input.Input;
 
+import java.awt.event.KeyEvent;
 import java.util.HashMap;
 
 import static org.lwjgl.opengl.GL11.glClearColor;
 
 public class GameScene extends Scene {
 
+    private boolean changingScene = false;
+
     public GameScene(){
         System.out.println("Active Game scene");
         glClearColor(1, 1, 1, 0);
@@ -64,5 +68,4 @@
             }
         }
     }
-
 }
diff --git a/GameEngine/src/main/java/gameEngine/scenes/Scene.java b/GameEngine/src/main/java/gameEngine/scenes/Scene.java
index 498c236..8292421 100644
--- a/GameEngine/src/main/java/gameEngine/scenes/Scene.java
+++ b/GameEngine/src/main/java/gameEngine/scenes/Scene.java
@@ -8,7 +8,6 @@
 import gameEngine.input.Input;
 import gameEngine.views.Color;
 import gameEngine.views.Window;
-import org.joml.Vector3f;
 
 import java.awt.event.KeyEvent;
 import java.util.HashMap;
@@ -23,10 +22,9 @@
     public HashMap<String, Entity> entities = new HashMap<>();
 
     private final Queue<Runnable> taskQueue = new LinkedList<>();
-
     private boolean changingScene = false;
     private float timeToChangeScene = 2.0f;
-    private final Color editorBackColor = new Color(1,1,1,0);
+    private Color backColor = new Color(1,1,1,0);
 
     public Scene(){
     }
@@ -112,15 +110,19 @@
             changingScene = true;
         }
 
-        if(changingScene && timeToChangeScene > 0){
-            timeToChangeScene -= dt * 1.5f;
-            editorBackColor.r -= dt * 5.0f;
-            editorBackColor.g  -= dt * 5.0f;
-            editorBackColor.b  -= dt * 5.0f;
-            glClearColor(editorBackColor.r, editorBackColor.g, editorBackColor.b, editorBackColor.a);
-        }
-        else if(changingScene){
-            Window.changeScene(scene);
+        if(changingScene) {
+            if (timeToChangeScene > 0) {
+                timeToChangeScene -= dt * 1.5f;
+                backColor.r -= dt * 5.0f;
+                backColor.g -= dt * 5.0f;
+                backColor.b -= dt * 5.0f;
+            } else {
+                changingScene = false;
+                timeToChangeScene = 2.0f;
+                backColor = new Color(1,1,1,0);
+                Window.changeScene(scene);
+            }
+            glClearColor(backColor.r, backColor.g, backColor.b, backColor.a);
         }
     }
 }