diff --git a/cicaprojekt/Dungeon.java b/cicaprojekt/Dungeon.java
index e139375..8e4e7ab 100644
--- a/cicaprojekt/Dungeon.java
+++ b/cicaprojekt/Dungeon.java
@@ -5,10 +5,15 @@ import java.util.HashMap;
 import java.util.Map;
 
 public class Dungeon {
+    private int ZPMsToWin = 0;
+    private long timeLimit = 0;
+
+
     /* NOTE: this function assumes that the parameter input is a well-formatted dungeon file.
      * Such file looks like as follows:
      *
      * <map width>x<map height>
+     * <time limit in seconds>
      * <empty line>
      * <map matrix line 1>
      * ...
@@ -42,8 +47,9 @@ public class Dungeon {
         Tile replicatorlocation = defaultTile;
         try(BufferedReader reader = new BufferedReader(new FileReader(input)))
         {
-            String[] sizedata = reader.readLine().split("x");   // read size data at beginning of file
-            reader.readLine();                                  // throw empty line away
+            String[] sizedata = reader.readLine().split("x");       // read size data at beginning of file
+            timeLimit = Long.parseLong(reader.readLine()) * 1000;   // read time limit
+            reader.readLine();                                      // throw empty line away
             int width = Integer.parseInt(sizedata[0]);
             int height = Integer.parseInt(sizedata[1]);
 
@@ -75,6 +81,7 @@ public class Dungeon {
                             tile = new Field();
                             display.addVisual(new FieldDrawer((Field) tile));
                             tile.setZPMOnTile(new ZPM());
+                            ZPMsToWin++;
                             break;
 
                         case 'B':
@@ -181,4 +188,12 @@ public class Dungeon {
 
         return playermap;
     }
+
+    public int getZPMsToWin() {
+        return ZPMsToWin;
+    }
+
+    public long getTimeLimit() {
+        return timeLimit;
+    }
 }
\ No newline at end of file
diff --git a/cicaprojekt/Game.java b/cicaprojekt/Game.java
index cf49ac2..503485a 100644
--- a/cicaprojekt/Game.java
+++ b/cicaprojekt/Game.java
@@ -50,7 +50,7 @@ public class Game {
         display.addVisual(new PlayerDrawer(jaffa));
         display.addVisual(new PlayerBaseDrawer(replicator));        
         
-        flowoftime.start(420*420);
+        flowoftime.start(dungeon.getTimeLimit());
     }
 
     private Direction getRandomDirection() {
diff --git a/exampledungeon.dungeon b/exampledungeon.dungeon
index 6c33bed..a3cfe47 100644
--- a/exampledungeon.dungeon
+++ b/exampledungeon.dungeon
@@ -1,4 +1,5 @@
 5x5
+10
 
 W W W W W
 W O B S W
diff --git a/mastertest.dungeon b/mastertest.dungeon
index 3d71d7c..03c69f0 100644
--- a/mastertest.dungeon
+++ b/mastertest.dungeon
@@ -1,4 +1,5 @@
 5x5
+5
 
 W W W W W
 W F F F W