diff --git a/package.json b/package.json
index 5dddcad44ee9555da38030ca53fb0c9c62b28be5..d7c6016bd666fe1b39f745802a6485972b146b8f 100644
--- a/package.json
+++ b/package.json
@@ -9,6 +9,7 @@
     "build": "webpack"
   },
   "dependencies": {
+    "aframe-teleport-controls": "^0.3.0",
     "easyrtc": "^1.1.0",
     "express": "^4.15.5",
     "networked-aframe": "https://github.com/netpro2k/networked-aframe",
diff --git a/public/index.html b/public/index.html
index dfeb6ba8c4be854bc474d5fd8ffaf1dde37bc0f2..0ca0f1661a130f7bf46957ce1452a4121b411c4b 100644
--- a/public/index.html
+++ b/public/index.html
@@ -3,7 +3,6 @@
 <head>
   <title>A-Frame Social VR Demo</title>
   <script src="https://aframe.io/releases/0.7.0/aframe.min.js"></script>
-  <script src="https://rawgit.com/fernandojsg/aframe-teleport-controls/master/dist/aframe-teleport-controls.min.js"></script>
   <script src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/1.4.5/socket.io.min.js"></script>
   <script src="easyrtc/easyrtc.js"></script>
   <script src="./app.bundle.js"></script>
@@ -32,8 +31,8 @@
     <a-entity id="player" networked="template:#player-template;showLocalTemplate:false;" wasd-controls>
       <a-entity camera="userHeight: 1.6" look-controls networked="template:#head-template;showLocalTemplate:false;"></a-entity>
 
-      <a-entity hand-controls="left" networked="template:#hand-template;showLocalTemplate:true;"></a-entity>
-      <a-entity hand-controls="right" networked="template:#hand-template;showLocalTemplate:true;"></a-entity>
+      <a-entity hand-controls="left" teleport-controls="cameraRig: #player" networked="template:#hand-template;showLocalTemplate:true;"></a-entity>
+      <a-entity hand-controls="right" teleport-controls="cameraRig: #player" networked="template:#hand-template;showLocalTemplate:true;"></a-entity>
     </a-entity>
 
     <a-entity id="ground" position="0 0 0"
diff --git a/src/index.js b/src/index.js
index 29c73e321a7b957f9c17ac88cd2fc6aa28047942..c5ec1b94a2893fcc4e3c3de7367250e0e8997187 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,3 +1,4 @@
 require("networked-aframe");
+require('aframe-teleport-controls');
 
 console.log("test2");