diff --git a/src/gameoflife.cpp b/src/gameoflife.cpp
index 297c6eebc561a1930f518833c3f0d61184eb3b2d..3fc18d2dc2ebf258135cb76018456918a1727dad 100644
--- a/src/gameoflife.cpp
+++ b/src/gameoflife.cpp
@@ -66,10 +66,10 @@ void gameTick(bool (&a)[SCREEN_HEIGHT][SCREEN_WIDTH])
     for (uint8_t col = 0; col < SCREEN_WIDTH; col++)
     {
       uint8_t neighbors = (a[row][(col - 1) % SCREEN_WIDTH] + a[row][(col + 1) % SCREEN_WIDTH] + a[(row - 1) % SCREEN_HEIGHT][col] +
-                       a[(row + 1) % SCREEN_HEIGHT][col] + a[(row - 1) % SCREEN_HEIGHT][(col - 1) % SCREEN_WIDTH] +
-                       a[(row - 1) % SCREEN_HEIGHT][(col + 1) % SCREEN_WIDTH] +
-                       a[(row + 1) % SCREEN_HEIGHT][(col - 1) % SCREEN_WIDTH] +
-                       a[(row + 1) % SCREEN_HEIGHT][(col + 1) % SCREEN_WIDTH]);
+                           a[(row + 1) % SCREEN_HEIGHT][col] + a[(row - 1) % SCREEN_HEIGHT][(col - 1) % SCREEN_WIDTH] +
+                           a[(row - 1) % SCREEN_HEIGHT][(col + 1) % SCREEN_WIDTH] +
+                           a[(row + 1) % SCREEN_HEIGHT][(col - 1) % SCREEN_WIDTH] +
+                           a[(row + 1) % SCREEN_HEIGHT][(col + 1) % SCREEN_WIDTH]);
 
       // cell was alive
       if (a[row][col])
@@ -83,9 +83,11 @@ void gameTick(bool (&a)[SCREEN_HEIGHT][SCREEN_WIDTH])
         // else: right amount of neighbors -> stay alive
         else
         {
-          if (colorMap[row][col] < 255) {
+          if (colorMap[row][col] < 255)
+          {
             colorMap[row][col]++;
           }
+          cellsAliveNow++;
         }
       }
       // cell was dead, but has right amount of neighbors now -> come alive
@@ -149,11 +151,6 @@ void gameLoop()
   else // not gameOver
   {
 
-    if (currentTick % 2)
-    {
-      cellsAliveBefore = cellsAliveNow;
-    }
-
     if (cellsAliveNow >= cellsAliveBefore - 5 &&
         cellsAliveNow <= cellsAliveBefore + 5)
     {
@@ -163,6 +160,9 @@ void gameLoop()
     {
       noEvolutionTicks = 0;
     }
+    
+    cellsAliveBefore = cellsAliveNow;
+      
 
     if (noEvolutionTicks > noEvolutionTicksLimit)
     {