diff --git a/app/src/main/java/model/CellGridIterator.java b/app/src/main/java/model/CellGridIterator.java
index 2ea7957df201e37cbbcc32c9ab60b31ff04777a4..6bc3d5e8723e53f35212fe05235ec3d4c3d8c82b 100644
--- a/app/src/main/java/model/CellGridIterator.java
+++ b/app/src/main/java/model/CellGridIterator.java
@@ -1,6 +1,8 @@
 package model;
 
 import java.util.Iterator;
+import java.util.NoSuchElementException;
+
 public class CellGridIterator implements Iterator<Cell> {
 
     ArrayGrid arrayGrid;
@@ -10,6 +12,8 @@ public class CellGridIterator implements Iterator<Cell> {
     public CellGridIterator(ArrayGrid grid) {
         arrayGrid=grid;
         cells=grid.cells;
+        rowIndex =0;
+        columnIndex=0;
     }
 
 
@@ -20,6 +24,15 @@ public class CellGridIterator implements Iterator<Cell> {
 
     @Override
     public Cell next() {
-       return null;
+        if(columnIndex==cells[rowIndex].length)
+        {
+            columnIndex=0;
+            rowIndex++;
+        }
+        if(rowIndex== cells.length&& columnIndex==cells[rowIndex].length){
+            throw new NoSuchElementException();
+        }
+        return cells[rowIndex][columnIndex++];
     }
 }
+