diff --git a/Projects/Android/jni/src/Lambda1VR/L1VR_SurfaceView.c b/Projects/Android/jni/src/Lambda1VR/L1VR_SurfaceView.c
index acc05c7..2036276 100644
--- a/Projects/Android/jni/src/Lambda1VR/L1VR_SurfaceView.c
+++ b/Projects/Android/jni/src/Lambda1VR/L1VR_SurfaceView.c
@@ -1232,7 +1232,7 @@ static void ovrApp_HandleInput( ovrApp * app )
             flashlightoffset[2] = offHandRemoteTracking->HeadPose.Pose.Position.z - hmdPosition[2];
 
             QuatToYawPitchRoll(offHandRemoteTracking->HeadPose.Pose.Orientation, flashlightangles);
-            flashlightangles[YAW] += cl.refdef.cl_viewangles[YAW];
+            flashlightangles[YAW] += (cl.refdef.cl_viewangles[YAW] - hmdorientation[YAW]);
 
             controllerYawHeading = -cl.refdef.cl_viewangles[YAW] + flashlightangles[YAW] - hmdorientation[YAW];
 
diff --git a/Projects/Android/jni/src/Xash3D/xash3d/engine/client/cl_main.c b/Projects/Android/jni/src/Xash3D/xash3d/engine/client/cl_main.c
index d793e2d..feb5aa5 100644
--- a/Projects/Android/jni/src/Xash3D/xash3d/engine/client/cl_main.c
+++ b/Projects/Android/jni/src/Xash3D/xash3d/engine/client/cl_main.c
@@ -2269,8 +2269,8 @@ Host_ClientFrame
 ==================
 */
 #ifdef VR
-int r_stereo_side; // Move this.. this is bad placement
-void Host_ClientFrame( int eye )
+		int r_stereo_side; // Move this.. this is bad placement
+				void Host_ClientFrame( int eye )
 #else
 void Host_ClientFrame(  )
 #endif
diff --git a/Projects/Android/jni/src/Xash3D/xash3d/engine/client/cl_view.c b/Projects/Android/jni/src/Xash3D/xash3d/engine/client/cl_view.c
index 0868cc2..49721c7 100644
--- a/Projects/Android/jni/src/Xash3D/xash3d/engine/client/cl_view.c
+++ b/Projects/Android/jni/src/Xash3D/xash3d/engine/client/cl_view.c
@@ -330,6 +330,9 @@ V_CalcRefDef
 sets cl.refdef view values
 ===============
 */
