diff --git a/src/components/beat.js b/src/components/beat.js
index 94b380b..f2f689a 100644
--- a/src/components/beat.js
+++ b/src/components/beat.js
@@ -1,7 +1,7 @@
 import {BEAT_WARMUP_OFFSET, BEAT_WARMUP_SPEED, BEAT_WARMUP_TIME} from '../constants/beat';
 
 const auxObj3D = new THREE.Object3D();
-const collisionZThreshold = -4;
+const collisionZThreshold = -1.65;
 const BEAT_WARMUP_ROTATION_CHANGE = Math.PI / 5;
 const BEAT_WARMUP_ROTATION_OFFSET = 0.4;
 const BEAT_WARMUP_ROTATION_TIME = 750;
diff --git a/src/index.html b/src/index.html
index ca33bff..518dd05 100644
--- a/src/index.html
+++ b/src/index.html
@@ -138,7 +138,6 @@
         {% macro saber (hand, otherHand, bladeColor, beamColor) %}
           <a-entity id="{{ hand }}Hand"
             class="saber"
-            mixin="raycaster"
             bind__hand-swapper="enabled: {{ otherHand }}RaycasterActive"
             bind__menu-controls="page: search.page; selectedChallengeId: menuSelectedChallenge.id"
             bind__pauser="enabled: isPlaying"
@@ -228,7 +227,6 @@
         <a-entity
           id="mouseCursor"
           bind__raycaster="enabled: !inVR"
-          mixin="raycaster"
           cursor="rayOrigin: mouse"
           raycaster="objects: [raycastable]"></a-entity>
         <a-entity