diff --git a/.gitmodules b/.gitmodules
index 631258e..747b588 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -13,3 +13,6 @@
 [submodule "flutter_zxing"]
 	path = flutter_zxing
 	url = https://github.com/hhanh00/flutter_zxing.git
+[submodule "orchard"]
+	path = orchard
+	url = https://github.com/hhanh00/orchard.git
diff --git a/Cargo.toml b/Cargo.toml
index e8972c8..c760664 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -6,22 +6,23 @@ lto = true
 codegen-units = 1
 debug = false
 
-#[patch."https://github.com/hhanh00/zcash-params.git"]
-#zcash_params = { path = "native/zcash-params" }
+[patch."https://github.com/hhanh00/zcash-params.git"]
+zcash_params = { path = "native/zcash-params" }
 
-#[patch."https://github.com/hhanh00/librustzcash.git"]
-#zcash_client_backend = { path = "librustzcash/zcash_client_backend" }
-#zcash_primitives = { path = "librustzcash/zcash_primitives" }
-#zcash_proofs = { path = "librustzcash/zcash_proofs" }
-#zcash_address = { path = "librustzcash/components/zcash_address" }
-#zcash_encoding = { path = "librustzcash/components/zcash_encoding" }
-#zcash_note_encryption = { path = "librustzcash/components/zcash_note_encryption" }
+[patch."https://github.com/hhanh00/librustzcash.git"]
+zcash_client_backend = { path = "librustzcash/zcash_client_backend" }
+zcash_primitives = { path = "librustzcash/zcash_primitives" }
+zcash_proofs = { path = "librustzcash/zcash_proofs" }
+zcash_address = { path = "librustzcash/components/zcash_address" }
+zcash_encoding = { path = "librustzcash/components/zcash_encoding" }
+zcash_note_encryption = { path = "librustzcash/components/zcash_note_encryption" }
 
 [patch.crates-io]
-#zcash_note_encryption = { path = "librustzcash/components/zcash_note_encryption" }
-zcash_note_encryption = { git = "https://github.com/hhanh00/librustzcash.git", rev = "e2fe0b8d386fad99e00d6135c5caf3cc04045646" }
+zcash_note_encryption = { path = "librustzcash/components/zcash_note_encryption" }
+#zcash_note_encryption = { git = "https://github.com/hhanh00/librustzcash.git", rev = "e2fe0b8d386fad99e00d6135c5caf3cc04045646" }
 
 # Android 32-bit fix
 halo2_gadgets  = { git = "https://github.com/zcash/halo2.git", rev = "642924d614305d882cc122739c59144109f4bd3f" }
 halo2_proofs = { git = "https://github.com/zcash/halo2.git", rev = "642924d614305d882cc122739c59144109f4bd3f" }
-orchard = { git = "https://github.com/zcash/orchard.git", rev = "6cbde279e90974201bedbd9b5ddf155e8f8b1e8e" }
+#orchard = { git = "https://github.com/zcash/orchard.git", rev = "6cbde279e90974201bedbd9b5ddf155e8f8b1e8e" }
+orchard = { path = "orchard" }
diff --git a/native/zcash-sync b/native/zcash-sync
index 6ef1b31..58b36ad 160000
--- a/native/zcash-sync
+++ b/native/zcash-sync
@@ -1 +1 @@
-Subproject commit 6ef1b31f9e8b6ee0c217b65d337da734fbf2e826
+Subproject commit 58b36ad32188a0c1fba087cb44dc9d803d5b77b3
diff --git a/orchard b/orchard
new file mode 160000
index 0000000..50ee3c6
--- /dev/null
+++ b/orchard
@@ -0,0 +1 @@
+Subproject commit 50ee3c6a6d51cc334f5bba41281f7f562722bb27