diff --git a/src/main/java/MainClasses/GeneticAlgorithm.java b/src/main/java/MainClasses/GeneticAlgorithm.java
index dd03c4eeae11abb2912ed8557de45f1488a342ee..a38a01a9a2bb94e233cacb9e2e63aff5d1b1ecf0 100644
--- a/src/main/java/MainClasses/GeneticAlgorithm.java
+++ b/src/main/java/MainClasses/GeneticAlgorithm.java
@@ -71,14 +71,7 @@ public class GeneticAlgorithm {
 
         // Settings that are dependant on encoding
         if (config.getEncodingVariant().equals("NESW")) {
-            int nullCount = 0;
-            /*for (int i = 0; i < config.getVisualizers().length; i++) {
-                if (!config.getVisualizers()[i].equals(VisualizerMethods.Console)
-                        && !config.getVisualizers()[i].equals(VisualizerMethods.Image)) {
-                    nullCount++;
-                }
-            }*/
-            this.visualizers = new Visualizer[config.getVisualizers().length - nullCount];
+            this.visualizers = new Visualizer[config.getVisualizers().length];
             int j = 0;
             for (VisualizerMethods vm : config.getVisualizers()) {
                 if (vm.equals(VisualizerMethods.Console)) {
@@ -135,17 +128,17 @@ public class GeneticAlgorithm {
     }
 
     public void simulateGenerations() {
-        for (int gen = 0; gen < config.getTotalGenerations()-1; gen++) {
+        evaluateGeneration();
+        for (int gen = 0; gen < config.getTotalGenerations(); gen++) {
             //TODO Remove with the new Generation class
             generation = gen;
 
-            evaluateGeneration();
             visualizeGeneration();
-
             filterGeneration();
             mutateGeneration();
+            evaluateGeneration();
+
         }
-        evaluateGeneration();
         visualizeGeneration();
     }
 
diff --git a/src/main/java/Visualization/Visualizers/BestFoldingsToVideo.java b/src/main/java/Visualization/Visualizers/BestFoldingsToVideo.java
index 12b18fd1eef377bffceafee51f7d6d80fa4cc2ba..b94324fea7b7112fd03f19df8a9b316be649d016 100644
--- a/src/main/java/Visualization/Visualizers/BestFoldingsToVideo.java
+++ b/src/main/java/Visualization/Visualizers/BestFoldingsToVideo.java
@@ -53,7 +53,7 @@ public class BestFoldingsToVideo implements Visualizer {
   @Override
   public void drawProtein(Candidate[] generation, GeneticAlgorithm geneticAlgorithm) {
     //TODO Only render video for the last generation
-    if(geneticAlgorithm.generation == config.getTotalGenerations()-2){
+    if(geneticAlgorithm.generation == config.getTotalGenerations()-1){
       String filename = config.getLogfileDirectory() + "/" + config.getJobName() + ".mp4";
       createVideo(
           config.getImageSequenceDirectory(),