diff --git a/interface/src/main.cpp b/interface/src/main.cpp
index c348ab6dc3..7a5703a881 100644
--- a/interface/src/main.cpp
+++ b/interface/src/main.cpp
@@ -28,11 +28,12 @@ int main(int argc, const char * argv[]) {
     // Debug option to demonstrate that the client's local time does not 
     // need to be in sync with any other network node. This forces clock 
     // skew for the individual client
-    const char* TIME_ADJUST = "--usecTimestampNowAdjust";
-    const char* timeAdjustOption = getCmdOption(argc, argv, TIME_ADJUST);
-    if (timeAdjustOption) {
-        ::usecTimestampNowAdjust = atoi(timeAdjustOption);
-        qDebug("timeAdjustOption=%s usecTimestampNowAdjust=%d\n", timeAdjustOption, ::usecTimestampNowAdjust);
+    const char* CLOCK_SKEW = "--clockSkew";
+    const char* clockSkewOption = getCmdOption(argc, argv, CLOCK_SKEW);
+    if (clockSkewOption) {
+        int clockSkew = atoi(clockSkewOption);
+        usecTimestampNowForceClockSkew(clockSkew);
+        qDebug("clockSkewOption=%s clockSkew=%d\n", clockSkewOption, clockSkew);
     }
     
     int exitCode;
diff --git a/libraries/octree-server/src/OctreeServer.cpp b/libraries/octree-server/src/OctreeServer.cpp
index 7ab0705d40..a8010cefaf 100644
--- a/libraries/octree-server/src/OctreeServer.cpp
+++ b/libraries/octree-server/src/OctreeServer.cpp
@@ -660,11 +660,12 @@ void OctreeServer::run() {
     // Debug option to demonstrate that the server's local time does not 
     // need to be in sync with any other network node. This forces clock 
     // skew for the individual server node
-    const char* TIME_ADJUST = "--usecTimestampNowAdjust";
-    const char* timeAdjustOption = getCmdOption(_argc, _argv, TIME_ADJUST);
-    if (timeAdjustOption) {
-        ::usecTimestampNowAdjust = atoi(timeAdjustOption);
-        qDebug("timeAdjustOption=%s usecTimestampNowAdjust=%d\n", timeAdjustOption, ::usecTimestampNowAdjust);
+    const char* CLOCK_SKEW = "--clockSkew";
+    const char* clockSkewOption = getCmdOption(_argc, _argv, CLOCK_SKEW);
+    if (clockSkewOption) {
+        int clockSkew = atoi(clockSkewOption);
+        usecTimestampNowForceClockSkew(clockSkew);
+        qDebug("clockSkewOption=%s clockSkew=%d\n", clockSkewOption, clockSkew);
     }
 
     // Check to see if the user passed in a command line option for setting packet send rate
diff --git a/libraries/particles/src/Particle.cpp b/libraries/particles/src/Particle.cpp
index 3f231ac483..c2f86c7b75 100644
--- a/libraries/particles/src/Particle.cpp
+++ b/libraries/particles/src/Particle.cpp
@@ -409,11 +409,15 @@ void Particle::update() {
     bool isInHand = getInHand();
     bool shouldDie = !isInHand && !isStillMoving && isReallyOld;
     setShouldDie(shouldDie);
-
-printf("Particle::update()... timeElapsed: %f lifeTime:%f editedAgo:%f isInHand:%s isStillMoveing:%s isReallyOld:%s shouldDie:%s\n", 
-    timeElapsed, getLifetime(), getEditedAgo(), debug::valueOf(isInHand), debug::valueOf(isStillMoving), 
-    debug::valueOf(isReallyOld), debug::valueOf(shouldDie));
     
+    bool wantDebug = false;
+    if (wantDebug) {
+        printf("Particle::update()... timeElapsed: %f lifeTime:%f editedAgo:%f "
+            "isInHand:%s isStillMoveing:%s isReallyOld:%s shouldDie:%s\n", 
+            timeElapsed, getLifetime(), getEditedAgo(), debug::valueOf(isInHand), debug::valueOf(isStillMoving), 
+            debug::valueOf(isReallyOld), debug::valueOf(shouldDie));
+    }
+        
     runScript(); // allow the javascript to alter our state
     
     // If the ball is in hand, it doesn't move or have gravity effect it
diff --git a/libraries/shared/src/SharedUtil.cpp b/libraries/shared/src/SharedUtil.cpp
index 3d79e7fcc2..4d178a6ee9 100644
--- a/libraries/shared/src/SharedUtil.cpp
+++ b/libraries/shared/src/SharedUtil.cpp
@@ -31,10 +31,14 @@ uint64_t usecTimestamp(const timeval *time) {
 }
 
 int usecTimestampNowAdjust = 0;
+void usecTimestampNowForceClockSkew(int clockSkew) {
+    ::usecTimestampNowAdjust = clockSkew;
+}
+
 uint64_t usecTimestampNow() {
     timeval now;
     gettimeofday(&now, NULL);
-    return (now.tv_sec * 1000000 + now.tv_usec) + usecTimestampNowAdjust;
+    return (now.tv_sec * 1000000 + now.tv_usec) + ::usecTimestampNowAdjust;
 }
 
 float randFloat () {
diff --git a/libraries/shared/src/SharedUtil.h b/libraries/shared/src/SharedUtil.h
index 7752e2e72c..893922ec28 100644
--- a/libraries/shared/src/SharedUtil.h
+++ b/libraries/shared/src/SharedUtil.h
@@ -56,7 +56,7 @@ static const uint64_t USECS_PER_SECOND = 1000 * 1000;
 
 uint64_t usecTimestamp(const timeval *time);
 uint64_t usecTimestampNow();
-extern int usecTimestampNowAdjust;
+void usecTimestampNowForceClockSkew(int clockSkew);
 
 float randFloat();
 int randIntInRange (int min, int max);