diff --git a/debug-shell.sh b/debug-shell.sh
new file mode 100755
index 0000000..98ea781
--- /dev/null
+++ b/debug-shell.sh
@@ -0,0 +1 @@
+telnet 172.16.42.1
diff --git a/device-xiaomi-angelican/APKBUILD b/device-xiaomi-angelican/APKBUILD
index fd47ee3..2255341 100644
--- a/device-xiaomi-angelican/APKBUILD
+++ b/device-xiaomi-angelican/APKBUILD
@@ -33,7 +33,7 @@ package() {
 }
 
 sha512sums="
-edd9a99632443f555d1bff2a50b429d04ce540e3f0d099eaa22f7a7c0fa2b0e10f846d9aead589d69dde0b433e5966728ff3357895102c849969351c8ae33c31  deviceinfo
+1508fda77236dd7ac8802edb5bb764b8df286beb432d805d8bcb778eace16c90de8ff5d1aad2e1325262dd2ea30b3397e6142614d0fb348239ab230eaf7af1f4  deviceinfo
 87a1e3b1f31a7a2717992621eaad272d8ad7e2dca7346e7fcd583e70eb73d817bcfc32b51c322e19ccf575fa0ef3ea7f6279e3176abc4db0c5d49336b9971d05  BT_FW.cfg
 3f973f1ae3f24dd9aa087976cc5965aad41c4a0065f69b3e20c1ebe44e34ee2821312f9610b0c8db6b7b6782cb196afca557f86819514e3873d0be468c588ef4  Himax_firmware.bin
 43bea79d5af5ada68eb96b5947c88f385f15d7691c6868bf54dcc31ca7175b037422d7e19065b2e24a511de6d60082b11676b7e8e0b3dccbc66a09c1d64e1f1d  Himax_mpfw.bin
diff --git a/device-xiaomi-angelican/deviceinfo b/device-xiaomi-angelican/deviceinfo
index dc27884..1bf72c9 100644
--- a/device-xiaomi-angelican/deviceinfo
+++ b/device-xiaomi-angelican/deviceinfo
@@ -7,7 +7,6 @@ deviceinfo_name="Xiaomi Redmi 9C NFC"
 deviceinfo_manufacturer="Xiaomi"
 deviceinfo_codename="xiaomi-angelican"
 deviceinfo_year="2020"
-deviceinfo_dtb="mediatek/merged"
 deviceinfo_arch="aarch64"
 
 # Device related
@@ -19,21 +18,19 @@ deviceinfo_screen_height="1600"
 
 # Bootloader related
 deviceinfo_kernel_cmdline="bootopt=64S3,32N2,64N2 androidboot.init_fatal_reboot_target=recovery buildvariant=userdebug kpti=off"
-# deviceinfo_kernel_cmdline="bootopt=64S3,32N2,64N2 buildvariant=user"
-# deviceinfo_create_initfs_extra="true"
-deviceinfo_flash_method="fastboot"
-deviceinfo_flash_sparse="true"
+# deviceinfo_kernel_cmdline="bootopt=64S3,32N2,64N2 buildvariant=user" # default kernel cmdline
+# deviceinfo_create_initfs_extra="true" # make extra space for initfs
 deviceinfo_bootimg_mtk_mkimage="false"
 deviceinfo_bootimg_qcdt="false"
-deviceinfo_bootimg_dtb_second="false"
 
 # Flashing related
-deviceinfo_flash_fastboot_partition_dtbo="dtbo"
+deviceinfo_flash_method="fastboot"
+deviceinfo_flash_sparse="true"
+deviceinfo_flash_fastboot_partition_rootfs="userdata"
 deviceinfo_generate_bootimg="true"
-deviceinfo_flash_fastboot_partition_rootfs="system"
+
+# Offsets
 deviceinfo_flash_pagesize="2048"
-deviceinfo_header_version="2"
-deviceinfo_append_dtb="false"
 deviceinfo_flash_offset_dtb="0x07808000"
 deviceinfo_flash_offset_base="0x40078000"
 deviceinfo_flash_offset_kernel="0x00008000"
@@ -41,4 +38,14 @@ deviceinfo_flash_offset_ramdisk="0x11a88000"
 deviceinfo_flash_offset_second="0xbff88000"
 deviceinfo_flash_offset_tags="0x07808000"
 
+# dtb
+deviceinfo_dtb="mediatek/merged"
+deviceinfo_append_dtb="false"
+# deviceinfo_flash_fastboot_partition_dtbo="dtbo" # use prebuilt dtbo.img! for some reason pmbootstrap cant make it
+deviceinfo_bootimg_dtb_second="false"
 
+# remove ncm error
+deviceinfo_usb_network_function="rndis.usb0"
+
+# enable debug-shell
+deviceinfo_kernel_cmdline_append="pmos.debug-shell"
diff --git a/reinit-pmbootstrap-work.sh b/reinit-pmbootstrap-work.sh
new file mode 100755
index 0000000..5e02f6a
--- /dev/null
+++ b/reinit-pmbootstrap-work.sh
@@ -0,0 +1,46 @@
+#!/bin/bash
+
+source extract-paths.sh
+pmbootstrap -y zap
+pmbootstrap shutdown
+sudo rm -rf $PMWORK
+
+python3 - <<'EOF'
+import subprocess, time, os
+
+proc = subprocess.Popen(
+  ["pmbootstrap", "init"],
+  stdin=subprocess.PIPE,
+  stdout=subprocess.PIPE,
+  stderr=subprocess.STDOUT,
+  text=True,
+  bufsize=1
+)
+
+def skip_question(wait_for=""):
+  while wait_for not in proc.stdout.readline():
+    time.sleep(0.1)
+  proc.stdin.write("\n")
+  proc.stdin.flush()
+
+skip_question()
+
+os.system(f"git clone https://gitlab.postmarketos.org/postmarketOS/pmaports.git {os.environ['PMAPORTS']}")
+
+skip_question()
+
+os.system(f"ln -s {os.environ['PWD']}/linux-xiaomi-angelican {os.environ['PMAPORTS']}/device/testing")
+os.system(f"ln -s {os.environ['PWD']}/device-xiaomi-angelican {os.environ['PMAPORTS']}/device/testing")
+
+skip_question("Channel")
+
+for _ in range(4):
+  skip_question()
+
+skip_question("User interface")
+
+for _ in range(9):
+  skip_question()
+
+proc.wait()
+EOF