diff --git a/src/backend/Simulator.java b/src/backend/Simulator.java
index 9cef628..98ed246 100644
--- a/src/backend/Simulator.java
+++ b/src/backend/Simulator.java
@@ -18,7 +18,7 @@ public class Simulator extends Thread {
 	private ArrayList<Integer> fieldBirthValues;
 	
 	private ArrayList<Agent> agents;
-	private ArrayList<Cell> cells;
+	private ArrayList<ArrayList<Cell>> cells;
 	private boolean stopFlag;
 	private boolean pauseFlag;
 	private boolean loopingBorder;
@@ -33,7 +33,7 @@ public class Simulator extends Thread {
 		pauseFlag=false;
 		loopingBorder=false;
 		clickActionFlag=false;
-		cells = new ArrayList<Cell>();
+		cells = new ArrayList<ArrayList<Cell>>();
 		agents = new ArrayList<Agent>();
 		fieldBirthValues = new ArrayList<Integer>();
 		fieldSurviveValues = new ArrayList<Integer>();
@@ -257,7 +257,7 @@ public class Simulator extends Thread {
 	
 	public boolean isLoopingBorder() {
 		//TODO : complete method with proper return
-		return false;
+		return loopingBorder;
 	}
 	
 	public void toggleLoopingBorder() {