diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp
index 0f9d3f2f81..39e6a56b02 100755
--- a/interface/src/avatar/MyAvatar.cpp
+++ b/interface/src/avatar/MyAvatar.cpp
@@ -431,7 +431,7 @@ void MyAvatar::reset(bool andRecenter, bool andReload, bool andHead) {
     _wasPushing = _isPushing = _isBraking = false;
     _follow.deactivate();
     if (andReload) {
-        //_skeletonModel->reset();
+        _skeletonModel->reset();
     }
     if (andHead) { // which drives camera in desktop
         getHead()->reset();
@@ -2037,7 +2037,9 @@ controller::Pose MyAvatar::getControllerPoseInSensorFrame(controller::Action act
 
 controller::Pose MyAvatar::getControllerPoseInWorldFrame(controller::Action action) const {
     auto pose = getControllerPoseInSensorFrame(action);
+    qCDebug(interfaceapp) << "avatar sensor orientation " << pose.getRotation();
     if (pose.valid) {
+        qCDebug(interfaceapp) << "sensor to world matrix orientation " << extractRotation(getSensorToWorldMatrix());
         return pose.transform(getSensorToWorldMatrix());
     } else {
         return controller::Pose(); // invalid pose
@@ -2047,6 +2049,7 @@ controller::Pose MyAvatar::getControllerPoseInWorldFrame(controller::Action acti
 controller::Pose MyAvatar::getControllerPoseInAvatarFrame(controller::Action action) const {
     auto pose = getControllerPoseInWorldFrame(action);
     if (pose.valid) {
+        qCDebug(interfaceapp) << "avatar world orientation " << getWorldOrientation();
         glm::mat4 invAvatarMatrix = glm::inverse(createMatFromQuatAndPos(getWorldOrientation(), getWorldPosition()));
         return pose.transform(invAvatarMatrix);
     } else {
diff --git a/interface/src/avatar/MySkeletonModel.cpp b/interface/src/avatar/MySkeletonModel.cpp
index 6aa4d1402f..d389d99e26 100644
--- a/interface/src/avatar/MySkeletonModel.cpp
+++ b/interface/src/avatar/MySkeletonModel.cpp
@@ -119,11 +119,22 @@ void MySkeletonModel::updateRig(float deltaTime, glm::mat4 parentTransform) {
     // input action is the highest priority source for head orientation.
     auto avatarHeadPose = myAvatar->getControllerPoseInAvatarFrame(controller::Action::HEAD);
     if (avatarHeadPose.isValid()) {
+        AnimPose previousHeadPose;
+        bool headUnfuckedWith = _rig.getAbsoluteJointPoseInRigFrame(_rig.indexOfJoint("Head"), previousHeadPose);
+        if (headUnfuckedWith) {
+            qCDebug(interfaceapp) << "unset head position " << previousHeadPose.trans();
+            qCDebug(interfaceapp) << "unset head rotation " << previousHeadPose.rot();
+        }
         qCDebug(interfaceapp) << "neck joint offset " << jointOffsetMap[62];
+        qCDebug(interfaceapp) << "head joint avatar frame " << avatarHeadPose.getRotation();
         AnimPose jointOffsetNeck(jointOffsetMap[62], glm::vec3());
         AnimPose jointOffsetSpine2(jointOffsetMap[13], glm::vec3());
+        AnimPose testPose(glm::quat(0.7071f, 0.0f, 0.0f, 0.7071f), glm::vec3());
         AnimPose pose(avatarHeadPose.getRotation(), avatarHeadPose.getTranslation());
-        params.primaryControllerPoses[Rig::PrimaryControllerType_Head] = jointOffsetSpine2.inverse() * jointOffsetNeck.inverse() * (avatarToRigPose * pose) * jointOffsetNeck * jointOffsetSpine2;
+        AnimPose newHeadRot = (avatarToRigPose * pose) * testPose;
+        AnimPose newHeadRot2(newHeadRot.rot(), avatarHeadPose.getTranslation());
+        AnimPose identityPose(glm::quat(1.0f,0.0f,0.0f,0.0f), glm::vec3(0.0f,0.57f,0.0f));
+        params.primaryControllerPoses[Rig::PrimaryControllerType_Head] = avatarToRigPose * pose;
         params.primaryControllerFlags[Rig::PrimaryControllerType_Head] = (uint8_t)Rig::ControllerFlags::Enabled;
     } else {
         // even though full head IK is disabled, the rig still needs the head orientation to rotate the head up and
@@ -234,7 +245,7 @@ void MySkeletonModel::updateRig(float deltaTime, glm::mat4 parentTransform) {
 
         // set spine2 if we have hand controllers
         qCDebug(interfaceapp) << "spine 2 joint offset " << jointOffsetMap[13];
-        if (false && myAvatar->getControllerPoseInAvatarFrame(controller::Action::RIGHT_HAND).isValid() &&
+        if (myAvatar->getControllerPoseInAvatarFrame(controller::Action::RIGHT_HAND).isValid() &&
             myAvatar->getControllerPoseInAvatarFrame(controller::Action::LEFT_HAND).isValid() &&
             !(params.primaryControllerFlags[Rig::PrimaryControllerType_Spine2] & (uint8_t)Rig::ControllerFlags::Enabled)) {
 
diff --git a/libraries/animation/src/Rig.cpp b/libraries/animation/src/Rig.cpp
index 1e20ec9a7d..a73c945124 100644
--- a/libraries/animation/src/Rig.cpp
+++ b/libraries/animation/src/Rig.cpp
@@ -2078,7 +2078,7 @@ void Rig::setJointRotationOffsets(const QMap<QString, glm::quat>& offsets) {
     int spine2Id = 13;
     if (true){ //neckIndex != -1) {
         _jointRotationOffsets.insert(neckId, glm::quat(0.0f, 0.7071f, 0.7071f, 0.0f) * glm::quat(0.5f, 0.5f, 0.5f, -0.5f) );  //glm::quat(0.7071f, 0.0f, -0.7071f, 0.0f)
-        qCDebug(animation) << "multiplied quats are " << glm::quat(0.0f, 0.7071f, 0.7071f, 0.0f) * glm::quat(0.5f, 0.5f, 0.5f, -0.5f);
+        qCDebug(animation) << "multiplied quats are " << glm::quat(0.7071f, 0.0f, -0.7071f, 0.0f) * glm::quat(0.5f, 0.5f, 0.5f, -0.5f);
     }
     if (true){ //spine2Index != -1) {
         _jointRotationOffsets.insert(spine2Id, glm::quat(0.5f, 0.5f, 0.5f, -0.5f));