diff --git a/user_space/update_sdcard.sh b/user_space/update_sdcard.sh
index c2649bd..45c4efd 100755
--- a/user_space/update_sdcard.sh
+++ b/user_space/update_sdcard.sh
@@ -166,10 +166,14 @@ sudo mkdir $SDCARD_DIR/rootfs/lib/modules
 
 sudo mkdir $SDCARD_DIR/rootfs/lib/modules/$LINUX_KERNEL_SRC_DIR_NAME32
 sudo find $OPENWIFI_DIR/$LINUX_KERNEL_SRC_DIR_NAME32 -name \*.ko -exec cp {} $SDCARD_DIR/rootfs/lib/modules/$LINUX_KERNEL_SRC_DIR_NAME32/ \;
+sudo mv $SDCARD_DIR/rootfs/lib/modules/$LINUX_KERNEL_SRC_DIR_NAME32/xilinx_dma.ko $SDCARD_DIR/rootfs/root/openwifi/drv32
+sudo mv $SDCARD_DIR/rootfs/lib/modules/$LINUX_KERNEL_SRC_DIR_NAME32/ad9361_drv.ko $SDCARD_DIR/rootfs/root/openwifi/drv32
 sudo rm $SDCARD_DIR/rootfs/lib/modules/$LINUX_KERNEL_SRC_DIR_NAME32/{axidmatest.ko,adi_axi_hdmi.ko} -f
 
 sudo mkdir $SDCARD_DIR/rootfs/lib/modules/$LINUX_KERNEL_SRC_DIR_NAME64
 sudo find $OPENWIFI_DIR/$LINUX_KERNEL_SRC_DIR_NAME64 -name \*.ko -exec cp {} $SDCARD_DIR/rootfs/lib/modules/$LINUX_KERNEL_SRC_DIR_NAME64/ \;
+sudo mv $SDCARD_DIR/rootfs/lib/modules/$LINUX_KERNEL_SRC_DIR_NAME64/xilinx_dma.ko $SDCARD_DIR/rootfs/root/openwifi/drv64
+sudo mv $SDCARD_DIR/rootfs/lib/modules/$LINUX_KERNEL_SRC_DIR_NAME64/ad9361_drv.ko $SDCARD_DIR/rootfs/root/openwifi/drv64
 sudo rm $SDCARD_DIR/rootfs/lib/modules/$LINUX_KERNEL_SRC_DIR_NAME64/{axidmatest.ko,adi_axi_hdmi.ko} -f
 
 sudo rm $SDCARD_DIR/rootfs/etc/udev/rules.d/70-persistent-net.rules
diff --git a/user_space/wgd.sh b/user_space/wgd.sh
index 99f7829..3273404 100755
--- a/user_space/wgd.sh
+++ b/user_space/wgd.sh
@@ -38,14 +38,65 @@ else
 fi
 echo last_input $last_input
 echo test_mode $test_mode
-
+depmod
 modprobe mac80211
-
+lsmod
 # dmesg -c
 
 PROG=sdr
 rmmod $PROG
 
+
+# mv ad9361 driver to local folder, to prevent booting issue
+if [ -f /lib/modules/$(uname -r)/ad9361_drv.ko ]; then
+   mv /lib/modules/$(uname -r)/ad9361_drv.ko .
+fi
+SUBMODULE=ad9361_drv
+if [ $last_input == "remote" ]
+  then
+    rm $SUBMODULE.ko
+    sync
+    wget ftp://192.168.10.1/driver/ad9361/$SUBMODULE.ko
+    sync
+fi
+rmmod $SUBMODULE
+insmod $SUBMODULE.ko
+
+echo check $SUBMODULE module is loaded or not
+checkModule $SUBMODULE
+if [ $? -eq 1 ]
+then
+  return
+fi
+sleep 1
+lsmod
+
+# mv xilinx dma driver to local folder, to prevent booting issue
+if [ -f /lib/modules/$(uname -r)/xilinx_dma.ko ]; then
+   mv /lib/modules/$(uname -r)/xilinx_dma.ko .
+fi
+SUBMODULE=xilinx_dma
+if [ $last_input == "remote" ]
+  then
+    rm $SUBMODULE.ko
+    sync
+    wget ftp://192.168.10.1/driver/$SUBMODULE/$SUBMODULE.ko
+    sync
+fi
+rmmod $SUBMODULE
+insmod $SUBMODULE.ko
+
+#sleep 1
+
+echo check $SUBMODULE module is loaded or not
+checkModule $SUBMODULE
+if [ $? -eq 1 ]
+then
+  return
+fi
+sleep 1
+lsmod
+
 # before drive ad9361, let's bring up duc and make sure dac is connected to ad9361 dma
 SUBMODULE=tx_intf
 if [ $last_input == "remote" ]