diff --git a/advanced/button-interrupt/exercise/Cargo.toml b/advanced/button-interrupt/exercise/Cargo.toml
index 9735f215..7de41d35 100644
--- a/advanced/button-interrupt/exercise/Cargo.toml
+++ b/advanced/button-interrupt/exercise/Cargo.toml
@@ -24,6 +24,3 @@ esp32-c3-dkc02-bsc = { path = "../../../common/lib/esp32-c3-dkc02-bsc" }
 [build-dependencies]
 embuild = "0.28"
 anyhow = "1"
-
-[patch.crates-io]
-riscv = { git = "https://github.com/rust-embedded/riscv", rev = "396fb9b"}
diff --git a/advanced/button-interrupt/solution/Cargo.toml b/advanced/button-interrupt/solution/Cargo.toml
index 9735f215..7de41d35 100644
--- a/advanced/button-interrupt/solution/Cargo.toml
+++ b/advanced/button-interrupt/solution/Cargo.toml
@@ -24,6 +24,3 @@ esp32-c3-dkc02-bsc = { path = "../../../common/lib/esp32-c3-dkc02-bsc" }
 [build-dependencies]
 embuild = "0.28"
 anyhow = "1"
-
-[patch.crates-io]
-riscv = { git = "https://github.com/rust-embedded/riscv", rev = "396fb9b"}
diff --git a/advanced/i2c-driver/solution/Cargo.toml b/advanced/i2c-driver/solution/Cargo.toml
index 272af831..9947a4cf 100644
--- a/advanced/i2c-driver/solution/Cargo.toml
+++ b/advanced/i2c-driver/solution/Cargo.toml
@@ -17,8 +17,8 @@ default = ["native"]
 native = ["esp-idf-sys/native"]
 
 [dependencies]
-esp-idf-sys = { version = "0.31", features = ["binstart"] }
-esp-idf-hal = "0.35.1"
+esp-idf-sys = { version = "=0.31.5", features = ["binstart"] }
+esp-idf-hal = "=0.38"
 anyhow = "1"
 embedded-hal = "0.2.7"
 
@@ -26,6 +26,3 @@ embedded-hal = "0.2.7"
 [build-dependencies]
 embuild = "0.28"
 anyhow = "1"
-
-[patch.crates-io]
-riscv = { git = "https://github.com/rust-embedded/riscv", rev = "396fb9b"}
diff --git a/advanced/i2c-sensor-reading/solution/Cargo.toml b/advanced/i2c-sensor-reading/solution/Cargo.toml
index 997c04c4..6945cd53 100644
--- a/advanced/i2c-sensor-reading/solution/Cargo.toml
+++ b/advanced/i2c-sensor-reading/solution/Cargo.toml
@@ -17,13 +17,13 @@ default = ["native"]
 native = ["esp-idf-sys/native"]
 
 [dependencies]
-esp-idf-sys = { version = "0.31", features = ["binstart"] }
-esp-idf-hal = "0.35.1"
+esp-idf-sys = { version = "=0.31.5", features = ["binstart"] }
+esp-idf-hal = "=0.38"
 anyhow = "1"
 embedded-hal = "0.2.7"
 shtcx = "0.10.0"
 lis3dh = "0.4.1"
-shared-bus = "0.2.2"
+shared-bus = "0.2.4"
 imc42670p = { path = "../../../common/lib/imc42670p" }
 
 
@@ -31,6 +31,3 @@ imc42670p = { path = "../../../common/lib/imc42670p" }
 [build-dependencies]
 embuild = "0.28"
 anyhow = "1"
