diff --git a/core/assets/Player.png b/core/assets/Player.png
index 74b08ff..543bef7 100644
Binary files a/core/assets/Player.png and b/core/assets/Player.png differ
diff --git a/core/src/com/dungeoncrawler/control/Controller.java b/core/src/com/dungeoncrawler/control/Controller.java
index efe2720..ed10cf4 100644
--- a/core/src/com/dungeoncrawler/control/Controller.java
+++ b/core/src/com/dungeoncrawler/control/Controller.java
@@ -142,17 +142,22 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
         MapObjects objects = layers.get(0).getObjects();
         System.out.println(objects.getCount());
         
-        RectangleMapObject rectangleObject = objects.getByType(RectangleMapObject.class).get(0);
-        
-        Rectangle rectangle = rectangleObject.getRectangle();
-        
         float x = d.getPlayer().getxPos();
         float y = d.getPlayer().getyPos();
         
         d.getPlayer().update();
-        if(!Intersector.overlaps(rectangle, m.getPlayer().getBoundingRectangle())){
-            d.getPlayer().setxPos(x);
-            d.getPlayer().setyPos(y);
+        
+        System.out.println("Temp: " + x + " " + y);
+        System.out.println("Player: " + d.getPlayer().getxPos() + " " + d.getPlayer().getyPos());
+        
+        for(RectangleMapObject rectangleObject : objects.getByType(RectangleMapObject.class)){
+            Rectangle rectangle = rectangleObject.getRectangle();
+            
+            if(Intersector.overlaps(rectangle, m.getPlayer().getBoundingRectangle())){
+                d.getPlayer().setxPos(x);
+                d.getPlayer().setyPos(y);
+                System.out.println("Es lädt, es laedt, ich will nicht, dass es laedt, wenn es laedt, muss man immer so lange warten!!!!!");
+            }
         }
     }
     
diff --git a/core/src/com/dungeoncrawler/view/GameScreen.java b/core/src/com/dungeoncrawler/view/GameScreen.java
index 1bb9fde..9b81505 100644
--- a/core/src/com/dungeoncrawler/view/GameScreen.java
+++ b/core/src/com/dungeoncrawler/view/GameScreen.java
@@ -36,7 +36,7 @@ public class GameScreen {
             
                 //PLAYER
                 p = new Texture("Player.png");
-                regions = TextureRegion.split(p, 64, 64);
+                regions = TextureRegion.split(p, 48, 48);
                 player = new Sprite(regions[0][2]);
                 player.setX(200);
                 player.setY(200);
diff --git a/core/src/com/dungeoncrawler/view/MapGenerator.java b/core/src/com/dungeoncrawler/view/MapGenerator.java
index d046fcc..48703d0 100644
--- a/core/src/com/dungeoncrawler/view/MapGenerator.java
+++ b/core/src/com/dungeoncrawler/view/MapGenerator.java
@@ -9,7 +9,6 @@ import com.badlogic.gdx.graphics.Texture;
 import com.badlogic.gdx.graphics.g2d.TextureRegion;
 import com.badlogic.gdx.maps.MapLayer;
 import com.badlogic.gdx.maps.MapLayers;
-import com.badlogic.gdx.maps.MapObjects;
 import com.badlogic.gdx.maps.objects.RectangleMapObject;
 import com.badlogic.gdx.maps.tiled.TiledMap;
 import com.badlogic.gdx.maps.tiled.TiledMapTileLayer;
@@ -139,8 +138,17 @@ public class MapGenerator {
             }
         }
         
-        RectangleMapObject collision = new RectangleMapObject(48, 48, roomDimensionX*48, roomDimensionY*48);
-        collisionLayer.getObjects().add(collision);
+        RectangleMapObject bottom = new RectangleMapObject(0, 0, mapDimensionX*48, 48);
+        collisionLayer.getObjects().add(bottom);
+        
+        RectangleMapObject left = new RectangleMapObject(0, 0, 48, mapDimensionY*48);
+        collisionLayer.getObjects().add(left);
+        
+        RectangleMapObject top = new RectangleMapObject(0, mapDimensionY*48 - 48, mapDimensionX*48, 48);
+        collisionLayer.getObjects().add(top);
+        
+        RectangleMapObject right = new RectangleMapObject(mapDimensionX*48 - 48, 0, 48, mapDimensionY*48);
+        collisionLayer.getObjects().add(right);
         
         collisionLayer.setVisible(false);