diff --git a/examples/painting/whiteboard/colorIndicatorEntityScript.js b/examples/painting/whiteboard/colorIndicatorEntityScript.js
index 97deb0bc67..326e9ab9c3 100644
--- a/examples/painting/whiteboard/colorIndicatorEntityScript.js
+++ b/examples/painting/whiteboard/colorIndicatorEntityScript.js
@@ -21,20 +21,21 @@
     ColorIndicator.prototype = {
 
         changeColor: function() {
-            var newColor = Entities.getEntityProperties(this.whiteboard, "userData").currentColor;
-            Entities.editEntity(this.EntityID, {
+            var userData = JSON.parse(Entities.getEntityProperties(this.whiteboard, "userData").userData);
+            var newColor = userData.currentColor;
+            Entities.editEntity(this.entityID, {
                 color: newColor
             });
         },
 
         preload: function(entityID) {
             this.entityID = entityID;
-            var props = Entities.getEntityProperties(this.entityID, "userData");
+            var props = Entities.getEntityProperties(this.entityID, ["position", "userData"]);
             this.position = props.position;
             this.whiteboard = JSON.parse(props.userData).whiteboard;
         },
 
-    };
+    };    
 
     // entity scripts always need to return a newly constructed object of our type
     return new ColorIndicator();
diff --git a/examples/painting/whiteboard/whiteboardEntityScript.js b/examples/painting/whiteboard/whiteboardEntityScript.js
index f376c4f61c..9ed5d21065 100644
--- a/examples/painting/whiteboard/whiteboardEntityScript.js
+++ b/examples/painting/whiteboard/whiteboardEntityScript.js
@@ -189,6 +189,8 @@
             Overlays.editOverlay(this.laserPointer, {
                 color: this.strokeColor
             });
+
+            Entities.callEntityMethod(this.colorIndicator, "changeColor");
         },
 
         eraseBoard: function() {
diff --git a/examples/painting/whiteboard/whiteboardSpawner.js b/examples/painting/whiteboard/whiteboardSpawner.js
index 2624fba9b2..66be92466d 100644
--- a/examples/painting/whiteboard/whiteboardSpawner.js
+++ b/examples/painting/whiteboard/whiteboardSpawner.js
@@ -63,17 +63,29 @@ var colorIndicatorDimensions = {
     z: 0.02
 };
 scriptURL = Script.resolvePath("colorIndicatorEntityScript.js");
-var colorIndicatorPosition = Vec3.sum(center, {x: 0, y: whiteboardDimensions.y/2 + colorIndicatorDimensions.y/2, z: 0});
+var colorIndicatorPosition = Vec3.sum(center, {
+    x: 0,
+    y: whiteboardDimensions.y / 2 + colorIndicatorDimensions.y / 2,
+    z: 0
+});
 var colorIndicatorBox = Entities.addEntity({
     type: "Box",
     color: colors[0],
     rotation: rotation,
     position: colorIndicatorPosition,
     dimensions: colorIndicatorDimensions,
-    script: scriptURL
+    script: scriptURL,
+    userData: JSON.stringify({
+        whiteboard: whiteboard
+    })
 });
 
-Entities.editEntity(whiteboard, {userData: JSON.stringify({currentColor: colors[i], colorIndicator: colorIndicatorBox})} );
+Entities.editEntity(whiteboard, {
+    userData: JSON.stringify({
+        currentColor: colors[0],
+        colorIndicator: colorIndicatorBox
+    })
+});
 
 //COLOR BOXES
 var direction = Quat.getRight(rotation);
@@ -84,7 +96,7 @@ var colorSquareDimensions = {
     y: 0.1,
     z: 0.05
 };
-colorBoxPosition.y += whiteboardDimensions.y / 2 + colorIndicatorDimensions.y +  colorSquareDimensions.y / 2;
+colorBoxPosition.y += whiteboardDimensions.y / 2 + colorIndicatorDimensions.y + colorSquareDimensions.y / 2;
 var spaceBetweenColorBoxes = Vec3.multiply(direction, colorSquareDimensions.x * 2);
 var scriptURL = Script.resolvePath("colorSelectorEntityScript.js");
 for (var i = 0; i < colors.length; i++) {
@@ -106,18 +118,26 @@ for (var i = 0; i < colors.length; i++) {
 
 
 // BLACK BOX
-var blackBoxDimensions = {x: .2, y: .2, z: 0.05};
-colorBoxPosition = Vec3.subtract(center, Vec3.multiply(direction, whiteboardDimensions.x / 2 + blackBoxDimensions.x/2 - 0.01));
+var blackBoxDimensions = {
+    x: .2,
+    y: .2,
+    z: 0.05
+};
+colorBoxPosition = Vec3.subtract(center, Vec3.multiply(direction, whiteboardDimensions.x / 2 + blackBoxDimensions.x / 2 - 0.01));
 colorBoxPosition.y += 0.3;
 var blackBox = Entities.addEntity({
     type: 'Box',
     position: colorBoxPosition,
     dimensions: blackBoxDimensions,
     rotation: rotation,
-    color: {red: 0, green: 0, blue: 0},
+    color: {
+        red: 0,
+        green: 0,
+        blue: 0
+    },
     script: scriptURL,
     userData: JSON.stringify({
-        whiteboard: whiteboard        
+        whiteboard: whiteboard
     })
 });