diff --git a/.vs/ProjectSettings.json b/.vs/ProjectSettings.json
new file mode 100644
index 0000000..f8b4888
--- /dev/null
+++ b/.vs/ProjectSettings.json
@@ -0,0 +1,3 @@
+{
+  "CurrentProjectSetting": null
+}
\ No newline at end of file
diff --git a/.vs/VSWorkspaceState.json b/.vs/VSWorkspaceState.json
new file mode 100644
index 0000000..2971e61
--- /dev/null
+++ b/.vs/VSWorkspaceState.json
@@ -0,0 +1,7 @@
+{
+  "ExpandedNodes": [
+    ""
+  ],
+  "SelectedNode": "\\C:\\Users\\Vincent\\Source\\Repos\\wz_mini_hacks",
+  "PreviewInSolutionExplorer": false
+}
\ No newline at end of file
diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite
new file mode 100644
index 0000000..b7cce89
Binary files /dev/null and b/.vs/slnx.sqlite differ
diff --git a/.vs/wz_mini_hacks/FileContentIndex/ba48046c-cca0-4c55-8e1b-417e1e7082c0.vsidx b/.vs/wz_mini_hacks/FileContentIndex/ba48046c-cca0-4c55-8e1b-417e1e7082c0.vsidx
new file mode 100644
index 0000000..000fd7a
Binary files /dev/null and b/.vs/wz_mini_hacks/FileContentIndex/ba48046c-cca0-4c55-8e1b-417e1e7082c0.vsidx differ
diff --git a/.vs/wz_mini_hacks/FileContentIndex/read.lock b/.vs/wz_mini_hacks/FileContentIndex/read.lock
new file mode 100644
index 0000000..e69de29
diff --git a/.vs/wz_mini_hacks/v17/.wsuo b/.vs/wz_mini_hacks/v17/.wsuo
new file mode 100644
index 0000000..e721101
Binary files /dev/null and b/.vs/wz_mini_hacks/v17/.wsuo differ
diff --git a/SD_ROOT/wz_mini/etc/network.d/S09dnsmasq b/SD_ROOT/wz_mini/etc/network.d/S09dnsmasq
index dc98165..41991de 100644
--- a/SD_ROOT/wz_mini/etc/network.d/S09dnsmasq
+++ b/SD_ROOT/wz_mini/etc/network.d/S09dnsmasq
@@ -16,7 +16,10 @@ dnsmasq_launch() {
 
 	if [[ "$ENABLE_LOCAL_DNS" == "true" ]]; then
                 echo "wait for resolv.conf creation from iCamera"
-                sleep 5
+                while [ ! -f /tmp/resolv.conf ]
+                do
+                	sleep .2
+                done
 		#kill the system dnsmasq if present
                 dmon_pid=$(pgrep -f "dmon.*dnsmasq")
                         if [ -n "$dmon_pid" ]; then
@@ -28,9 +31,9 @@ dnsmasq_launch() {
                 else
                 /opt/wz_mini/bin/dnsmasq -C /opt/wz_mini/etc/dnsmasq.conf
                 fi
-		sleep 3
-		rm -f /tmp/resolv.conf
-		cp /opt/wz_mini/etc/resolv.conf /tmp/resolv.conf
+                #mount the resolv.conf file as read only. Something (ICamera?) randomly seems to change it.
+                mount --bind /opt/wz_mini/etc/resolv.conf /tmp/resolv.conf
+                mount -o bind,remount,ro /tmp/resolv.conf
 		echo "dnsmasq enabled"
 	fi
 }
diff --git a/SD_ROOT/wz_mini/etc/rc.d/S10firmware b/SD_ROOT/wz_mini/etc/rc.d/S10firmware
index df22d74..1625734 100644
--- a/SD_ROOT/wz_mini/etc/rc.d/S10firmware
+++ b/SD_ROOT/wz_mini/etc/rc.d/S10firmware
@@ -18,23 +18,6 @@ case "$1" in
 			#echo -e "127.0.0.1 localhost \n127.0.0.1 wyze-upgrade-service.wyzecam.com" > /opt/wz_mini/tmp/.storage/hosts
 			#mount --bind /opt/wz_mini/tmp/.storage/hosts /etc/hosts
 			/opt/wz_mini/bin/busybox inotifyd /opt/wz_mini/usr/bin/watch_up.sh /tmp:n > /dev/null 2>&1 &
-
-			if [ -f /opt/wz_mini/tmp/.WYZE_CAKP2JFUS ]; then
-				# v3
-				printf "[VER]\nappver=4.36.13.0416\n" > /opt/wz_mini/tmp/patched_app.ver
-			elif [ -f /opt/wz_mini/tmp/.WYZEC1-JZ ]; then
-				# v2
-				printf "[VER]\nappver=4.9.9.3006\n" > /opt/wz_mini/tmp/patched_app.ver
-			elif [ -f /opt/wz_mini/tmp/.WYZECP1_JEF ]; then
-				# pan v1
-				printf "[VER]\nappver=4.10.9.3006\n" > /opt/wz_mini/tmp/patched_app.ver
-			elif [ -f /opt/wz_mini/tmp/.HL_PAN2 ]; then
-				# pan v2
-				printf "[VER]\nappver=4.49.13.0653\n" > /opt/wz_mini/tmp/patched_app.ver
-			fi
-
-			mount --bind /opt/wz_mini/tmp/patched_app.ver /system/bin/app.ver
-
 			echo "Firmware updates disabled"
 		else
 			echo "Firmwware updates enabled, monitor script running"
diff --git a/SD_ROOT/wz_mini/etc/rc.d/S11spoofing b/SD_ROOT/wz_mini/etc/rc.d/S11spoofing
new file mode 100644
index 0000000..f26405e
--- /dev/null
+++ b/SD_ROOT/wz_mini/etc/rc.d/S11spoofing
@@ -0,0 +1,37 @@
+#!/bin/sh
+### BEGIN INIT INFO
+# Provides:
+# Short-Description: FW Version Spoof
+# Description:       Spoofs firmware version of ICamera
+### END INIT INFO
+
+. /opt/wz_mini/wz_mini.conf
+
+case "$1" in
+	start)
+		echo "#####$(basename "$0")#####"
+
+		if [[ "$SPOOF_FW_VER="true" ]]; then
+		if [ -f /opt/wz_mini/tmp/.WYZE_CAKP2JFUS ]; then
+				# v3
+				printf "[VER]\nappver=4.36.13.0416\n" > /opt/wz_mini/tmp/patched_app.ver
+			elif [ -f /opt/wz_mini/tmp/.WYZEC1-JZ ]; then
+				# v2
+				printf "[VER]\nappver=4.9.9.3006\n" > /opt/wz_mini/tmp/patched_app.ver
+			elif [ -f /opt/wz_mini/tmp/.WYZECP1_JEF ]; then
+				# pan v1
+				printf "[VER]\nappver=4.10.9.3006\n" > /opt/wz_mini/tmp/patched_app.ver
+			elif [ -f /opt/wz_mini/tmp/.HL_PAN2 ]; then
+				# pan v2
+				printf "[VER]\nappver=4.49.13.0653\n" > /opt/wz_mini/tmp/patched_app.ver
+			fi
+			mount --bind /opt/wz_mini/tmp/patched_app.ver /system/bin/app.ver
+			echo "Firmware version spoofed"
+			fi
+
+		;;
+	*)
+		echo "Usage: $0 {start}"
+		exit 1
+		;;
+esac
diff --git a/SD_ROOT/wz_mini/etc/wz_mini.conf.dist b/SD_ROOT/wz_mini/etc/wz_mini.conf.dist
index 33b5e98..f5b7b5b 100644
--- a/SD_ROOT/wz_mini/etc/wz_mini.conf.dist
+++ b/SD_ROOT/wz_mini/etc/wz_mini.conf.dist
@@ -103,6 +103,7 @@ ENABLE_USB_STORAGE="false"
 ENABLE_EXT4="false"
 ENABLE_CIFS="false"
 DISABLE_FW_UPGRADE="true"
+SPOOF_FW_VER="true"
 AUDIO_PROMPT_VOLUME="50"
 ENABLE_MP4_WRITE="false"
 NIGHT_DROP_DISABLE="false"
diff --git a/SD_ROOT/wz_mini/wz_mini.conf b/SD_ROOT/wz_mini/wz_mini.conf
index 33b5e98..f5b7b5b 100644
--- a/SD_ROOT/wz_mini/wz_mini.conf
+++ b/SD_ROOT/wz_mini/wz_mini.conf
@@ -103,6 +103,7 @@ ENABLE_USB_STORAGE="false"
 ENABLE_EXT4="false"
 ENABLE_CIFS="false"
 DISABLE_FW_UPGRADE="true"
+SPOOF_FW_VER="true"
 AUDIO_PROMPT_VOLUME="50"
 ENABLE_MP4_WRITE="false"
 NIGHT_DROP_DISABLE="false"