diff --git a/src/main/java/electrosphere/entity/state/movement/GroundMovementTree.java b/src/main/java/electrosphere/entity/state/movement/GroundMovementTree.java
index 3ce7c3f5..56a1d0f1 100644
--- a/src/main/java/electrosphere/entity/state/movement/GroundMovementTree.java
+++ b/src/main/java/electrosphere/entity/state/movement/GroundMovementTree.java
@@ -272,7 +272,7 @@ public class GroundMovementTree {
                     Globals.dataCellManager.sendNetworkMessageToChunk(
                             EntityMessage.constructmoveUpdateMessage(
                                     parent.getId(),
-                                    System.currentTimeMillis(),
+                                    Main.getCurrentFrame(),
                                     (float)position.x,
                                     (float)position.y,
                                     (float)position.z,
@@ -289,7 +289,7 @@ public class GroundMovementTree {
                     Globals.clientConnection.queueOutgoingMessage(
                             EntityMessage.constructmoveUpdateMessage(
                                     parent.getId(),
-                                    System.currentTimeMillis(),
+                                    Main.getCurrentFrame(),
                                     (float)position.x,
                                     (float)position.y,
                                     (float)position.z,
@@ -352,7 +352,7 @@ public class GroundMovementTree {
                     Globals.dataCellManager.sendNetworkMessageToChunk(
                             EntityMessage.constructmoveUpdateMessage(
                                     parent.getId(),
-                                    System.currentTimeMillis(),
+                                    Main.getCurrentFrame(),
                                     (float)position.x,
                                     (float)position.y,
                                     (float)position.z,
@@ -369,7 +369,7 @@ public class GroundMovementTree {
                     Globals.clientConnection.queueOutgoingMessage(
                             EntityMessage.constructmoveUpdateMessage(
                                     parent.getId(),
-                                    System.currentTimeMillis(),
+                                    Main.getCurrentFrame(),
                                     (float)position.x,
                                     (float)position.y,
                                     (float)position.z,
@@ -440,7 +440,7 @@ public class GroundMovementTree {
                     Globals.dataCellManager.sendNetworkMessageToChunk(
                             EntityMessage.constructmoveUpdateMessage(
                                     parent.getId(),
-                                    System.currentTimeMillis(),
+                                    Main.getCurrentFrame(),
                                     (float)position.x,
                                     (float)position.y,
                                     (float)position.z,
@@ -457,7 +457,7 @@ public class GroundMovementTree {
                     Globals.clientConnection.queueOutgoingMessage(
                             EntityMessage.constructmoveUpdateMessage(
                                     parent.getId(),
-                                    System.currentTimeMillis(),
+                                    Main.getCurrentFrame(),
                                     (float)position.x,
                                     (float)position.y,
                                     (float)position.z,
diff --git a/src/main/java/electrosphere/main/Main.java b/src/main/java/electrosphere/main/Main.java
index 6f7378f0..688f026e 100644
--- a/src/main/java/electrosphere/main/Main.java
+++ b/src/main/java/electrosphere/main/Main.java
@@ -68,7 +68,7 @@ public class Main {
     //These are used in calculating the time between frames for visualization (camera) control and such
     static double deltaTime = 0.0f;
     static double lastFrame = 0.0f;
-    public static long frameCount = 0;
+    static long frameCount = 0;
     public static float deltaFrames = 0;
     //View Controls
     public static float view_Range = 200000.0f;
diff --git a/src/main/java/electrosphere/renderer/Mesh.java b/src/main/java/electrosphere/renderer/Mesh.java
index 4200b433..b136f95f 100644
--- a/src/main/java/electrosphere/renderer/Mesh.java
+++ b/src/main/java/electrosphere/renderer/Mesh.java
@@ -866,8 +866,8 @@ public class Mesh {
             glUniformMatrix4fv(Globals.renderingEngine.getActiveShader().shaderVertexProjectionLoc, false, Globals.projectionMatrix.get(new float[16]));
             glUniform3fv(Globals.renderingEngine.getActiveShader().shaderVertexViewPosLoc, CameraEntityUtils.getCameraEye(Globals.playerCamera).get(BufferUtils.createFloatBuffer(3)));
             glUniformMatrix4fv(glGetUniformLocation(Globals.renderingEngine.getActiveShader().shaderProgram, "lightSpaceMatrix"), false, Globals.lightDepthMatrix.get(new float[16]));
-            glUniform1i(glGetUniformLocation(Globals.renderingEngine.getActiveShader().shaderProgram, "frame"), (int)Main.frameCount);
-            glUniform1f(glGetUniformLocation(Globals.renderingEngine.getActiveShader().shaderProgram, "time"), (float)Main.frameCount);
+            glUniform1i(glGetUniformLocation(Globals.renderingEngine.getActiveShader().shaderProgram, "frame"), (int)Main.getCurrentFrame());
+            glUniform1f(glGetUniformLocation(Globals.renderingEngine.getActiveShader().shaderProgram, "time"), (float)Main.getCurrentFrame());
         }
         
         if(bufferNonStandardUniforms){