diff --git a/examples/toys/bubblewand/bubble.js b/examples/toys/bubblewand/bubble.js
index 20020855cb..edb13c085a 100644
--- a/examples/toys/bubblewand/bubble.js
+++ b/examples/toys/bubblewand/bubble.js
@@ -12,8 +12,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 
 (function() {
-    Script.include("../utilities.js");
-    Script.include("../libraries/utils.js");
+    Script.include("../../utilities.js");
+    Script.include("../../libraries/utils.js");
 
     var POP_SOUNDS = [
         SoundCache.getSound("http://hifi-public.s3.amazonaws.com/james/bubblewand/sounds/pop0.wav"),
@@ -34,16 +34,17 @@
     var checkPositionInterval;
     this.preload = function(entityID) {
         //  print('bubble preload')
-        // var _t = this;
-        // _t.entityID = entityID;
-        // properties = Entities.getEntityProperties(entityID);
+        _t.entityID = entityID;
+        //properties = Entities.getEntityProperties(entityID);
         // _t.loadShader(entityID);
         Script.update.connect(_t.internalUpdate);
     };
 
     this.internalUpdate = function() {
-
-        properties = Entities.getEntityProperties(_t.entityID)
+        var tmpProperties = Entities.getEntityProperties(_t.entityID);
+        if (tmpProperties.position.x !== 0 && tmpProperties.position.y !== 0 && tmpProperties.position.z !== 0) {
+            properties = tmpProperties;
+        }
     }
 
     this.loadShader = function(entityID) {
@@ -65,11 +66,9 @@
     };
 
     this.unload = function(entityID) {
-
         Script.update.disconnect(this.internalUpdate);
-        properties = Entities.getEntityProperties(entityID)
         var position = properties.position;
-        // this.endOfBubble(position);
+        _t.endOfBubble(position);
         print('UNLOAD PROPS' + JSON.stringify(position));
 
     };
diff --git a/examples/toys/bubblewand/createWand.js b/examples/toys/bubblewand/createWand.js
index 2c1217d5ce..df6127cbcf 100644
--- a/examples/toys/bubblewand/createWand.js
+++ b/examples/toys/bubblewand/createWand.js
@@ -10,15 +10,15 @@
 
 
 
-Script.include("../utilities.js");
-Script.include("../libraries/utils.js");
+Script.include("../../utilities.js");
+Script.include("../../libraries/utils.js");
 
-var wandModel = 'http://hifi-public.s3.amazonaws.com/james/bubblewand/models/wand/wand.fbx' ;
-var wandCollisionShape = 'http://hifi-public.s3.amazonaws.com/james/bubblewand/models/wand/collisionHull.obj' ;
-var scriptURL = 'http://hifi-public.s3.amazonaws.com/james/bubblewand/scripts/wand.js?' + randInt(0, 10000);
+var wandModel = 'http://hifi-public.s3.amazonaws.com/james/bubblewand/models/wand/wand.fbx';
+var wandCollisionShape = 'http://hifi-public.s3.amazonaws.com/james/bubblewand/models/wand/collisionHull.obj';
+//var scriptURL = 'http://hifi-public.s3.amazonaws.com/james/bubblewand/scripts/wand.js?' + randInt(0, 10000);
 
 //for local testing 
-//var scriptURL = "http://localhost:8080/scripts/wand.js?" + randInt(0, 10000);
+var scriptURL = "http://localhost:8080/wand.js?" + randInt(0, 10000);
 
 //create the wand in front of the avatar
 var center = Vec3.sum(MyAvatar.position, Vec3.multiply(3, Quat.getFront(Camera.getOrientation())));
diff --git a/examples/toys/bubblewand/wand.js b/examples/toys/bubblewand/wand.js
index 648047fbb8..3dd6ad5a19 100644
--- a/examples/toys/bubblewand/wand.js
+++ b/examples/toys/bubblewand/wand.js
@@ -16,14 +16,13 @@ function convertRange(value, r1, r2) {
 }
 
 (function() {
-   Script.include("../utilities.js");
-Script.include("../libraries/utils.js");
-
+    Script.include("../../utilities.js");
+    Script.include("../../libraries/utils.js");
     var bubbleModel = "http://hifi-public.s3.amazonaws.com/james/bubblewand/models/bubble/bubble.fbx";
     var popSound = SoundCache.getSound("http://hifi-public.s3.amazonaws.com/james/bubblewand/sounds/pop.wav");
-    var bubbleScript = 'http://hifi-public.s3.amazonaws.com/james/bubblewand/scripts/bubble.js?' + randInt(1, 10000);
+    //var bubbleScript = 'http://hifi-public.s3.amazonaws.com/james/bubblewand/scripts/bubble.js?' + randInt(1, 10000);
     //for local testing
-   // var bubbleScript = 'http://localhost:8080/scripts/bubble.js?' + randInt(1, 10000);
+    var bubbleScript = 'http://localhost:8080/bubble.js?' + randInt(1, 10000);
 
     var POP_SOUNDS = [
         SoundCache.getSound("http://hifi-public.s3.amazonaws.com/james/bubblewand/sounds/pop0.wav"),
@@ -319,8 +318,8 @@ Script.include("../libraries/utils.js");
                     y: 0.01,
                     z: 0.01
                 },
-                collisionsWillMove: false, //true
-                ignoreForCollisions: true, //false
+                collisionsWillMove: true, //true
+                ignoreForCollisions: false, //false
                 gravity: BUBBLE_GRAVITY,
                 collisionSoundURL: POP_SOUNDS[randInt(0, 4)],
                 shapeType: "sphere",