+#ifdef VR
+extern int r_stereo_side; // Move this.. this is bad placement
+#endif
 void V_CalcRefDef( void )
 {
 	R_Set2DMode( false );
@@ -337,8 +340,11 @@ void V_CalcRefDef( void )
 
 	do
 	{
-		clgame.dllFuncs.pfnCalcRefdef( &cl.refdef );
-		V_MergeOverviewRefdef( &cl.refdef );
+	    //Only recalc refdef once
+	    if (r_stereo_side == VR_EYE_LEFT || r_stereo_side == VR_EYE_MONO) {
+            clgame.dllFuncs.pfnCalcRefdef(&cl.refdef);
+            V_MergeOverviewRefdef(&cl.refdef);
+        }
 		R_RenderFrame( &cl.refdef, true );
 		cl.refdef.onlyClientDraw = false;
 	} while( cl.refdef.nextView );
diff --git a/Projects/Android/jni/src/hlsdk-xash3d/dlls/glock.cpp b/Projects/Android/jni/src/hlsdk-xash3d/dlls/glock.cpp
index 1150d8b..5c0d9e6 100644
--- a/Projects/Android/jni/src/hlsdk-xash3d/dlls/glock.cpp
+++ b/Projects/Android/jni/src/hlsdk-xash3d/dlls/glock.cpp
@@ -106,7 +106,7 @@ BOOL CGlock::Deploy()
 
 void CGlock::SecondaryAttack( void )
 {
-	GlockFire( 0.1, 0.2, FALSE );
+	//GlockFire( 0.1, 0.2, FALSE );
 }
 
 void CGlock::PrimaryAttack( void )
diff --git a/assets/models/v_357.mdl b/assets/models/v_357.mdl
new file mode 100644
index 0000000..f5d37c4
Binary files /dev/null and b/assets/models/v_357.mdl differ
diff --git a/assets/models/v_9mmar.mdl b/assets/models/v_9mmar.mdl
new file mode 100644
index 0000000..ff0ff5e
Binary files /dev/null and b/assets/models/v_9mmar.mdl differ
diff --git a/assets/models/v_9mmhandgun.mdl b/assets/models/v_9mmhandgun.mdl
new file mode 100644
index 0000000..d9f7ed8
Binary files /dev/null and b/assets/models/v_9mmhandgun.mdl differ
diff --git a/assets/models/v_crossbow.mdl b/assets/models/v_crossbow.mdl
new file mode 100644
index 0000000..9584b33
Binary files /dev/null and b/assets/models/v_crossbow.mdl differ
diff --git a/assets/models/v_crowbar.mdl b/assets/models/v_crowbar.mdl
new file mode 100644
index 0000000..c06d9fd
Binary files /dev/null and b/assets/models/v_crowbar.mdl differ
diff --git a/assets/models/v_egon.mdl b/assets/models/v_egon.mdl
new file mode 100644
index 0000000..2ea820d
Binary files /dev/null and b/assets/models/v_egon.mdl differ
diff --git a/assets/models/v_gauss.mdl b/assets/models/v_gauss.mdl
new file mode 100644
index 0000000..0bdd27f
Binary files /dev/null and b/assets/models/v_gauss.mdl differ
diff --git a/assets/models/v_grenade.mdl b/assets/models/v_grenade.mdl
new file mode 100644
index 0000000..14535e5
Binary files /dev/null and b/assets/models/v_grenade.mdl differ
diff --git a/assets/models/v_hgun.mdl b/assets/models/v_hgun.mdl
new file mode 100644
index 0000000..c48180e
Binary files /dev/null and b/assets/models/v_hgun.mdl differ
diff --git a/assets/models/v_rpg.mdl b/assets/models/v_rpg.mdl
new file mode 100644
index 0000000..21b4ad4
Binary files /dev/null and b/assets/models/v_rpg.mdl differ
diff --git a/assets/models/v_satchel.mdl b/assets/models/v_satchel.mdl
new file mode 100644
index 0000000..1af3d64
Binary files /dev/null and b/assets/models/v_satchel.mdl differ
diff --git a/assets/models/v_satchel_radio.mdl b/assets/models/v_satchel_radio.mdl
new file mode 100644
index 0000000..12b2c32
Binary files /dev/null and b/assets/models/v_satchel_radio.mdl differ
diff --git a/assets/models/v_shotgun.mdl b/assets/models/v_shotgun.mdl
new file mode 100644
index 0000000..3b547e7
Binary files /dev/null and b/assets/models/v_shotgun.mdl differ
diff --git a/assets/models/v_squeak.mdl b/assets/models/v_squeak.mdl
new file mode 100644
index 0000000..1f6e7de
Binary files /dev/null and b/assets/models/v_squeak.mdl differ
diff --git a/assets/models/v_tripmine.mdl b/assets/models/v_tripmine.mdl
new file mode 100644
index 0000000..9effb4e
Binary files /dev/null and b/assets/models/v_tripmine.mdl differ
diff --git a/java/com/drbeef/lambda1vr/GLES3JNIActivity.java b/java/com/drbeef/lambda1vr/GLES3JNIActivity.java
index 41e1883..39a5009 100644
--- a/java/com/drbeef/lambda1vr/GLES3JNIActivity.java
+++ b/java/com/drbeef/lambda1vr/GLES3JNIActivity.java
@@ -60,8 +60,24 @@ import static android.system.Os.setenv;
 		params.screenBrightness = 1.0f;
 		getWindow().setAttributes( params );
 
-		copy_asset(getFilesDir().getPath(), "extras.pak");
+		copy_asset(getFilesDir().getPath(), "extras.pak", false);
 
+		//Copy modified weapon models
+		copy_asset("/sdcard/xash/valve/", "models/v_9mmar.mdl", true);
+		copy_asset("/sdcard/xash/valve/", "models/v_9mmhandgun.mdl", true);
+		copy_asset("/sdcard/xash/valve/", "models/v_357.mdl", true);
+		copy_asset("/sdcard/xash/valve/", "models/v_crossbow.mdl", true);
+		copy_asset("/sdcard/xash/valve/", "models/v_crowbar.mdl", true);
+		copy_asset("/sdcard/xash/valve/", "models/v_egon.mdl", true);
+		copy_asset("/sdcard/xash/valve/", "models/v_gauss.mdl", true);
+		copy_asset("/sdcard/xash/valve/", "models/v_grenade.mdl", true);
+		copy_asset("/sdcard/xash/valve/", "models/v_hgun.mdl", true);
+		copy_asset("/sdcard/xash/valve/", "models/v_rpg.mdl", true);
+		copy_asset("/sdcard/xash/valve/", "models/v_satchel.mdl", true);
+		copy_asset("/sdcard/xash/valve/", "models/v_satchel_radio.mdl", true);
+		copy_asset("/sdcard/xash/valve/", "models/v_shotgun.mdl", true);
+		copy_asset("/sdcard/xash/valve/", "models/v_squeak.mdl", true);
+		copy_asset("/sdcard/xash/valve/", "models/v_tripmine.mdl", true);
 
 		//Set default environment
 		try {
@@ -105,9 +121,9 @@ import static android.system.Os.setenv;
 		mNativeHandle = GLES3JNILib.onCreate( this, commandLineParams );
 	}
 	
-	public void copy_asset(String path, String name) {
+	public void copy_asset(String path, String name, boolean forceOverwrite) {
 		File f = new File(path + "/" + name);
-		if (!f.exists()) {
+		if (!f.exists() || forceOverwrite) {
 			
 			//Ensure we have an appropriate folder
 			new File(path).mkdirs();