diff --git a/Plan/.idea/libraries/Maven__com_djrapitops_PlanPluginBridge_3_6_0.xml b/Plan/.idea/libraries/Maven__com_djrapitops_PlanPluginBridge_3_6_0.xml
new file mode 100644
index 000000000..f28c9c6a8
--- /dev/null
+++ b/Plan/.idea/libraries/Maven__com_djrapitops_PlanPluginBridge_3_6_0.xml
@@ -0,0 +1,14 @@
+<component name="libraryTable">
+  <library name="Maven: com.djrapitops:PlanPluginBridge:3.6.0">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../PlanPluginBridge/PlanPluginBridge-3.6.0.jar!/" />
+      <root url="file://$PROJECT_DIR$/../PlanPluginBridge" />
+      <root url="file://$PROJECT_DIR$/../PlanPluginBridge" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="file://$PROJECT_DIR$/../PlanPluginBridge/src/main/java" />
+    </SOURCES>
+    <jarDirectory url="file://$PROJECT_DIR$/../PlanPluginBridge" recursive="false" />
+  </library>
+</component>
\ No newline at end of file
diff --git a/Plan/pom.xml b/Plan/pom.xml
index 9c0cc33d0..272959b04 100644
--- a/Plan/pom.xml
+++ b/Plan/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.djrapitops</groupId>
     <artifactId>Plan</artifactId>
-    <version>3.5.5</version>
+    <version>3.6.0</version>
     <packaging>jar</packaging>
     <repositories>
         <repository>
@@ -35,7 +35,7 @@
         <dependency>
             <groupId>com.djrapitops</groupId>
             <artifactId>PlanPluginBridge</artifactId>
-            <version>3.5.0</version>
+            <version>3.6.0</version>
             <scope>compile</scope>
         </dependency>
         <!--         -->
diff --git a/Plan/src/main/resources/analysis.html b/Plan/src/main/resources/analysis.html
index 3eea95188..62d10ced7 100644
--- a/Plan/src/main/resources/analysis.html
+++ b/Plan/src/main/resources/analysis.html
@@ -581,7 +581,7 @@
                                 </div>
                             </div>
                         </div>
-                        <table class="sortable table">
+                        <table class="sortable table" style="height: 100%; max-height: 800px; overflow: auto;">
                             <thead>
                             <tr>
                                 <th><i class="fa fa-user" aria-hidden="true"></i> Player</th>
@@ -622,7 +622,7 @@
                                 </div>
                             </div>
                         </div>
-                        <table class="sortable table">
+                        <table class="sortable table" style="height: 100%; max-height: 800px; overflow: auto;">
                             <thead>
                             <tr>
                                 <th><i class="fa fa-chevron-right" aria-hidden="true"></i> Command</th>
diff --git a/Plan/src/main/resources/plugin.yml b/Plan/src/main/resources/plugin.yml
index dd3010eb7..fdce47d5d 100644
--- a/Plan/src/main/resources/plugin.yml
+++ b/Plan/src/main/resources/plugin.yml
@@ -1,8 +1,7 @@
 name: Plan
 author: Rsl1122
 main: main.java.com.djrapitops.plan.Plan
-version: 3.5.5
-
+version: 3.6.0
 softdepend:
 - OnTime
 - EssentialsX
diff --git a/PlanPluginBridge/.idea/artifacts/PlanPluginBridge_3_5_0.xml b/PlanPluginBridge/.idea/artifacts/PlanPluginBridge_3_6_0.xml
similarity index 62%
rename from PlanPluginBridge/.idea/artifacts/PlanPluginBridge_3_5_0.xml
rename to PlanPluginBridge/.idea/artifacts/PlanPluginBridge_3_6_0.xml
index d868b5062..33dbd4ca9 100644
--- a/PlanPluginBridge/.idea/artifacts/PlanPluginBridge_3_5_0.xml
+++ b/PlanPluginBridge/.idea/artifacts/PlanPluginBridge_3_6_0.xml
@@ -1,7 +1,7 @@
 <component name="ArtifactManager">
-  <artifact type="jar" name="PlanPluginBridge-3.5.0">
+  <artifact type="jar" name="PlanPluginBridge-3.6.0">
     <output-path>$PROJECT_DIR$/target</output-path>
-    <root id="archive" name="PlanPluginBridge-3.5.0.jar">
+    <root id="archive" name="PlanPluginBridge-3.6.0.jar">
       <element id="module-output" name="PlanPluginBridge" />
     </root>
   </artifact>
diff --git a/PlanPluginBridge/.idea/libraries/Maven__com_djrapitops_Plan_3_6_0.xml b/PlanPluginBridge/.idea/libraries/Maven__com_djrapitops_Plan_3_6_0.xml
new file mode 100644
index 000000000..85b0ed7cf
--- /dev/null
+++ b/PlanPluginBridge/.idea/libraries/Maven__com_djrapitops_Plan_3_6_0.xml
@@ -0,0 +1,14 @@
+<component name="libraryTable">
+  <library name="Maven: com.djrapitops:Plan:3.6.0">
+    <CLASSES>
+      <root url="file://$PROJECT_DIR$/../Plan" />
+      <root url="jar://$PROJECT_DIR$/../Plan/target/Plan.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="file://$PROJECT_DIR$/../Plan/classes/artifacts/Maven__com_djrapitops_AbstractPluginFramework_2_0_0/src/main/java" />
+      <root url="file://$PROJECT_DIR$/../Plan/classes/artifacts/Maven__com_djrapitops_AbstractPluginFramework_2_0_0/src/test/java" />
+      <root url="file://$PROJECT_DIR$/../Plan/src" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/PlanPluginBridge/PlanPluginBridge-3.5.0.jar b/PlanPluginBridge/PlanPluginBridge-3.5.0.jar
deleted file mode 100644
index b3a864a2d..000000000
Binary files a/PlanPluginBridge/PlanPluginBridge-3.5.0.jar and /dev/null differ
diff --git a/PlanPluginBridge/pom.xml b/PlanPluginBridge/pom.xml
index 62a3cd94a..343b10cda 100644
--- a/PlanPluginBridge/pom.xml
+++ b/PlanPluginBridge/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.djrapitops</groupId>
     <artifactId>PlanPluginBridge</artifactId>
-    <version>3.5.0</version>
+    <version>3.6.0</version>
     <packaging>jar</packaging>
     <repositories>
         <repository>
@@ -23,7 +23,7 @@
         <dependency>
             <groupId>com.djrapitops</groupId>
             <artifactId>Plan</artifactId>
-            <version>3.5.5</version>
+            <version>3.6.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/importing/OnTimeImporter.java b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/importing/OnTimeImporter.java
index 1cb122ccb..0d14398ca 100644
--- a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/importing/OnTimeImporter.java
+++ b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/importing/OnTimeImporter.java
@@ -47,9 +47,7 @@ public class OnTimeImporter extends Importer {
                 }
                 if (playTime > uData.getPlayTime()) {
                     uData.setPlayTime(playTime);
-                    uData.setLastGamemode("SURVIVAL");
-                    uData.setAllGMTimes(playTime, 0, 0, 0);
-                    uData.setLastGmSwapTime(playTime);
+                    uData.getGmTimes().resetTimes(playTime);
                 }
                 return true;
             }