diff --git a/FunKey/board/funkey/rootfs-overlay/etc/init.d/S01first_boot b/FunKey/board/funkey/rootfs-overlay/etc/init.d/S01first_boot
index 86e8f8f..7ac8c2a 100755
--- a/FunKey/board/funkey/rootfs-overlay/etc/init.d/S01first_boot
+++ b/FunKey/board/funkey/rootfs-overlay/etc/init.d/S01first_boot
@@ -4,8 +4,19 @@ THIS=$(basename $0)
 
 case "$1" in
     start)
-	if [ ! -f /.first_boot ]; then
+
+	# Check is SWAP partition already created
+	sgdisk /dev/mmcblk0 | grep swap
+    if [ $? -ne 0 ]; then
+		first_boot
+		exit $?
+	fi
+
+	# Check is share partition already created
+	sgdisk /dev/mmcblk0 | grep share
+	if [ $? -eq 0 ]; then
 	    first_boot
+	    exit $?
 	fi
 	;;
     stop)
diff --git a/FunKey/board/funkey/rootfs-overlay/usr/local/sbin/first_boot b/FunKey/board/funkey/rootfs-overlay/usr/local/sbin/first_boot
index 27e3b5c..a849a71 100755
--- a/FunKey/board/funkey/rootfs-overlay/usr/local/sbin/first_boot
+++ b/FunKey/board/funkey/rootfs-overlay/usr/local/sbin/first_boot
@@ -169,8 +169,6 @@ notif " 9/9 COPY FILES TO ^    USB PARTITION"
 copy_files_to_store_partition
 
 notif " FIRST BOOT SETUP FINISHED!"
-rw
-touch /.first_boot
-ro
+
 sleep 1
 clear_notif
diff --git a/FunKey/board/funkey/rootfs-overlay/usr/local/sbin/share b/FunKey/board/funkey/rootfs-overlay/usr/local/sbin/share
index 92b7384..8e29850 100755
--- a/FunKey/board/funkey/rootfs-overlay/usr/local/sbin/share
+++ b/FunKey/board/funkey/rootfs-overlay/usr/local/sbin/share
@@ -48,7 +48,7 @@ mount_share () {
     fi
 
     # Create the directory structure if required
-    (cd /mnt; mkdir -p "Atari lynx" "Game Boy" "Game Boy Color" "Game Boy Advance" "Game Gear" "Neo Geo Pocket" "NES" "PS1" "Sega Genesis" "Sega Master System" "SNES" "WonderSwan" "PCE-TurboGrafx")
+    (cd /mnt; mkdir -p "Atari lynx" "Game Boy" "Game Boy Color" "Game Boy Advance" "Game Gear" "Neo Geo Pocket" "NES" "PS1" "PS1/bios" "Sega Genesis" "Sega Master System" "SNES" "WonderSwan" "PCE-TurboGrafx")
 
     # Check if there is a firmware update file
     if [ -f /mnt/FunKey-*.fwu ]; then
diff --git a/FunKey/board/funkey/update_partition b/FunKey/board/funkey/update_partition
index c5c4a2e..bbbc887 100755
--- a/FunKey/board/funkey/update_partition
+++ b/FunKey/board/funkey/update_partition
@@ -9,44 +9,21 @@ root_mount=/tmp/rootfs
 
 do_preinst()
 {
-    notif " 1/5 EXTRACT FIRMWARE UPDATE.."
+    notif " 1/3 EXTRACT FIRMWARE UPDATE..^DO NOT TURN OFF THE CONSOLE"
     exit 0
 }
 
 do_postinst()
 {
-    local version
-
-    notif "2/5 RESIZE ROOT FILESYSTEM"
+    notif " 2/3 RESIZE ROOT FILESYSTEM^DO NOT TURN OFF THE CONSOLE"
     resize2fs ${root_part}
     if [ $? -ne 0 ]; then
-	notif "CANNOT RESIZE ROOT FILESYSTEM"
-	exit 1
+    	notif " CANNOT RESIZE ROOT ^FILESYSTEM"
+    	exit 1
     fi
-    notif "3/5 MOUNT ROOT FILESYSTEM"
-    mkdir -p ${root_mount}
-    mount -t ext4 ${root_part} ${root_mount}
-    if [ $? -ne 0 ]; then
-	notif "CANNOT MOUNT ROOT FILESYSTEM"
-	exit 1
-    fi
-    sgdisk /dev/mmcblk0 | grep swap
-    if [ $? -eq 0 ]; then
-	sgdisk /dev/mmcblk0 | grep share
-	if [ $? -eq 0 ]; then
-	    touch $[root_mount]/.first_boot
-	fi
-    fi
-    notif "4/5 UNMOUNT ROOT FILESYSTEM"
-    touch "${root_mount}/.first_boot"
-    umount ${root_mount}
-    if [ $? -ne 0 ]; then
-	notif "CANNOT UNMOUNT ROOT FILESYSTEM"
-	exit 1
-    fi
-    for file in $(ls /mnt/FunKey-rootfs-*.fwu); do
-	notif "5/5 ERASE UPDATE FILE"
-	rm -f "${file}"
+    for file in $(ls /mnt/FunKey-*.fwu); do
+    	notif " 3/3 ERASE UPDATE FILE^DO NOT TURN OFF THE CONSOLE"
+    	rm -f "${file}"
     done
     exit 0
 }