diff --git a/SD_ROOT/wz_mini/etc/init.d/S06gpio b/SD_ROOT/wz_mini/etc/init.d/S06gpio
deleted file mode 100644
index 6c4a38d..0000000
--- a/SD_ROOT/wz_mini/etc/init.d/S06gpio
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-#Set the correct GPIO for the audio driver (T31 only)
-if [ -f /opt/wz_mini/tmp/.HL_PAN2 ]; then
-        GPIO=7
-elif [ -f /opt/wz_mini/tmp/.WYZE_CAKP2JFUS ]; then
-        GPIO=63
-fi
-
diff --git a/SD_ROOT/wz_mini/etc/init.d/S09firstboot b/SD_ROOT/wz_mini/etc/init.d/S09firstboot
index 50e3190..b593e06 100644
--- a/SD_ROOT/wz_mini/etc/init.d/S09firstboot
+++ b/SD_ROOT/wz_mini/etc/init.d/S09firstboot
@@ -1,5 +1,6 @@
 #!/bin/sh
 
+source /opt/wz_mini/etc/rc.common
 source /opt/wz_mini/wz_mini.conf
 
 if [ -e /opt/wz_mini/etc/.first_boot ]; then
diff --git a/SD_ROOT/wz_mini/etc/rc.common b/SD_ROOT/wz_mini/etc/rc.common
index 75ab761..ebabf24 100755
--- a/SD_ROOT/wz_mini/etc/rc.common
+++ b/SD_ROOT/wz_mini/etc/rc.common
@@ -21,6 +21,13 @@ else
 	CONFIG="HWaddr"
 fi
 
