diff --git a/examples/controllers/handControllerGrab.js b/examples/controllers/handControllerGrab.js
index 17d16d1718..29d6595c3a 100644
--- a/examples/controllers/handControllerGrab.js
+++ b/examples/controllers/handControllerGrab.js
@@ -148,6 +148,7 @@ function MyController(hand, triggerAction) {
     this.state = STATE_OFF;
     this.pointer = null; // entity-id of line object
     this.triggerValue = 0; // rolling average of trigger value
+    this.rawTriggerValue = 0;
 
     var _this = this;
 
@@ -244,12 +245,17 @@ function MyController(hand, triggerAction) {
         this.pointer = null;
     };
 
-    this.updateSmoothedTrigger = function() {
-        var triggerValue = Controller.getValue(this.triggerAction);
+    this.eitherTrigger = function (value) {
+        _this.rawTriggerValue = value;
+    };
+
+    this.updateSmoothedTrigger = function () {
+        var triggerValue = this.rawTriggerValue;
         // smooth out trigger value
         this.triggerValue = (this.triggerValue * TRIGGER_SMOOTH_RATIO) +
             (triggerValue * (1.0 - TRIGGER_SMOOTH_RATIO));
-    }
+
+    };
 
     this.triggerSmoothedSqueezed = function() {
         return this.triggerValue > TRIGGER_ON_VALUE;
@@ -259,8 +265,8 @@ function MyController(hand, triggerAction) {
         return this.triggerValue < TRIGGER_OFF_VALUE;
     };
 
-    this.triggerSqueezed = function() {
-        var triggerValue = Controller.getValue(this.triggerAction);
+    this.triggerSqueezed = function() { 
+        var triggerValue = this.rawTriggerValue;
         return triggerValue > TRIGGER_ON_VALUE;
     };
 
@@ -861,6 +867,14 @@ function MyController(hand, triggerAction) {
 var rightController = new MyController(RIGHT_HAND, Controller.Standard.RT);
 var leftController = new MyController(LEFT_HAND, Controller.Standard.LT);
 
+var MAPPING_NAME = "com.highfidelity.handControllerGrab";
+
+var mapping = Controller.newMapping(MAPPING_NAME);
+mapping.from([Controller.Standard.RB, Controller.Standard.RT]).to(rightController.eitherTrigger);
+mapping.from([Controller.Standard.LB, Controller.Standard.LT]).to(leftController.eitherTrigger);
+Controller.enableMapping(MAPPING_NAME);
+
+
 function update() {
     rightController.update();
     leftController.update();
@@ -869,6 +883,7 @@ function update() {
 function cleanup() {
     rightController.cleanup();
     leftController.cleanup();
+    Controller.disableMapping(MAPPING_NAME);
 }
 
 Script.scriptEnding.connect(cleanup);
diff --git a/examples/example/games/hydraGrabHockey.js b/examples/example/games/hydraGrabHockey.js
index b9f760fa08..26f9a443ab 100644
--- a/examples/example/games/hydraGrabHockey.js
+++ b/examples/example/games/hydraGrabHockey.js
@@ -59,9 +59,7 @@ function controller(side) {
   this.triggerHeld = false;
   this.triggerThreshold = 0.9;
   this.side = side;
-  this.palm = 2 * side;
-  this.tip = 2 * side + 1;
-  this.trigger = side;
+  this.trigger = side == LEFT ? Controller.Standard.LT : Controller.Standard.RT;
   this.originalGravity = {
     x: 0,
     y: 0,
@@ -150,8 +148,8 @@ function controller(side) {
 
 
   this.updateControllerState = function() {
-    this.palmPosition = Controller.getSpatialControlPosition(this.palm);
-    this.tipPosition = Controller.getSpatialControlPosition(this.tip);
+    this.palmPosition = this.side == RIGHT ? MyAvatar.rightHandPose.translation : MyAvatar.leftHandPose.translation;
+    this.tipPosition = this.side == RIGHT ? MyAvatar.rightHandTipPose.translation : MyAvatar.leftHandTipPose.translation;
     this.triggerValue = Controller.getTriggerValue(this.trigger);
   }
 
diff --git a/examples/example/painting/hydraPaint.js b/examples/example/painting/hydraPaint.js
index 29a3323e72..36137945cc 100644
--- a/examples/example/painting/hydraPaint.js
+++ b/examples/example/painting/hydraPaint.js
@@ -71,10 +71,8 @@ function controller(side, cycleColorButton) {
     this.triggerHeld = false;
     this.triggerThreshold = 0.9;
     this.side = side;
-    this.palm = 2 * side;
-    this.tip = 2 * side + 1;
-    this.trigger = side;
-    this.cycleColorButton = cycleColorButton;
+    this.trigger = side == LEFT ? Controller.Stantard.LT : Controller.Standard.RT;
+    this.cycleColorButton = side == LEFT ? Controller.Stantard.LeftPrimaryThumb : Controller.Standard.RightPrimaryThumb;
 
     this.points = [];
     this.normals = [];
@@ -173,11 +171,10 @@ function controller(side, cycleColorButton) {
 
 
     this.updateControllerState = function() {
-        this.cycleColorButtonPressed = Controller.isButtonPressed(this.cycleColorButton);
-        this.palmPosition = Controller.getSpatialControlPosition(this.palm);
-        this.tipPosition = Controller.getSpatialControlPosition(this.tip);
-        this.palmNormal = Controller.getSpatialControlNormal(this.palm);
-        this.triggerValue = Controller.getTriggerValue(this.trigger);
+        this.cycleColorButtonPressed = Controller.getValue(this.cycleColorButton);
+        this.palmPosition = this.side == RIGHT ? MyAvatar.rightHandPose.translation : MyAvatar.leftHandPose.translation;
+        this.tipPosition = this.side == RIGHT ? MyAvatar.rightHandTipPose.translation : MyAvatar.leftHandTipPose.translation;
+        this.triggerValue = Controller.getValue(this.trigger);
 
         
         if (this.prevCycleColorButtonPressed === true && this.cycleColorButtonPressed === false) {
@@ -215,8 +212,8 @@ function vectorIsZero(v) {
 }
 
 
-var rightController = new controller(RIGHT, RIGHT_BUTTON_4);
-var leftController = new controller(LEFT, LEFT_BUTTON_4);
+var rightController = new controller(RIGHT);
+var leftController = new controller(LEFT);
 Script.update.connect(update);
 Script.scriptEnding.connect(scriptEnding);