diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3f31685..9230ce3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -69,3 +69,23 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Established consistent command execution pattern for all nargo-based commands
 - Verified no unsafe blocks remain in codebase
 - All acceptance criteria for Phase 3 satisfied
+
+## [Unreleased]
+
+### Added
+- Compile-time feature gating for Cairo and Foundry functionality via Cargo features (`cairo`, `evm-foundry`)
+- Consolidated architecture overview (`ARCHITECTURE_OVERVIEW.md`)
+- EVM calldata generation now derives JSON from binary proof + public inputs
+
+### Changed
+- EVM BB CLI integration updated to use verifier target (`-t evm`) and VK-first prove flow
+- `bargo evm gen` only initializes Foundry when `evm-foundry` is enabled
+- `bargo doctor` checks feature-gated tools only when their features are enabled
+- Tests for Cairo workflows are feature-gated; EVM deploy/on-chain commands are hidden when `evm-foundry` is off
+- Architecture and reference docs updated for new BB CLI behavior and feature gating
+
+### Removed
+- `ARCHITECTURE_SUMMARY.txt` (merged into `ARCHITECTURE_OVERVIEW.md`)
+
+### Fixed
+- `bargo evm prove` now works with bb 3.x CLI (removal of `--output_format`)
diff --git a/crates/bargo-core/src/commands/evm/foundry.rs b/crates/bargo-core/src/commands/evm/foundry.rs
index 3d5a5de..187a5ef 100644
--- a/crates/bargo-core/src/commands/evm/foundry.rs
+++ b/crates/bargo-core/src/commands/evm/foundry.rs
@@ -78,10 +78,10 @@ pub fn deploy_contract(
     // Parse contract address from forge output
     // forge create outputs: "Deployed to: 0x..."
     for line in stdout.lines() {
-        if line.contains("Deployed to:") {
-            if let Some(address) = line.split_whitespace().last() {
-                return Ok(address.to_string());
-            }
+        if line.contains("Deployed to:")
+            && let Some(address) = line.split_whitespace().last()
+        {
+            return Ok(address.to_string());
         }
     }