+#Set the correct GPIO for the audio driver (T31 only)
+if [ -f /opt/wz_mini/tmp/.HL_PAN2 ]; then
+        GPIO=7
+elif [ -f /opt/wz_mini/tmp/.WYZE_CAKP2JFUS ]; then
+        GPIO=63
+fi
+
 wait_for_wlan() {
 while true; do
         if ifconfig wlan0 | grep "$CONFIG"; then
diff --git a/SD_ROOT/wz_mini/etc/rc.d/S01swap b/SD_ROOT/wz_mini/etc/rc.d/S01swap
index 51b759b..acebde4 100644
--- a/SD_ROOT/wz_mini/etc/rc.d/S01swap
+++ b/SD_ROOT/wz_mini/etc/rc.d/S01swap
@@ -1,5 +1,6 @@
 #!/bin/sh
 
+source /opt/wz_mini/etc/rc.common
 source /opt/wz_mini/wz_mini.conf
 
 if [ -e /opt/wz_mini/swap.gz ]; then
diff --git a/SD_ROOT/wz_mini/usr/bin/app.ver b/SD_ROOT/wz_mini/usr/bin/app.ver
index 1f5bc29..a55dd2f 100644
--- a/SD_ROOT/wz_mini/usr/bin/app.ver
+++ b/SD_ROOT/wz_mini/usr/bin/app.ver
@@ -1 +1 @@
-Sun Jul 31 12:48:50 AM PDT 2022
+Sun Jul 31 12:56:40 AM PDT 2022
diff --git a/file.chk b/file.chk
index 194cc59..fdfb4e5 100644
--- a/file.chk
+++ b/file.chk
@@ -32,7 +32,7 @@ bd11d9a8352eca6a16554c87be50b2f5  SD_ROOT/wz_mini/www/index.html
 eaee762583ba295772686505711277f4  SD_ROOT/wz_mini/etc/network/S08hostname
 6f69930c6549e6438c92a21509213980  SD_ROOT/wz_mini/etc/network/S14storemac
 34c6a4c3a941ff2becd9f487826d7692  SD_ROOT/wz_mini/etc/uvc.config
-55e1256a75a62e3f7e5de3cf70706bde  SD_ROOT/wz_mini/etc/init.d/S09firstboot
+893b4982bb2ff2862393956e95f7ad62  SD_ROOT/wz_mini/etc/init.d/S09firstboot
 c857ea1bfa34bec22d706566977a2d39  SD_ROOT/wz_mini/etc/init.d/S11configbackup
 75bece2cfb62d4458256587b3421f756  SD_ROOT/wz_mini/etc/init.d/S10kmod
 97be853c83a323c58a165e0077978370  SD_ROOT/wz_mini/etc/init.d/S08passwd
@@ -45,14 +45,13 @@ c2272566f498e36d104cf82a79c6bfc9  SD_ROOT/wz_mini/etc/init.d/S01bind
 0704333eb4aa14e2c5b09282c626266a  SD_ROOT/wz_mini/etc/init.d/S04model
 997158df9e139fdfb1bf03b5d4ba895a  SD_ROOT/wz_mini/etc/init.d/S14terminfo
 84155615b192fb92a62c932cae6d190e  SD_ROOT/wz_mini/etc/init.d/S07inject
-e333f1b5921281994e1f603cb69cfd02  SD_ROOT/wz_mini/etc/init.d/S06gpio
 d5c528b391309f6c4a33ce4f3dc120de  SD_ROOT/wz_mini/etc/init.d/S02tmpfs
 e3034eac02d8eda9902ca9cf89f0a586  SD_ROOT/wz_mini/etc/inittab
 840aa9c26726201f7cffbf001bee193a  SD_ROOT/wz_mini/etc/uvc_jxf22.config
 d41d8cd98f00b204e9800998ecf8427e  SD_ROOT/wz_mini/etc/rc.local.d/.gitignore
 ac436b39b69f26fb65e993c2dfefb421  SD_ROOT/wz_mini/etc/wz_mini.conf.dist
 4291fb00ec609b5b007ff9b3048e9248  SD_ROOT/wz_mini/etc/hosts
-5b0c63a43114aeb91048747c4190ce03  SD_ROOT/wz_mini/etc/rc.common
+bbe9b12c25e0d6c2fdd54a5ecaf35138  SD_ROOT/wz_mini/etc/rc.common
 8b5e58acfcbb20034dc4873a08b45fd9  SD_ROOT/wz_mini/etc/profile
 2c2df1b9cb603f9c31c46162d6ac307f  SD_ROOT/wz_mini/etc/alsa/alsa.conf
 e239f638e9a0bcb615b2b9a9205b050f  SD_ROOT/wz_mini/etc/rc.d/K01network
@@ -67,7 +66,7 @@ dd8ced14fa4eeceaf3c49774e8762e9b  SD_ROOT/wz_mini/etc/rc.d/S14nightdrop
 e6e927ae715137152178ff317d17b8f2  SD_ROOT/wz_mini/etc/rc.d/S03ethernet
 8cf971c14e1340af9eb86c3b82f38131  SD_ROOT/wz_mini/etc/rc.d/S13mp4write
 769776b26247d680ca564c9af3288c91  SD_ROOT/wz_mini/etc/rc.d/S05rndis
-1bbaef7b8391c647e31f6cf6f149bf3f  SD_ROOT/wz_mini/etc/rc.d/S01swap
+19ff129af984cf133c92e9c524dda401  SD_ROOT/wz_mini/etc/rc.d/S01swap
 bbccf00adaf0b2494a98f18769e10a0f  SD_ROOT/wz_mini/etc/rc.d/K15logging
 69840400ee805665a3a4913003cf60db  SD_ROOT/wz_mini/etc/rc.d/S04usbdirect
 ca9df8b184f4bbc1c4bb9a18d3375b0b  SD_ROOT/wz_mini/etc/rc.d/S09coredump
@@ -150,7 +149,7 @@ b339aee882a5d1c943ad08e4282ec3fd  SD_ROOT/wz_mini/usr/bin/iCamera-dbg
 20b061689308b2cee7edf3b9b906bca7  SD_ROOT/wz_mini/usr/bin/ucamera
 3777d9e80c8b517c01a124e6360b6525  SD_ROOT/wz_mini/usr/bin/imp_helper.sh
 580b1b6e91e72b4a4fef7b21d8954403  SD_ROOT/wz_mini/usr/bin/getSensorType
-10f426c3b3cadc9544d0952d0023e882  SD_ROOT/wz_mini/usr/bin/app.ver
+1691c47a9371797367d7bcf435ae6957  SD_ROOT/wz_mini/usr/bin/app.ver
 4c780f0455481d106d47d89f0ae04ed5  SD_ROOT/wz_mini/lib/uClibc.tar
 9afeb088e4cbabbe0b04033b560204d0  SD_ROOT/wz_mini/lib/libimp.so
 4100755cb6cc6e3b76da20c7e3690e16  SD_ROOT/wz_mini/lib/libalog.so