diff --git a/Assets/Generator.cs b/Assets/Generator.cs
index 31b4657..6914bf4 100644
--- a/Assets/Generator.cs
+++ b/Assets/Generator.cs
@@ -4,20 +4,35 @@ using System.Collections;
 public class Generator : MonoBehaviour {
 
 	GameObject tmanager;
-	GameObject fcreator;
+	GameObject mcreator;
 	GameObject ucreator;
-	Component tScript;
-	Component fScript;
-	Component uScript;
+	TurnManagerScript tScript;
+	MapCreation mScript;
+	UnitCreator uScript;
 
 	// Use this for initialization
 	void Start () {
 		GameObject turnMan = Instantiate (tmanager);
-		GameObject floorCreator = Instantiate (fcreator);
+		GameObject mapCreator = Instantiate (mcreator);
 		GameObject unitCreator = Instantiate (ucreator);
-		tScript = turnMan.GetComponent ("TurnManagerScript");
-		//fScript = floorCreator.GetComponent ("FloorCreatorScript");
-		uScript = unitCreator.GetComponent ("UnitCreator");
+		tScript = turnMan.GetComponent<TurnManagerScript>();
+		mScript = mapCreator.GetComponent<MapCreation>();
+		uScript = unitCreator.GetComponent<UnitCreator>();
+		int x = 20;
+		int y = 40;
+		int[,] map = new int [x,y] ;
+		for(int i = 0; i < x; ++i) {
+			for(int j = 0; j < y; ++j) {
+				if (i == 0 || i == x-1 || j == 0 || j == y-1)
+					map [i, j] = -1;
+				else
+					map [i, j] = 0;
+			}
+		}
+		//just to test
+		map [10, 10] = -1;
+		map [10, 20] = -1;
+		mScript.setMatrix (map,x,y);
 
 	}
 
diff --git a/Assets/MapCreation.cs b/Assets/MapCreation.cs
index e4d39b5..fc8ee5f 100644
--- a/Assets/MapCreation.cs
+++ b/Assets/MapCreation.cs
@@ -27,7 +27,7 @@ public class MapCreation : MonoBehaviour {
 	}
 
 
-	void setMatrix(int[,] new_floor, int x, int z){
+	public void setMatrix(int[,] new_floor, int x, int z){
 		matrix = new_floor;
 		vs = x;
 		hs = z;