diff --git a/bin/PokeMudry.class b/bin/PokeMudry.class
index 4e0a6c6..14a5d47 100644
Binary files a/bin/PokeMudry.class and b/bin/PokeMudry.class differ
diff --git a/bin/Screen/ScreenBattle.class b/bin/Screen/ScreenBattle.class
index 50dd8e6..317f134 100644
Binary files a/bin/Screen/ScreenBattle.class and b/bin/Screen/ScreenBattle.class differ
diff --git a/bin/Screen/ScreenMap$Door.class b/bin/Screen/ScreenMap$Door.class
index 415433e..51a9e4a 100644
Binary files a/bin/Screen/ScreenMap$Door.class and b/bin/Screen/ScreenMap$Door.class differ
diff --git a/bin/Screen/ScreenMap.class b/bin/Screen/ScreenMap.class
index 6d9713b..a882904 100644
Binary files a/bin/Screen/ScreenMap.class and b/bin/Screen/ScreenMap.class differ
diff --git a/bin/Screen/ScreenPlayer.class b/bin/Screen/ScreenPlayer.class
index 6b981b7..facd3c4 100644
Binary files a/bin/Screen/ScreenPlayer.class and b/bin/Screen/ScreenPlayer.class differ
diff --git a/bin/testHER.class b/bin/testHER.class
index e75eec4..0c42db0 100644
Binary files a/bin/testHER.class and b/bin/testHER.class differ
diff --git a/src/PokeMudry.java b/src/PokeMudry.java
index 0b46f85..a777dca 100644
--- a/src/PokeMudry.java
+++ b/src/PokeMudry.java
@@ -1,26 +1,44 @@
+import Screen.ScreenPlayer;
 import ch.hevs.gdx2d.desktop.PortableApplication;
 import ch.hevs.gdx2d.lib.GdxGraphics;
 
-public class PokeMudry extends PortableApplication{
+public class PokeMudry extends PortableApplication {
     public final boolean ANDROID = false;
     public final int PLAYERS = 1;
     public static final int TIME = 10; // number of minutes for kill all enemy
 
-    /*
+    private ScreenPlayer screenPlayer = new ScreenPlayer();
+
+    
     public static void main(String[] args) {
-        
+        new PokeMudry();
     }
-    */
+
+    PokeMudry(){
+        super(1000, 800);
+    }
+    
 
     @Override
     public void onInit() {
-        // TODO Auto-generated method stub
-        
+        screenPlayer.init();
     }
 
     @Override
     public void onGraphicRender(GdxGraphics g) {
-        // TODO Auto-generated method stub
-        
+        screenPlayer.render(g);
+    }
+
+
+    //key gestion
+    @Override
+    public void onKeyDown(int keycode) {
+        screenPlayer.screenManager.getActiveScreen().onKeyDown(keycode);
+        super.onKeyDown(keycode);
+    }
+    @Override
+    public void onKeyUp(int keycode) {
+        screenPlayer.screenManager.getActiveScreen().onKeyUp(keycode);
+        super.onKeyUp(keycode);
     }
 }
diff --git a/src/Screen/ScreenBattle.java b/src/Screen/ScreenBattle.java
index 436c294..647cd2e 100644
--- a/src/Screen/ScreenBattle.java
+++ b/src/Screen/ScreenBattle.java
@@ -1,19 +1,13 @@
 package Screen;
 
 import ch.hevs.gdx2d.components.screen_management.RenderingScreen;
-import ch.hevs.gdx2d.desktop.PortableApplication;
 import ch.hevs.gdx2d.lib.GdxGraphics;
-
-import java.io.File;
-
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.files.FileHandle;
 import com.badlogic.gdx.graphics.Color;
 import com.badlogic.gdx.graphics.g2d.BitmapFont;
 import com.badlogic.gdx.graphics.g2d.freetype.FreeTypeFontGenerator;
-import com.badlogic.gdx.graphics.g2d.freetype.FreeType.Bitmap;
 import com.badlogic.gdx.graphics.g2d.freetype.FreeTypeFontGenerator.FreeTypeFontParameter;
-import com.badlogic.gdx.utils.Align;
 
 public class ScreenBattle extends RenderingScreen{
 
diff --git a/src/Screen/ScreenMap.java b/src/Screen/ScreenMap.java
index 9c70f2b..8012e55 100644
--- a/src/Screen/ScreenMap.java
+++ b/src/Screen/ScreenMap.java
@@ -17,9 +17,10 @@ import com.badlogic.gdx.maps.tiled.renderers.OrthogonalTiledMapRenderer;
 import com.badlogic.gdx.math.Vector2;
 
 import Entity.Player;
+import ch.hevs.gdx2d.components.screen_management.RenderingScreen;
 import ch.hevs.gdx2d.lib.GdxGraphics;
 
-public class ScreenMap {
+public class ScreenMap extends RenderingScreen{
 
 	// tiles management
 	private Vector<TiledMapTileLayer> tiledLayer = new Vector<>();
@@ -40,7 +41,8 @@ public class ScreenMap {
 		tMapRenderer.put(name,new OrthogonalTiledMapRenderer(tm));
 	}
 
-    public void init() {
+    @Override
+    public void onInit() {
 		// Set initial zoom
 		zoom = 1;
 
@@ -50,7 +52,8 @@ public class ScreenMap {
 		createMap("desert");
 	}
 
-    public void graphicRender(GdxGraphics g, Player p) {
+    @Override
+    public void onGraphicRender(GdxGraphics g) {
 
         tiledLayer.clear();
 		for (int i = 0; i < 50; i++) {
@@ -68,7 +71,7 @@ public class ScreenMap {
 
 		// Camera follows the hero
 		g.zoom(zoom);
-		g.moveCamera(p.getPosition().x, p.getPosition().y, width * tileWidth, height * tileHeight);
+		//g.moveCamera(player.getPosition().x, player.getPosition().y, width * tileWidth, height * tileHeight);
         
 		// Render the tileMap
 		tMapRenderer.get(map).setView(g.getCamera());
@@ -77,6 +80,7 @@ public class ScreenMap {
 		g.drawFPS();
 	}
 
+
     public Vector<TiledMapTile> getTile(Vector2 position, int offsetX, int offsetY) {
         Vector<TiledMapTile> tiles = new Vector<>();
         for (TiledMapTileLayer tl : tiledLayer) {
diff --git a/src/Screen/ScreenPlayer.java b/src/Screen/ScreenPlayer.java
index 16d0af0..ce5fde5 100644
--- a/src/Screen/ScreenPlayer.java
+++ b/src/Screen/ScreenPlayer.java
@@ -1,17 +1,26 @@
 package Screen;
 
+import Entity.Player;
+import ch.hevs.gdx2d.lib.GdxGraphics;
 import ch.hevs.gdx2d.lib.ScreenManager;
 
 public class ScreenPlayer {
-    private ScreenManager screenManager;
-    private ScreenMap screenMap;
-    private ScreenBattle screenBattle;
+    public ScreenManager screenManager = new ScreenManager();
+
+    private Player player;
 
     public void init(){
+        
+        player = new Player(8, 15);
+
+
+        screenManager.registerScreen(ScreenMap.class);
+        screenManager.registerScreen(ScreenBattle.class);
 
     }
 
-    public void render(){
+    public void render(GdxGraphics g){
+        screenManager.render(g);
         
     }
 }