-
-[patch.crates-io]
-riscv = { git = "https://github.com/rust-embedded/riscv", rev = "396fb9b"}
diff --git a/book/src/03_3_2_http_client.md b/book/src/03_3_2_http_client.md
index e67cce8b..bc656510 100644
--- a/book/src/03_3_2_http_client.md
+++ b/book/src/03_3_2_http_client.md
@@ -35,11 +35,11 @@ The `get` function uses [as_ref()](https://doc.rust-lang.org/std/convert/trait.A
 
 
 ```Rust
-let request = client.get(some_url_ref)?;
+let request = client.get(url.as_ref())?;
 // the parameter passed to `into_writer` is the number of bytes
 // the client intends to send
 let writer = request.into_writer(0)?;
-let response = writer.into_response()?;
+let response = writer.submit()?;
 ```
 The parameter passed to `into_writer` is the number of bytes the client intends to send. Here we are not trying to send anything. 
 
diff --git a/book/src/03_4_http_server.md b/book/src/03_4_http_server.md
index e132122b..37d404c9 100644
--- a/book/src/03_4_http_server.md
+++ b/book/src/03_4_http_server.md
@@ -64,4 +64,5 @@ We can also report dynamic information to a client. The skeleton includes a conf
 
 ## Troubleshooting
 
-- `httpd_txrx: httpd_resp_send_err` can be solved by restarting, or `cargo clean` if nothing happens.
\ No newline at end of file
+- `httpd_txrx: httpd_resp_send_err` can be solved by restarting, or `cargo clean` if nothing happens.
+- Make sure computer and rust board are using the same wifi network.
\ No newline at end of file
diff --git a/common/lib/esp32-c3-dkc02-bsc/Cargo.lock b/common/lib/esp32-c3-dkc02-bsc/Cargo.lock
index 226588ab..4ef8c9b6 100644
--- a/common/lib/esp32-c3-dkc02-bsc/Cargo.lock
+++ b/common/lib/esp32-c3-dkc02-bsc/Cargo.lock
@@ -26,6 +26,15 @@ version = "1.0.53"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "94a45b455c14666b85fc40a019e8ab9eb75e3a124e05494f5397122bc9eb06e0"
 
+[[package]]
+name = "atomic-polyfill"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e14bf7b4f565e5e717d7a7a65b2a05c0b8c96e4db636d6f780f03b15108cdd1b"
+dependencies = [
+ "critical-section",
+]
+
 [[package]]
 name = "atty"
 version = "0.2.14"
@@ -45,15 +54,18 @@ checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
 
 [[package]]
 name = "bare-metal"
-version = "1.0.0"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8fe8f5a8a398345e52358e18ff07cc17a568fbca5c6f73873d3a62056309603"
+checksum = "5deb64efa5bd81e31fcd1938615a6d98c82eafcbcd787162b6f63b91d6bac5b3"
+dependencies = [
+ "rustc_version 0.2.3",
+]
 
 [[package]]
-name = "base64"
-version = "0.12.3"
+name = "bare-metal"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff"
+checksum = "f8fe8f5a8a398345e52358e18ff07cc17a568fbca5c6f73873d3a62056309603"
 
 [[package]]
 name = "bindgen"
@@ -84,6 +96,12 @@ version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dcb6dd1c2376d2e096796e234a70e17e94cc2d5d54ff8ce42b28cef1d0d359a4"
 
+[[package]]
+name = "bitfield"
+version = "0.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "46afbd2983a5d5a7bd740ccb198caf5b82f45c40c09c0eed36052d91cb92e719"
+
 [[package]]
 name = "bitflags"
 version = "1.3.2"
@@ -105,6 +123,12 @@ version = "1.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "439989e6b8c38d1b6570a384ef1e49c8848128f5a97f3914baef02920842712f"
 
+[[package]]
+name = "byteorder"
+version = "1.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
+
 [[package]]
 name = "cc"
 version = "1.0.72"
@@ -161,6 +185,30 @@ dependencies = [
  "cc",
 ]
 
+[[package]]
+name = "cortex-m"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cd20d4ac4aa86f4f75f239d59e542ef67de87cce2c282818dc6e84155d3ea126"
+dependencies = [
+ "bare-metal 0.2.5",
+ "bitfield",
+ "embedded-hal 0.2.7",
+ "volatile-register",
+]
+
+[[package]]
+name = "critical-section"
+version = "0.2.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "95da181745b56d4bd339530ec393508910c909c784e8962d15d722bacf0bcbcd"
+dependencies = [
+ "bare-metal 1.0.0",
+ "cfg-if",
+ "cortex-m",
+ "riscv",
+]
+
 [[package]]
 name = "crossbeam-channel"
 version = "0.5.5"
@@ -208,9 +256,9 @@ dependencies = [
 
 [[package]]
 name = "cstr_core"
-version = "0.2.5"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "644828c273c063ab0d39486ba42a5d1f3a499d35529c759e763a9c6cb8a0fb08"
+checksum = "dd98742e4fdca832d40cab219dc2e3048de17d873248f83f17df47c1bea70956"
 dependencies = [
  "cty",
  "memchr",
@@ -295,50 +343,40 @@ dependencies = [
 
 [[package]]
 name = "embedded-hal"
-version = "1.0.0-alpha.7"
+version = "1.0.0-alpha.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93cc714edeae73aa1ff259af4498595360b2992e0e9c59801873ed198a7f2216"
+checksum = "c3babfc7fd332142a0b11aebf592992f211f4e01b6222fb04b03aba1bd80018d"
 dependencies = [
  "nb 1.0.0",
 ]
 
 [[package]]
-name = "embedded-svc"
-version = "0.19.1"
+name = "embedded-io"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aeac0cf436604eced307910b6676bac59f328c07875b8f8d7c65bc5ecee9dbf4"
+checksum = "36673b79844ff4ec0e3f00aeca0b2cfff564ff6739ab9801d13f45a8ec6cc1c7"
 dependencies = [
- "anyhow",
- "enumset",
  "futures",
- "http-auth-basic",
- "log",
- "no-std-net",
- "num_enum",
- "serde",
- "serde_json",
- "strum 0.23.0",
- "strum_macros 0.23.1",
 ]
 
 [[package]]
-name = "embuild"
-version = "0.28.4"
+name = "embedded-svc"
+version = "0.22.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a76f3d7e8ed0354738a5e220441e9866cf6ce0750e446aded4c11315ae279bb8"
+checksum = "b52805b9b97351bb74d61d513e226bddb81e6e5117bca61d1d4371d4c795d7cc"
 dependencies = [
  "anyhow",
- "bitflags",
- "dirs",
+ "embedded-io",
+ "enumset",
+ "futures",
+ "heapless",
  "log",
+ "no-std-net",
+ "num_enum",
  "serde",
  "serde_json",
- "shlex",
  "strum 0.23.0",
  "strum_macros 0.23.1",
- "thiserror",
- "toml",
- "xmas-elf",
 ]
 
 [[package]]
@@ -404,32 +442,33 @@ dependencies = [
 
 [[package]]
 name = "esp-idf-hal"
-version = "0.35.1"
+version = "0.38.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c9745ec647d871638d95dd5a17e0e9cafade6b64679b3a4399d935b16887173"
+checksum = "cc998eadd4eb0b3da435b72b5f4ac29b16b8937224bc08d49e5701038a1ab2d6"
 dependencies = [
  "anyhow",
  "embedded-hal 0.2.7",
- "embedded-hal 1.0.0-alpha.7",
+ "embedded-hal 1.0.0-alpha.8",
  "embedded-svc",
- "embuild 0.28.4",
+ "embuild",
  "esp-idf-sys",
  "nb 0.1.3",
 ]
 
 [[package]]
 name = "esp-idf-svc"
-version = "0.39.1"
+version = "0.42.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "075259b99be1d75c7274399f11cbcb67415c88f7e3d822c6531fed78fcb8716d"
+checksum = "98f380bf76e2fc822680a7f424051e11877e82f74fb946ed7400f9dc596bcec3"
 dependencies = [
  "anyhow",
  "cstr_core",
  "embedded-svc",
- "embuild 0.28.4",
+ "embuild",
  "enumset",
  "esp-idf-hal",
  "esp-idf-sys",
+ "heapless",
  "log",
  "uncased",
 ]
@@ -442,7 +481,7 @@ checksum = "b239e46fe930f21ed36a25de1b6d29a0e22b65166f3a8e44624095a671f2f56c"
 dependencies = [
  "anyhow",
  "bindgen",
- "embuild 0.29.3",
+ "embuild",
  "paste",
  "regex",
  "strum 0.24.1",
@@ -470,7 +509,7 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "382a36a399c646e7823b2fc9be785910b32c49a676c535bc63abb9acceee284c"
 dependencies = [
- "bare-metal",
+ "bare-metal 1.0.0",
  "riscv",
  "vcell",
 ]
@@ -556,11 +595,15 @@ version = "0.3.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d8b7abd5d659d9b90c8cba917f6ec750a74e2dc23902ef9cd4cc8c8b22e6036a"
 dependencies = [
+ "futures-channel",
  "futures-core",
+ "futures-io",
  "futures-sink",
  "futures-task",
+ "memchr",
  "pin-project-lite",
  "pin-utils",
+ "slab",
 ]
 
 [[package]]
@@ -604,6 +647,29 @@ dependencies = [
  "walkdir",
 ]
 
+[[package]]
+name = "hash32"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b0c35f58762feb77d74ebe43bdbc3210f09be9fe6742234d573bacc26ed92b67"
+dependencies = [
+ "byteorder",
+]
+
+[[package]]
+name = "heapless"
+version = "0.7.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9f6733da246dc2af610133c8be0667170fd68e8ca5630936b520300eee8846f9"
+dependencies = [
+ "atomic-polyfill",
+ "hash32",
+ "rustc_version 0.4.0",
+ "serde",
+ "spin",
+ "stable_deref_trait",
+]
+
 [[package]]
 name = "heck"
 version = "0.3.3"
@@ -628,15 +694,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "http-auth-basic"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df69b6a68474b935f436fb9c84139f32de4f7759810090d1a3a5e592553f7ee0"
-dependencies = [
- "base64",
-]
-
 [[package]]
 name = "humantime"
 version = "2.1.0"
@@ -710,6 +767,15 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "lock_api"
+version = "0.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "88943dd7ef4a2e5a4bfa2753aaab3013e34ce2533d1996fb18ef591e315e2b3b"
+dependencies = [
+ "scopeguard",
+]
+
 [[package]]
 name = "log"
 version = "0.4.14"
@@ -960,7 +1026,7 @@ name = "riscv"
 version = "0.7.0"
 source = "git+https://github.com/rust-embedded/riscv?rev=396fb9b#396fb9b8daeb11e8632e53ccc42590385a1eeb87"
 dependencies = [
- "bare-metal",
+ "bare-metal 1.0.0",
  "bit_field",
  "embedded-hal 0.2.7",
  "riscv-target",
@@ -982,6 +1048,24 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
 
+[[package]]
+name = "rustc_version"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
+dependencies = [
+ "semver 0.9.0",
+]
+
+[[package]]
+name = "rustc_version"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
+dependencies = [
+ "semver 1.0.12",
+]
+
 [[package]]
 name = "rustversion"
 version = "1.0.6"
@@ -1009,6 +1093,27 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
 
+[[package]]
+name = "semver"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
+dependencies = [
+ "semver-parser",
+]
+
+[[package]]
+name = "semver"
+version = "1.0.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2333e6df6d6598f2b1974829f853c2b4c5f4a6e503c10af918081aa6f8564e1"
+
+[[package]]
+name = "semver-parser"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
+
 [[package]]
 name = "serde"
 version = "1.0.136"
@@ -1046,6 +1151,30 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3"
 
+[[package]]
+name = "slab"
+version = "0.4.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "spin"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f6002a767bff9e83f8eeecf883ecb8011875a21ae8da43bffb817a57e78cc09"
+dependencies = [
+ "lock_api",
+]
+
+[[package]]
+name = "stable_deref_trait"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
+
 [[package]]
 name = "strsim"
 version = "0.8.0"
@@ -1199,9 +1328,9 @@ dependencies = [
 
 [[package]]
 name = "uncased"
-version = "0.9.6"
+version = "0.9.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5baeed7327e25054889b9bd4f975f32e5f4c5d434042d59ab6cd4142c0a76ed0"
+checksum = "09b01702b0fd0b3fadcf98e098780badda8742d4f4a7676615cad90e8ac73622"
 dependencies = [
  "version_check",
 ]
@@ -1248,6 +1377,15 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
 
+[[package]]
+name = "volatile-register"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ee8f19f9d74293faf70901bc20ad067dc1ad390d2cbf1e3f75f721ffee908b6"
+dependencies = [
+ "vcell",
+]
+
 [[package]]
 name = "walkdir"
 version = "2.3.2"
diff --git a/common/lib/esp32-c3-dkc02-bsc/Cargo.toml b/common/lib/esp32-c3-dkc02-bsc/Cargo.toml
index dbd01543..c71a11d3 100644
--- a/common/lib/esp32-c3-dkc02-bsc/Cargo.toml
+++ b/common/lib/esp32-c3-dkc02-bsc/Cargo.toml
@@ -7,16 +7,13 @@ edition = "2021"
 
 
 [dependencies]
-esp32c3 = "=0.3.0"
+esp32c3 = "=0.4"
 esp-idf-sys = { version = "=0.31.5" }
-esp-idf-svc = { version="=0.39.1", features = ["experimental", "alloc"] }
-esp-idf-hal = "=0.35.1"
-embedded-svc = "=0.19"
+esp-idf-svc = { version= "=0.42.1", features = ["experimental", "alloc"] }
+esp-idf-hal = "=0.38"
+embedded-svc = "=0.22"
 rgb = "0.8"
 log = "0.4"
 anyhow = "1"
 toml-cfg = "0.1"
-riscv = { version = "0.7", features=["inline-asm"] }
-
-[patch.crates-io]
-riscv = { git = "https://github.com/rust-embedded/riscv", rev = "396fb9b"}
+riscv = { version = "0.8" }
\ No newline at end of file
diff --git a/common/lib/esp32-c3-dkc02-bsc/src/wifi.rs b/common/lib/esp32-c3-dkc02-bsc/src/wifi.rs
index 73d7ed14..b5accc5b 100644
--- a/common/lib/esp32-c3-dkc02-bsc/src/wifi.rs
+++ b/common/lib/esp32-c3-dkc02-bsc/src/wifi.rs
@@ -11,6 +11,7 @@ use esp_idf_svc::{
     netif::EspNetifStack, nvs::EspDefaultNvs, sysloop::EspSysLoopStack, wifi::EspWifi,
 };
 use log::info;
+use std::time::Duration;
 
 #[allow(unused)]
 pub struct Wifi {
@@ -21,11 +22,11 @@ pub struct Wifi {
 }
 
 pub fn wifi(ssid: &str, psk: &str) -> anyhow::Result<Wifi> {
-    let mut auth_method = AuthMethod::WPA2Personal;
-    if ssid.len() == 0 {
+    let mut auth_method = AuthMethod::WPA2Personal; // Todo: add this setting - router dependent
+    if ssid.is_empty() {
         anyhow::bail!("missing WiFi name")
     }
-    if psk.len() == 0 {
+    if psk.is_empty() {
         auth_method = AuthMethod::None;
         info!("Wifi password is empty");
     }
@@ -63,22 +64,32 @@ pub fn wifi(ssid: &str, psk: &str) -> anyhow::Result<Wifi> {
         ssid: ssid.into(),
         password: psk.into(),
         channel,
-        auth_method: auth_method,
+        auth_method,
         ..Default::default()
     }))?;
 
     info!("getting Wifi status");
 
+    wifi.wait_status_with_timeout(Duration::from_secs(2100), |status| {
+        !status.is_transitional()
+    })
+    .map_err(|err| anyhow::anyhow!("Unexpected Wifi status (Transitional state): {:?}", err))?;
+
     let status = wifi.get_status();
 
     if let wifi::Status(
-        ClientStatus::Started(ClientConnectionStatus::Connected(ClientIpStatus::Done(_))),
+        ClientStatus::Started(ClientConnectionStatus::Connected(ClientIpStatus::Done(
+            _ip_settings,
+        ))),
         _,
     ) = status
     {
-        info!("Wifi connected!");
+        info!("Wifi connected");
     } else {
-        bail!("Unexpected Wifi status: {:?}", status);
+        bail!(
+            "Could not connect to Wifi - Unexpected Wifi status: {:?}",
+            status
+        );
     }
 
     let wifi = Wifi {
diff --git a/intro/hardware-check/Cargo.toml b/intro/hardware-check/Cargo.toml
index d5cc4087..c6290e79 100644
--- a/intro/hardware-check/Cargo.toml
+++ b/intro/hardware-check/Cargo.toml
@@ -18,6 +18,7 @@ native = ["esp-idf-sys/native"]
 
 [dependencies]
 esp-idf-sys = { version = "=0.31.5", features = ["binstart"] }
+esp-idf-svc = { version="=0.42.1", features = ["experimental", "alloc"] }
 esp32-c3-dkc02-bsc = { path = "../../common/lib/esp32-c3-dkc02-bsc" }
 log = "0.4"
 anyhow = "1"
@@ -26,6 +27,3 @@ toml-cfg = "0.1"
 [build-dependencies]
 embuild = "0.28"
 anyhow = "1"
-
-[patch.crates-io]
-riscv = { git = "https://github.com/rust-embedded/riscv", rev = "396fb9b"}
diff --git a/intro/hardware-check/src/main.rs b/intro/hardware-check/src/main.rs
index c7db94ee..3e4a177e 100644
--- a/intro/hardware-check/src/main.rs
+++ b/intro/hardware-check/src/main.rs
@@ -33,8 +33,9 @@ fn main() -> anyhow::Result<()> {
     use bsc::led::RGB8;
 
     esp_idf_sys::link_patches();
+    esp_idf_svc::log::EspLogger::initialize_default();
 
-    println!("Hello, world!");
+    info!("Hello, world!");
 
     // Start the LED off yellow
     let mut led = bsc::led::WS2812RMT::new()?;
diff --git a/intro/http-client/exercise/Cargo.toml b/intro/http-client/exercise/Cargo.toml
index 0b71666c..3c3cf88c 100644
--- a/intro/http-client/exercise/Cargo.toml
+++ b/intro/http-client/exercise/Cargo.toml
@@ -17,10 +17,10 @@ default = ["native"]
 native = ["esp-idf-sys/native"]
 
 [dependencies]
-esp-idf-svc="=0.39.1"
+esp-idf-svc = "=0.42.1"
 esp-idf-sys = { version = "=0.31.5", features = ["binstart"] }
 esp32-c3-dkc02-bsc = { path = "../../../common/lib/esp32-c3-dkc02-bsc" }
-embedded-svc = "=0.19"
+embedded-svc = "=0.22"
 anyhow = "1.0"
 toml-cfg = "0.1"
 
@@ -28,5 +28,3 @@ toml-cfg = "0.1"
 embuild = "0.28"
 anyhow = "1"
 
-[patch.crates-io]
-riscv = { git = "https://github.com/rust-embedded/riscv", rev = "396fb9b"}
diff --git a/intro/http-client/solution/Cargo.toml b/intro/http-client/solution/Cargo.toml
index d87d0d75..dba116c9 100644
--- a/intro/http-client/solution/Cargo.toml
+++ b/intro/http-client/solution/Cargo.toml
@@ -17,16 +17,13 @@ default = ["native"]
 native = ["esp-idf-sys/native"]
 
 [dependencies]
-esp-idf-svc = { version="=0.39.1", features = ["experimental", "alloc"] }
+esp-idf-svc = { version = "=0.42.1", features = ["experimental", "alloc"] }
 esp-idf-sys = { version = "=0.31.5", features = ["binstart"] }
 esp32-c3-dkc02-bsc = { path = "../../../common/lib/esp32-c3-dkc02-bsc" }
-embedded-svc = "=0.19"
+embedded-svc = "=0.22"
 anyhow = "1.0"
 toml-cfg = "0.1"
 
 [build-dependencies]
 embuild = "0.28"
 anyhow = "1"
-
-[patch.crates-io]
-riscv = { git = "https://github.com/rust-embedded/riscv", rev = "396fb9b"}
diff --git a/intro/http-client/solution/src/main.rs b/intro/http-client/solution/src/main.rs
index 6aedc6b7..4019769f 100644
--- a/intro/http-client/solution/src/main.rs
+++ b/intro/http-client/solution/src/main.rs
@@ -51,9 +51,9 @@ fn get(url: impl AsRef<str>) -> anyhow::Result<()> {
     // https://docs.espressif.com/projects/esp-idf/en/latest/esp32/api-reference/protocols/esp_http_client.html
     // if this were a POST request, you'd set a write length > 0 and then writer.do_write(&some_buf);
     let writer = request.into_writer(0)?;
-
-    // 4. turn the writer into a response and check its status. Successful http status codes are in the 200..=299 range.
-    let response = writer.into_response()?;
+    // 4. submit our write request and check the status code of the response.
+    // Successful http status codes are in the 200..=299 range.
+    let mut response = writer.submit()?;
     let status = response.status();
     println!("response code: {}\n", status);
     match status {
@@ -63,7 +63,7 @@ fn get(url: impl AsRef<str>) -> anyhow::Result<()> {
             let mut total_size = 0;
             let mut reader = response.reader();
             loop {
-                let size = reader.do_read(&mut buf)?;
+                let size = reader.read(&mut buf)?;
                 if size == 0 {
                     break;
                 }
diff --git a/intro/http-client/solution/src/solution1.rs b/intro/http-client/solution/src/solution1.rs
index 64fe33b1..af13f271 100644
--- a/intro/http-client/solution/src/solution1.rs
+++ b/intro/http-client/solution/src/solution1.rs
@@ -35,7 +35,7 @@ fn get(url: impl AsRef<str>) -> anyhow::Result<()> {
     let mut client = EspHttpClient::new_default()?;
    
     // 2. Open a GET request to `url`
-    let request = client.get(url)?;
+    let request = client.get(url.as_ref())?;
 
     // 3. Requests *may* send data to the server. Turn the request into a writer, specifying 0 bytes as write length
     // (since we don't send anything - but have to do the writer step anyway)
@@ -44,10 +44,10 @@ fn get(url: impl AsRef<str>) -> anyhow::Result<()> {
 
     let writer = request.into_writer(0)?;
 
-    // 4. Turn the writer into a response and check its status. 
+    // 4. Submit our write request and check the status code of the response. 
     // Successful http status codes are in the 200..=299 range.
 
-    let response = writer.into_response()?;
+    let mut response = writer.submit()?;
     let status = response.status();
     let mut total_size = 0;
 
@@ -59,7 +59,7 @@ fn get(url: impl AsRef<str>) -> anyhow::Result<()> {
             let mut buf = [0_u8;256];
             let mut reader = response.reader();
             loop {
-                if let Ok(size) = Read::do_read(&mut reader, &mut buf){
+                if let Ok(size) = Read::read(&mut reader, &mut buf){
                     if size == 0 { break; }
                     total_size += size;
                     // 6. try converting the bytes into a Rust (UTF-8) string and print it
diff --git a/intro/http-server/exercise/Cargo.toml b/intro/http-server/exercise/Cargo.toml
index 288c7d09..4abee658 100644
--- a/intro/http-server/exercise/Cargo.toml
+++ b/intro/http-server/exercise/Cargo.toml
@@ -18,16 +18,13 @@ native = ["esp-idf-sys/native"]
 
 [dependencies]
 esp-idf-sys = { version = "=0.31.5", features = ["binstart"] }
-esp-idf-svc = "=0.39.1"
+esp-idf-svc = "=0.42.1"
 esp32-c3-dkc02-bsc = { path = "../../../common/lib/esp32-c3-dkc02-bsc" }
-esp32c3 = "=0.3.0"
-embedded-svc = "=0.19"
+esp32c3 = "=0.4"
+embedded-svc = "=0.22"
 anyhow = "1.0"
 toml-cfg = "0.1"
 
 [build-dependencies]
 embuild = "0.28"
 anyhow = "1"
-
-[patch.crates-io]
-riscv = { git = "https://github.com/rust-embedded/riscv", rev = "396fb9b"}
diff --git a/intro/http-server/exercise/src/main.rs b/intro/http-server/exercise/src/main.rs
index 2ea3b3da..918b7c54 100644
--- a/intro/http-server/exercise/src/main.rs
+++ b/intro/http-server/exercise/src/main.rs
@@ -8,7 +8,7 @@ use std::{
 use bsc::{temp_sensor::BoardTempSensor, wifi::wifi};
 use embedded_svc::{
     http::{
-        server::{registry::Registry, Response, ResponseWrite},
+        server::{registry::Registry, Response},
         Method,
     },
     io::Write,
diff --git a/intro/http-server/solution/Cargo.toml b/intro/http-server/solution/Cargo.toml
index 288c7d09..4abee658 100644
--- a/intro/http-server/solution/Cargo.toml
+++ b/intro/http-server/solution/Cargo.toml
@@ -18,16 +18,13 @@ native = ["esp-idf-sys/native"]
 
 [dependencies]
 esp-idf-sys = { version = "=0.31.5", features = ["binstart"] }
-esp-idf-svc = "=0.39.1"
+esp-idf-svc = "=0.42.1"
 esp32-c3-dkc02-bsc = { path = "../../../common/lib/esp32-c3-dkc02-bsc" }
-esp32c3 = "=0.3.0"
-embedded-svc = "=0.19"
+esp32c3 = "=0.4"
+embedded-svc = "=0.22"
 anyhow = "1.0"
 toml-cfg = "0.1"
 
 [build-dependencies]
 embuild = "0.28"
 anyhow = "1"
-
-[patch.crates-io]
-riscv = { git = "https://github.com/rust-embedded/riscv", rev = "396fb9b"}
diff --git a/intro/http-server/solution/src/main.rs b/intro/http-server/solution/src/main.rs
index d7cd3f51..95e40c70 100644
--- a/intro/http-server/solution/src/main.rs
+++ b/intro/http-server/solution/src/main.rs
@@ -7,10 +7,7 @@ use std::{
 
 use bsc::{temp_sensor::BoardTempSensor, wifi::wifi};
 use embedded_svc::{
-    http::{
-        server::{registry::Registry, Response, ResponseWrite},
-        Method,
-    },
+    http::server::{registry::Registry, Response},
     io::Write,
 };
 use esp32_c3_dkc02_bsc as bsc;
@@ -24,7 +21,6 @@ pub struct Config {
     #[default("")]
     wifi_psk: &'static str,
 }
-
 fn main() -> anyhow::Result<()> {
     esp_idf_sys::link_patches();
 
@@ -32,22 +28,22 @@ fn main() -> anyhow::Result<()> {
 
     let server_config = Configuration::default();
     let mut server = EspHttpServer::new(&server_config)?;
-    server.set_inline_handler("/", Method::Get, |request, response| {
+    server.handle_get("/", |_request, response| {
         let html = index_html();
-        let mut writer = response.into_writer(request)?;
-        writer.do_write_all(html.as_bytes())?;
-        writer.complete()
+        let mut writer = response.into_writer()?;
+        writer.write_all(html.as_bytes())?;
+        Ok(())
     })?;
 
     let temp_sensor_main = Arc::new(Mutex::new(BoardTempSensor::new_taking_peripherals()));
     let temp_sensor = temp_sensor_main.clone();
 
-    server.set_inline_handler("/temperature", Method::Get, move |request, response| {
+    server.handle_get("/temperature", move |_request, response| {
         let temp_val = temp_sensor.lock().unwrap().read_owning_peripherals();
         let html = temperature(temp_val);
-        let mut writer = response.into_writer(request)?;
-        writer.do_write_all(html.as_bytes())?;
-        writer.complete()
+        let mut writer = response.into_writer()?;
+        writer.write_all(html.as_bytes())?;
+        Ok(())
     })?;
 
     println!("server awaiting connection");
diff --git a/intro/mqtt/exercise/Cargo.toml b/intro/mqtt/exercise/Cargo.toml
index 819d432d..dff30825 100644
--- a/intro/mqtt/exercise/Cargo.toml
+++ b/intro/mqtt/exercise/Cargo.toml
@@ -18,21 +18,17 @@ native = ["esp-idf-sys/native"]
 
 [dependencies]
 esp-idf-sys = { version = "=0.31.5", features = ["binstart"] }
-#esp-idf-svc = { git = "https://github.com/esp-rs/esp-idf-svc.git", features = ["experimental", "alloc"], rev="d7313416" }
-esp-idf-svc = { version="=0.39.1", features = ["experimental", "alloc"] }
-embedded-svc = "=0.19"
+esp-idf-svc = { version="=0.42.1", features = ["experimental", "alloc"] }
+embedded-svc = "=0.22"
 esp32-c3-dkc02-bsc = { path = "../../../common/lib/esp32-c3-dkc02-bsc" }
 log = "0.4"
 anyhow = "1"
 toml-cfg = "0.1"
-esp32c3 = "0.3.0"
-riscv = { version = "0.7", features=["inline-asm"] }
+esp32c3 = "=0.4"
+riscv = { version = "0.8" }
 get-uuid = { path = "../../../common/lib/get-uuid" }
 mqtt-messages = { path = "../../../common/lib/mqtt-messages" }
 
 [build-dependencies]
 embuild = "0.28"
 anyhow = "1"
-
-[patch.crates-io]
-riscv = { git = "https://github.com/rust-embedded/riscv", rev = "396fb9b"}
diff --git a/intro/mqtt/solution/Cargo.toml b/intro/mqtt/solution/Cargo.toml
index 819d432d..de787cc6 100644
--- a/intro/mqtt/solution/Cargo.toml
+++ b/intro/mqtt/solution/Cargo.toml
@@ -19,20 +19,17 @@ native = ["esp-idf-sys/native"]
 [dependencies]
 esp-idf-sys = { version = "=0.31.5", features = ["binstart"] }
 #esp-idf-svc = { git = "https://github.com/esp-rs/esp-idf-svc.git", features = ["experimental", "alloc"], rev="d7313416" }
-esp-idf-svc = { version="=0.39.1", features = ["experimental", "alloc"] }
-embedded-svc = "=0.19"
+esp-idf-svc = { version="=0.42.1", features = ["experimental", "alloc"] }
+embedded-svc = "=0.22"
 esp32-c3-dkc02-bsc = { path = "../../../common/lib/esp32-c3-dkc02-bsc" }
 log = "0.4"
 anyhow = "1"
 toml-cfg = "0.1"
-esp32c3 = "0.3.0"
-riscv = { version = "0.7", features=["inline-asm"] }
+esp32c3 = "=0.4"
+riscv = { version = "0.8" }
 get-uuid = { path = "../../../common/lib/get-uuid" }
 mqtt-messages = { path = "../../../common/lib/mqtt-messages" }
 
 [build-dependencies]
 embuild = "0.28"
 anyhow = "1"
-
-[patch.crates-io]
-riscv = { git = "https://github.com/rust-embedded/riscv", rev = "396fb9b"}
diff --git a/intro/mqtt/solution/examples/solution1.rs b/intro/mqtt/solution/examples/solution1.rs
index 4f78135a..3e8f60ad 100644
--- a/intro/mqtt/solution/examples/solution1.rs
+++ b/intro/mqtt/solution/examples/solution1.rs
@@ -6,7 +6,7 @@ use bsc::{
     wifi::wifi,
 };
 use embedded_svc::mqtt::client::{
-    Client, Details::Complete, Event::Received, Message, Publish, QoS,
+    Client, Details::Complete, Event::Received, Message, Publish, QoS, Connection, MessageImpl,
 };
 use esp32_c3_dkc02_bsc as bsc;
 use esp_idf_svc::{
@@ -22,7 +22,7 @@ const UUID: &'static str = get_uuid::uuid();
 
 #[toml_cfg::toml_config]
 pub struct Config {
-    #[default("localhost")]
+    #[default("10.1.1.199")]
     mqtt_host: &'static str,
     #[default("")]
     mqtt_user: &'static str,
@@ -62,23 +62,19 @@ fn main() -> anyhow::Result<()> {
         format!("mqtt://{}", app_config.mqtt_host)
     };
 
-    let mut client =
-        EspMqttClient::new_with_callback(broker_url, &mqtt_config, move |message_event| {
-            if let Some(Ok(Received(message))) = message_event {
-                process_message(message, &mut led);
-            }
-        })?;
+    let (mut client, mut connection) =
+    EspMqttClient::new_with_conn(broker_url, &mqtt_config)?;
 
     let payload: &[u8] = &[];
-    client.publish(hello_topic(UUID), QoS::AtLeastOnce, true, payload)?;
+    client.publish(&hello_topic(UUID), QoS::AtLeastOnce, true, payload)?;
 
-    client.subscribe(mqtt_messages::color_topic(UUID), QoS::AtLeastOnce)?;
+    client.subscribe(&mqtt_messages::color_topic(UUID), QoS::AtLeastOnce)?;
 
     loop {
         sleep(Duration::from_secs(1));
         let temp = temp_sensor.read_owning_peripherals();
         client.publish(
-            mqtt_messages::temperature_data_topic(UUID),
+            &mqtt_messages::temperature_data_topic(UUID),
             QoS::AtLeastOnce,
             false,
             &temp.to_be_bytes() as &[u8],
@@ -86,18 +82,18 @@ fn main() -> anyhow::Result<()> {
     }
 }
 
-fn process_message(message: EspMqttMessage, led: &mut WS2812RMT) {
+fn process_message(message: &MessageImpl, led: &mut WS2812RMT) {
     match message.details() {
-        Complete(token) => {
-            info!("{}", message.topic(token));
-            let message_data: &[u8] = &message.data();
+        Complete => {
+            info!("{:?}", message);
+            let message_data: &[u8] = message.data();
             if let Ok(ColorData::BoardLed(color)) = ColorData::try_from(message_data) {
                 info!("{}", color);
                 if let Err(e) = led.set_pixel(color) {
                     error!("could not set board LED: {:?}", e)
                 };
             }
-        }
+        },
         _ => error!("could not set board LED"),
     }
 }
diff --git a/intro/mqtt/solution/src/main.rs b/intro/mqtt/solution/src/main.rs
index 1f4736c8..dd93eb47 100644
--- a/intro/mqtt/solution/src/main.rs
+++ b/intro/mqtt/solution/src/main.rs
@@ -1,4 +1,4 @@
-use std::{convert::TryFrom, thread::sleep, time::Duration};
+use std::{convert::TryFrom, thread, thread::sleep, time::Duration};
 
 use bsc::{
     led::{RGB8, WS2812RMT},
@@ -6,7 +6,10 @@ use bsc::{
     wifi::wifi,
 };
 use embedded_svc::mqtt::client::{
-    Client, Details::Complete, Event::Received, Message, Publish, QoS,
+    Client, Connection,
+    Details::Complete,
+    Event::{Connected, Published, Received},
+    Message, MessageImpl, Publish, QoS,
 };
 use esp32_c3_dkc02_bsc as bsc;
 use esp_idf_svc::{
@@ -16,7 +19,7 @@ use esp_idf_svc::{
 // If using the `binstart` feature of `esp-idf-sys`, always keep this module imported
 use esp_idf_sys as _;
 use log::{error, info};
-use mqtt_messages::{hello_topic, ColorData};
+use mqtt_messages::{hello_topic, temperature_data_topic, ColorData};
 
 const UUID: &'static str = get_uuid::uuid();
 
@@ -61,24 +64,23 @@ fn main() -> anyhow::Result<()> {
     } else {
         format!("mqtt://{}", app_config.mqtt_host)
     };
-
     let mut client =
-        EspMqttClient::new_with_callback(broker_url, &mqtt_config, move |message_event| {
-            if let Some(Ok(Received(message))) = message_event {
-                process_message(message, &mut led);
-            }
+        EspMqttClient::new(broker_url, &mqtt_config, move |msg_event| match msg_event {
+            Ok(Received(msg)) => process_message(msg, &mut led),
+            _ => info!("Received from MQTT: {:?}", msg_event),
         })?;
+    info!("MQTT client started.");
 
     let payload: &[u8] = &[];
-    client.publish(hello_topic(UUID), QoS::AtLeastOnce, true, payload)?;
+    println!("MQTT Listening for messages");
 
-    client.subscribe(mqtt_messages::color_topic(UUID), QoS::AtLeastOnce)?;
+    client.subscribe(&mqtt_messages::color_topic(UUID), QoS::AtLeastOnce);
 
     loop {
         sleep(Duration::from_secs(1));
         let temp = temp_sensor.read_owning_peripherals();
         client.publish(
-            mqtt_messages::temperature_data_topic(UUID),
+            &mqtt_messages::temperature_data_topic(UUID),
             QoS::AtLeastOnce,
             false,
             &temp.to_be_bytes() as &[u8],
@@ -88,9 +90,9 @@ fn main() -> anyhow::Result<()> {
 
 fn process_message(message: &EspMqttMessage, led: &mut WS2812RMT) {
     match message.details() {
-        Complete(token) => {
-            info!("{}", message.topic(token));
-            let message_data: &[u8] = &message.data();
+        Complete => {
+            info!("{:?}", message);
+            let message_data: &[u8] = message.data();
             if let Ok(ColorData::BoardLed(color)) = ColorData::try_from(message_data) {
                 info!("{}", color);
                 if let Err(e) = led.set_pixel(color) {