diff --git a/examples/toys/ping_pong_gun/createPingPongGun.js b/examples/toys/ping_pong_gun/createPingPongGun.js
index 4969a0bc72..cf56d6f790 100644
--- a/examples/toys/ping_pong_gun/createPingPongGun.js
+++ b/examples/toys/ping_pong_gun/createPingPongGun.js
@@ -25,8 +25,9 @@ var center = Vec3.sum(Vec3.sum(MyAvatar.position, {
 var pingPongGun = Entities.addEntity({
     type: "Model",
     modelURL: MODEL_URL,
-    shapeType: 'compound',
-    compoundShapeURL: COLLISION_HULL_URL,
+    shapeType:'box',
+    // shapeType: 'compound',
+    // compoundShapeURL: COLLISION_HULL_URL,
     script: scriptURL,
     position: center,
     dimensions: {
diff --git a/examples/toys/ping_pong_gun/pingPongGun.js b/examples/toys/ping_pong_gun/pingPongGun.js
index 298d93a523..1b5973c8bb 100644
--- a/examples/toys/ping_pong_gun/pingPongGun.js
+++ b/examples/toys/ping_pong_gun/pingPongGun.js
@@ -21,14 +21,14 @@
 
     //if the trigger value goes below this value, reload the gun.
     var RELOAD_THRESHOLD = 0.95;
-    var GUN_TIP_FWD_OFFSET = 0.45;
+    var GUN_TIP_FWD_OFFSET =-0.35;
     var GUN_TIP_UP_OFFSET = 0.040;
-    var GUN_FORCE = 8;
+    var GUN_FORCE = 9;
     var BALL_RESTITUTION = 0.6;
     var BALL_LINEAR_DAMPING = 0.4;
     var BALL_GRAVITY = {
         x: 0,
-        y: -5.8,
+        y: -4.8,
         z: 0
     };
 
@@ -68,7 +68,6 @@
         },
 
         continueNearGrab: function() {
-
             if (this.whichHand === null) {
                 //only set the active hand once -- if we always read the current hand, our 'holding' hand will get overwritten
                 this.setWhichHand();
@@ -111,7 +110,7 @@
         },
 
         shootBall: function(gunProperties) {
-            var forwardVec = Quat.getFront(Quat.multiply(gunProperties.rotation, Quat.fromPitchYawRollDegrees(0, -90, 0)));
+            var forwardVec = Quat.getFront(Quat.multiply(gunProperties.rotation, Quat.fromPitchYawRollDegrees(0, 180, 0)));
             forwardVec = Vec3.normalize(forwardVec);
             forwardVec = Vec3.multiply(forwardVec, GUN_FORCE);
 
@@ -136,7 +135,7 @@
 
         playSoundAtCurrentPosition: function(position) {
             var audioProperties = {
-                volume: 0.1,
+                volume: 0.2,
                 position: position
             };
 
@@ -145,11 +144,11 @@
 
         getGunTipPosition: function(properties) {
             //the tip of the gun is going to be in a different place than the center, so we move in space relative to the model to find that position
-            var frontVector = Quat.getRight(properties.rotation);
+            var frontVector = Quat.getFront(properties.rotation);
             var frontOffset = Vec3.multiply(frontVector, GUN_TIP_FWD_OFFSET);
-            var upVector = Quat.getRight(properties.rotation);
+            var upVector = Quat.getUp(properties.rotation);
             var upOffset = Vec3.multiply(upVector, GUN_TIP_UP_OFFSET);
-            
+
             var gunTipPosition = Vec3.sum(properties.position, frontOffset);
             gunTipPosition = Vec3.sum(gunTipPosition, upOffset);
 
diff --git a/unpublishedScripts/masterReset.js b/unpublishedScripts/masterReset.js
index 13445ca438..a3d4bcc70d 100644
--- a/unpublishedScripts/masterReset.js
+++ b/unpublishedScripts/masterReset.js
@@ -457,8 +457,7 @@ function createPingPongBallGun() {
     var pingPongGun = Entities.addEntity({
         type: "Model",
         modelURL: MODEL_URL,
-        shapeType: 'compound',
-        compoundShapeURL: COLLISION_HULL_URL,
+        shapeType: 'box',
         script: scriptURL,
         position: position,
         rotation: rotation,
@@ -478,8 +477,6 @@ function createPingPongBallGun() {
     setEntityCustomData(resetKey, pingPongGun, {
         resetMe: true
     });
-
-
 }
 
 function createBasketballHoop() {