diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Persistance/Classes/MapData.java b/src/main/java/de/hdm_stuttgart/battlearena/Persistance/Classes/MapData.java
index d395c69fee0d8229ec5cd1ebb05a4b4c4812580e..ccd39d5d8cf3dba53a9fac07181fb0cc46dc617c 100644
--- a/src/main/java/de/hdm_stuttgart/battlearena/Persistance/Classes/MapData.java
+++ b/src/main/java/de/hdm_stuttgart/battlearena/Persistance/Classes/MapData.java
@@ -8,8 +8,8 @@ public class MapData {
 
     private String mapID;
     private String mapName;
-    private int mapWidth;
-    private int mapHeight;
+    private int mapWidth;   //included for future use (to allow maps of different size)
+    private int mapHeight;  //included for future use (to allow maps of different size)
     private String mapData;
 
     protected MapData(String mapID, String mapName, int mapWidth, int mapHeight, String mapData) {
diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Persistance/Classes/Persistence.java b/src/main/java/de/hdm_stuttgart/battlearena/Persistance/Classes/Persistence.java
index f2a4fe12969855d9b7ad72d585f1678130e6e709..527d13cc18f8c0024382033257fcb58be4335739 100644
--- a/src/main/java/de/hdm_stuttgart/battlearena/Persistance/Classes/Persistence.java
+++ b/src/main/java/de/hdm_stuttgart/battlearena/Persistance/Classes/Persistence.java
@@ -21,9 +21,9 @@ public class Persistence {
     private String sizeString;              //??
     protected static PlayerStatistics statistics = new PlayerStatistics("", 0,0,0,0,0,0);
     //suggestion: rename to "playerData"
+    protected OracleDB db = new OracleDB(); //for testing purposes; evtl. Methoden von OracleDB static machen und von GSON Handler
 
 
-    OracleDB db = new OracleDB(); //for testing purposes; evtl. Methoden von OracleDB static machen und von GSON Handler
 
 
     private Persistence (){}
diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Persistance/Classes/RuntimeInfo.java b/src/main/java/de/hdm_stuttgart/battlearena/Persistance/Classes/RuntimeInfo.java
index 4a69623008a32deba93af9a097556a10bd759ef7..f20d3f5359fb8b2baa6883de990fa0fb99aacc35 100644
--- a/src/main/java/de/hdm_stuttgart/battlearena/Persistance/Classes/RuntimeInfo.java
+++ b/src/main/java/de/hdm_stuttgart/battlearena/Persistance/Classes/RuntimeInfo.java
@@ -14,29 +14,37 @@ public class RuntimeInfo {
     private LinkedHashMap<String, String> mapNames;
     public MapData mapCreated;  //to store parsed Data from MapCreator for Upload to SQL
     public String communityMapSelected;
-    protected ArrayList<String> coreMapsListLocal; //include mapID
-    protected ArrayList<String> communityMapsListLocal; //include mapID
+    protected ArrayList<String> coreMapsListLocal;
+    protected ArrayList<String> communityMapsListLocal;
     protected ArrayList<String> communityMapsListRemote;
+    protected String mapDataGame;
+
+
 
-    public String mapTileString; //Maxe chose this name
 
     private RuntimeInfo(){};
     public static RuntimeInfo getInstance(){
         return runtimeInfoSingleton;
     }
 
-    private void setMap(String mapSelected, boolean choseCoremaps){
+    public String getMapDataGame() {
+        return mapDataGame;
+    }
+
+    private void setGameMap(String mapSelected, boolean choseCoremaps){
+        mapSelected = mapSelected.substring(mapSelected.indexOf("(") + 1, mapSelected.length() - 1);
+
         if(choseCoremaps) {
             for (int mapListIndex = 0; mapListIndex < persistenceInst.coreMaps.size(); mapListIndex++) {
                 if (persistenceInst.coreMaps.get(mapListIndex).getMapID().equals("mapSelected")) {
-                    mapTileString = persistenceInst.coreMaps.get(mapListIndex).getMapID();
+                    mapDataGame = persistenceInst.coreMaps.get(mapListIndex).getMapID();
                 }
             }
         }
         else  {
             for (int mapListIndex = 0; mapListIndex < persistenceInst.communityMaps.size(); mapListIndex++) {
                 if (persistenceInst.communityMaps.get(mapListIndex).getMapID().equals("mapSelected")) {
-                    mapTileString = persistenceInst.coreMaps.get(mapListIndex).getMapID();
+                    mapDataGame = persistenceInst.coreMaps.get(mapListIndex).getMapID();
                 }
             }
         }
@@ -58,14 +66,14 @@ public class RuntimeInfo {
 
     public void createCoreMapsList(){
         for(int i = 0; i < persistenceInst.coreMaps.size(); i++){
-            coreMapsListLocal.add(persistenceInst.coreMaps.get(i).getMapName());
+            coreMapsListLocal.add(persistenceInst.coreMaps.get(i).getMapName() + " (" + persistenceInst.coreMaps.get(i).getMapID() + ")");
         }
     }
 
     public void createCommunityMapsListLocal(){
         try {
             for (int i = 0; i < persistenceInst.communityMaps.size(); i++) {
-                communityMapsListLocal.add(persistenceInst.communityMaps.get(i).getMapName());
+                communityMapsListLocal.add(persistenceInst.communityMaps.get(i).getMapName() + " (" + persistenceInst.communityMaps.get(i).getMapID() + ")");
             }
         }
         catch (Exception e){