diff --git a/.circleci/config.yml b/.circleci/config.yml
index 75cf2b955ce2..81eb7344f1f5 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -996,6 +996,11 @@ jobs:
           command: |
             should_release || exit 0
             yarn-project/deploy_npm.sh canary
+      - run:
+          name: "Release latest to NPM: bb.js"
+          command: |
+            should_release || exit 0
+            deploy_npm bb.js latest
       - run:
           name: "Release latest to NPM: yarn-project"
           command: |
diff --git a/.github/workflows/mirror_repos.yml b/.github/workflows/mirror_repos.yml
index aeac37b85c27..508887fd79d7 100644
--- a/.github/workflows/mirror_repos.yml
+++ b/.github/workflows/mirror_repos.yml
@@ -12,31 +12,8 @@ on:
     - cron: "0 2 * * *"
 
 jobs:
-  mirror-to-build-system-repo:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-          token: ${{ secrets.AZTEC_BOT_GITHUB_TOKEN }}
-      - name: Push to build-system repo
-        run: |
-          SUBREPO_PATH=build-system
-          git config --global user.name AztecBot
-          git config --global user.email tech@aztecprotocol.com
-
-          if ./scripts/git_subrepo.sh push $SUBREPO_PATH --branch=master; then
-            git fetch # in case a commit came after this
-            git rebase origin/master
-            git commit --amend -m "$(git log -1 --pretty=%B) [skip ci]"
-            git push
-          fi
-
   mirror-to-barretenberg-repo:
     runs-on: ubuntu-latest
-    # Force sequential.
-    needs: mirror-to-build-system-repo
     steps:
       - name: Checkout
         uses: actions/checkout@v3
diff --git a/.github/workflows/publish-bb.yml b/.github/workflows/publish-bb.yml
index 85c074131764..27c345b34e67 100644
--- a/.github/workflows/publish-bb.yml
+++ b/.github/workflows/publish-bb.yml
@@ -93,7 +93,7 @@ jobs:
           sudo cp -r clang+llvm-16.0.0-x86_64-linux-gnu-ubuntu-18.04/lib/* /usr/local/lib/
           sudo cp -r clang+llvm-16.0.0-x86_64-linux-gnu-ubuntu-18.04/share/* /usr/local/share/
 
-      - name: Install yarn
+      - name: Install yarn # Needed to call 'yarn build' on barretenberg/ts 
         run: |
           curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add -
           echo "deb https://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list
@@ -104,7 +104,7 @@ jobs:
 
           ./scripts/install-wasi-sdk.sh
 
-      - name: Compile Typescript
+      - name: Compile Typescript # Compiles bb.js and wasms
         run: |
           cd barretenberg/ts
           yarn install && yarn && yarn build
@@ -117,19 +117,19 @@ jobs:
         working-directory: barretenberg/cpp/build-wasm/bin
         run: tar -cvzf acvm_backend.wasm.tar.gz acvm_backend.wasm
 
-      - name: Setup Node.js
-        uses: actions/setup-node@v2
-        with:
-          node-version: "18"
-          registry-url: "https://registry.npmjs.org"
-
-      - name: Deploy Typescript to NPM
-        if: github.event.inputs.tag != 'nightly' && github.event.inputs.tag != '' # Do not deploy to npm if it is a nightly build
-        run: |
-          cd barretenberg/ts
-          yarn deploy
-        env:
-          NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
+      # - name: Setup Node.js
+      #   uses: actions/setup-node@v2
+      #   with:
+      #     node-version: "18"
+      #     registry-url: "https://registry.npmjs.org"
+
+      # - name: Deploy Typescript to NPM
+      #   if: github.event.inputs.tag != 'nightly' && github.event.inputs.tag != '' # Do not deploy to npm if it is a nightly build
+      #   run: |
+      #     cd barretenberg/ts
+      #     yarn deploy
+      #   env:
+      #     NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
 
       - name: Upload artifacts
         uses: actions/upload-artifact@v2
diff --git a/README.md b/README.md
index 8926ba967636..dc4c5d8cf62b 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ All the packages that make up [Aztec](https://docs.aztec.network).
 
 ## Issues Board
 
-All issues being worked on are tracked on the [Aztec Github Project](https://github.com/orgs/AztecProtocol/projects/22). For a higher-level roadmap, check the [milestones overview](https://docs.aztec.network/aztec/milestones) section of our docs.
+All issues being worked on are tracked on the [Aztec Github Project](https://github.com/orgs/AztecProtocol/projects/22). For a higher-level roadmap, check the [milestones overview](https://docs.aztec.network/about_aztec/roadmap/main) section of our docs.
 
 ## Development Setup
 
diff --git a/barretenberg/.gitrepo b/barretenberg/.gitrepo
index 7eb6dba2c412..f0f2d9349891 100644
--- a/barretenberg/.gitrepo
+++ b/barretenberg/.gitrepo
@@ -6,7 +6,7 @@
 [subrepo]
 	remote = https://github.com/AztecProtocol/barretenberg
 	branch = master
-	commit = 4f7bac9189d6b75b9591ecad688f964646783e2b
-	parent = 50b4a728b4c20503f6ab56c07feaa29d767cec10
+	commit = f01329ccb7a07c8828a06a19d0a4d77d3f89087a
+	parent = b77afb14c609cfc04663a318eecaa8cbd3b2fa85
 	method = merge
 	cmdver = 0.4.6
diff --git a/barretenberg/cpp/scripts/ci/upload_benchmarks_to_s3.sh b/barretenberg/cpp/scripts/ci/upload_benchmarks_to_s3.sh
index dc5d890704b3..03603d20c03d 100755
--- a/barretenberg/cpp/scripts/ci/upload_benchmarks_to_s3.sh
+++ b/barretenberg/cpp/scripts/ci/upload_benchmarks_to_s3.sh
@@ -14,6 +14,7 @@ elif [ -n "${PULL_REQUEST:-}" ]; then
   TARGET_FOLDER="barretenberg-bench-v1/pulls/${PULL_REQUEST##*/}"
 else
   echo Skipping upload since no target folder was defined
+  exit
 fi
 echo "Uploading to s3://$BUCKET_NAME/$TARGET_FOLDER"
-aws s3 cp extracted-repo/src/barretenberg/cpp/build/ultra_honk_rounds_bench.json "s3://$BUCKET_NAME/$TARGET_FOLDER/ultra_honk_rounds_bench.json"
\ No newline at end of file
+aws s3 cp extracted-repo/src/barretenberg/cpp/build/ultra_honk_rounds_bench.json "s3://$BUCKET_NAME/$TARGET_FOLDER/ultra_honk_rounds_bench.json"
diff --git a/barretenberg/cpp/src/barretenberg/benchmark/goblin_bench/eccvm.bench.cpp b/barretenberg/cpp/src/barretenberg/benchmark/goblin_bench/eccvm.bench.cpp
index 59e793ce187d..630484837e11 100644
--- a/barretenberg/cpp/src/barretenberg/benchmark/goblin_bench/eccvm.bench.cpp
+++ b/barretenberg/cpp/src/barretenberg/benchmark/goblin_bench/eccvm.bench.cpp
@@ -5,7 +5,7 @@
 #include "barretenberg/proof_system/circuit_builder/eccvm/eccvm_circuit_builder.hpp"
 
 using namespace benchmark;
-using namespace proof_system;
+using namespace bb;
 
 using Flavor = honk::flavor::ECCVM;
 using Builder = ECCVMCircuitBuilder<Flavor>;
diff --git a/barretenberg/cpp/src/barretenberg/benchmark/goblin_bench/goblin.bench.cpp b/barretenberg/cpp/src/barretenberg/benchmark/goblin_bench/goblin.bench.cpp
index 44fe8180c9c9..40b95b7a7d2d 100644
--- a/barretenberg/cpp/src/barretenberg/benchmark/goblin_bench/goblin.bench.cpp
+++ b/barretenberg/cpp/src/barretenberg/benchmark/goblin_bench/goblin.bench.cpp
@@ -9,7 +9,7 @@
 
 using namespace benchmark;
 using namespace bb;
-using namespace proof_system;
+using namespace bb;
 
 namespace {
 void goblin_full(State& state) noexcept
diff --git a/barretenberg/cpp/src/barretenberg/benchmark/ipa_bench/ipa.bench.cpp b/barretenberg/cpp/src/barretenberg/benchmark/ipa_bench/ipa.bench.cpp
index ff0c24b72c8a..e3da4560115d 100644
--- a/barretenberg/cpp/src/barretenberg/benchmark/ipa_bench/ipa.bench.cpp
+++ b/barretenberg/cpp/src/barretenberg/benchmark/ipa_bench/ipa.bench.cpp
@@ -3,8 +3,8 @@
 
 using namespace benchmark;
 using namespace bb;
-using namespace proof_system;
-using namespace proof_system::honk::pcs::ipa;
+using namespace bb;
+using namespace bb::honk::pcs::ipa;
 namespace {
 using Curve = curve::Grumpkin;
 using Fr = Curve::ScalarField;
diff --git a/barretenberg/cpp/src/barretenberg/benchmark/plonk_bench/plonk.bench.cpp b/barretenberg/cpp/src/barretenberg/benchmark/plonk_bench/plonk.bench.cpp
index 8b62462e8844..167f5baf01a3 100644
--- a/barretenberg/cpp/src/barretenberg/benchmark/plonk_bench/plonk.bench.cpp
+++ b/barretenberg/cpp/src/barretenberg/benchmark/plonk_bench/plonk.bench.cpp
@@ -12,8 +12,8 @@ constexpr size_t START = (MAX_GATES) >> (NUM_CIRCUITS - 1);
 // constexpr size_t MAX_HASH_ROUNDS = 8192;
 // constexpr size_t START_HASH_ROUNDS = 64;
 
-using Builder = proof_system::StandardCircuitBuilder;
-using Composer = proof_system::plonk::StandardComposer;
+using Builder = bb::StandardCircuitBuilder;
+using Composer = bb::plonk::StandardComposer;
 
 void generate_test_plonk_circuit(Builder& builder, size_t num_gates)
 {
diff --git a/barretenberg/cpp/src/barretenberg/benchmark/plonk_bench/standard_plonk.bench.cpp b/barretenberg/cpp/src/barretenberg/benchmark/plonk_bench/standard_plonk.bench.cpp
index 403367d9159a..71d790519c0b 100644
--- a/barretenberg/cpp/src/barretenberg/benchmark/plonk_bench/standard_plonk.bench.cpp
+++ b/barretenberg/cpp/src/barretenberg/benchmark/plonk_bench/standard_plonk.bench.cpp
@@ -4,8 +4,8 @@
 
 using namespace benchmark;
 
-using StandardBuilder = proof_system::StandardCircuitBuilder;
-using StandardPlonk = proof_system::plonk::StandardComposer;
+using StandardBuilder = bb::StandardCircuitBuilder;
+using StandardPlonk = bb::plonk::StandardComposer;
 
 /**
  * @brief Benchmark: Construction of a Standard proof for a circuit determined by the provided circuit function
@@ -13,8 +13,8 @@ using StandardPlonk = proof_system::plonk::StandardComposer;
 static void construct_proof_standard_power_of_2(State& state) noexcept
 {
     auto log2_of_gates = static_cast<size_t>(state.range(0));
-    bench_utils::construct_proof_with_specified_num_iterations<proof_system::plonk::StandardComposer>(
-        state, &bench_utils::generate_basic_arithmetic_circuit<proof_system::StandardCircuitBuilder>, log2_of_gates);
+    bench_utils::construct_proof_with_specified_num_iterations<bb::plonk::StandardComposer>(
+        state, &bench_utils::generate_basic_arithmetic_circuit<bb::StandardCircuitBuilder>, log2_of_gates);
 }
 
 BENCHMARK(construct_proof_standard_power_of_2)
diff --git a/barretenberg/cpp/src/barretenberg/benchmark/protogalaxy_bench/protogalaxy.bench.cpp b/barretenberg/cpp/src/barretenberg/benchmark/protogalaxy_bench/protogalaxy.bench.cpp
index 348b05d17564..7b53cfe26941 100644
--- a/barretenberg/cpp/src/barretenberg/benchmark/protogalaxy_bench/protogalaxy.bench.cpp
+++ b/barretenberg/cpp/src/barretenberg/benchmark/protogalaxy_bench/protogalaxy.bench.cpp
@@ -6,7 +6,7 @@
 
 using namespace benchmark;
 
-namespace proof_system::honk {
+namespace bb::honk {
 using Flavor = flavor::Ultra;
 using Instance = ProverInstance_<Flavor>;
 using Instances = ProverInstances_<Flavor, 2>;
@@ -38,4 +38,4 @@ void fold_one(State& state) noexcept
 }
 
 BENCHMARK(fold_one)->/* vary the circuit size */ DenseRange(14, 20)->Unit(kMillisecond);
-} // namespace proof_system::honk
\ No newline at end of file
+} // namespace bb::honk
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/benchmark/relations_bench/barycentric.bench.cpp b/barretenberg/cpp/src/barretenberg/benchmark/relations_bench/barycentric.bench.cpp
index 3c731e49652b..19572fe6a0ea 100644
--- a/barretenberg/cpp/src/barretenberg/benchmark/relations_bench/barycentric.bench.cpp
+++ b/barretenberg/cpp/src/barretenberg/benchmark/relations_bench/barycentric.bench.cpp
@@ -12,7 +12,7 @@ using FF = bb::fr;
 using bb::BarycentricData;
 using bb::Univariate;
 
-namespace proof_system::benchmark {
+namespace bb::benchmark {
 
 void extend_2_to_6(State& state) noexcept
 {
@@ -23,4 +23,4 @@ void extend_2_to_6(State& state) noexcept
 }
 BENCHMARK(extend_2_to_6);
 
-} // namespace proof_system::benchmark
\ No newline at end of file
+} // namespace bb::benchmark
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/benchmark/relations_bench/relations.bench.cpp b/barretenberg/cpp/src/barretenberg/benchmark/relations_bench/relations.bench.cpp
index c88167a4c975..e683523a7e3f 100644
--- a/barretenberg/cpp/src/barretenberg/benchmark/relations_bench/relations.bench.cpp
+++ b/barretenberg/cpp/src/barretenberg/benchmark/relations_bench/relations.bench.cpp
@@ -8,9 +8,9 @@ namespace {
 auto& engine = numeric::random::get_debug_engine();
 }
 
-using namespace proof_system::honk::sumcheck;
+using namespace bb::honk::sumcheck;
 
-namespace proof_system::benchmark::relations {
+namespace bb::benchmark::relations {
 
 using Fr = bb::fr;
 using Fq = grumpkin::fr;
@@ -21,7 +21,7 @@ template <typename Flavor, typename Relation> void execute_relation(::benchmark:
     using AllValues = typename Flavor::AllValues;
     using SumcheckArrayOfValuesOverSubrelations = typename Relation::SumcheckArrayOfValuesOverSubrelations;
 
-    auto params = proof_system::RelationParameters<FF>::get_random();
+    auto params = bb::RelationParameters<FF>::get_random();
 
     // Extract an array containing all the polynomial evaluations at a given row i
     AllValues new_value{};
@@ -56,4 +56,4 @@ BENCHMARK(execute_relation<honk::flavor::ECCVM, ECCVMSetRelation<Fq>>);
 BENCHMARK(execute_relation<honk::flavor::ECCVM, ECCVMTranscriptRelation<Fq>>);
 BENCHMARK(execute_relation<honk::flavor::ECCVM, ECCVMWnafRelation<Fq>>);
 
-} // namespace proof_system::benchmark::relations
+} // namespace bb::benchmark::relations
diff --git a/barretenberg/cpp/src/barretenberg/benchmark/ultra_bench/benchmark_utilities.hpp b/barretenberg/cpp/src/barretenberg/benchmark/ultra_bench/benchmark_utilities.hpp
index e1419a591e94..3b7bf8034550 100644
--- a/barretenberg/cpp/src/barretenberg/benchmark/ultra_bench/benchmark_utilities.hpp
+++ b/barretenberg/cpp/src/barretenberg/benchmark/ultra_bench/benchmark_utilities.hpp
@@ -32,9 +32,9 @@ namespace bench_utils {
  */
 template <typename Builder> void generate_basic_arithmetic_circuit(Builder& builder, size_t log2_num_gates)
 {
-    proof_system::plonk::stdlib::field_t a(proof_system::plonk::stdlib::witness_t(&builder, bb::fr::random_element()));
-    proof_system::plonk::stdlib::field_t b(proof_system::plonk::stdlib::witness_t(&builder, bb::fr::random_element()));
-    proof_system::plonk::stdlib::field_t c(&builder);
+    bb::plonk::stdlib::field_t a(bb::plonk::stdlib::witness_t(&builder, bb::fr::random_element()));
+    bb::plonk::stdlib::field_t b(bb::plonk::stdlib::witness_t(&builder, bb::fr::random_element()));
+    bb::plonk::stdlib::field_t c(&builder);
     size_t passes = (1UL << log2_num_gates) / 4 - 4;
     if (static_cast<int>(passes) <= 0) {
         throw std::runtime_error("too few gates");
@@ -58,9 +58,9 @@ template <typename Builder> void generate_sha256_test_circuit(Builder& builder,
 {
     std::string in;
     in.resize(32);
-    proof_system::plonk::stdlib::packed_byte_array<Builder> input(&builder, in);
+    bb::plonk::stdlib::packed_byte_array<Builder> input(&builder, in);
     for (size_t i = 0; i < num_iterations; i++) {
-        input = proof_system::plonk::stdlib::sha256<Builder>(input);
+        input = bb::plonk::stdlib::sha256<Builder>(input);
     }
 }
 
@@ -74,9 +74,9 @@ template <typename Builder> void generate_keccak_test_circuit(Builder& builder,
 {
     std::string in = "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz01";
 
-    proof_system::plonk::stdlib::byte_array<Builder> input(&builder, in);
+    bb::plonk::stdlib::byte_array<Builder> input(&builder, in);
     for (size_t i = 0; i < num_iterations; i++) {
-        input = proof_system::plonk::stdlib::keccak<Builder>::hash(input);
+        input = bb::plonk::stdlib::keccak<Builder>::hash(input);
     }
 }
 
@@ -88,7 +88,7 @@ template <typename Builder> void generate_keccak_test_circuit(Builder& builder,
  */
 template <typename Builder> void generate_ecdsa_verification_test_circuit(Builder& builder, size_t num_iterations)
 {
-    using curve = proof_system::plonk::stdlib::secp256k1<Builder>;
+    using curve = bb::plonk::stdlib::secp256k1<Builder>;
     using fr = typename curve::fr;
     using fq = typename curve::fq;
     using g1 = typename curve::g1;
@@ -114,19 +114,18 @@ template <typename Builder> void generate_ecdsa_verification_test_circuit(Builde
 
         typename curve::g1_bigfr_ct public_key = curve::g1_bigfr_ct::from_witness(&builder, account.public_key);
 
-        proof_system::plonk::stdlib::ecdsa::signature<Builder> sig{ typename curve::byte_array_ct(&builder, rr),
-                                                                    typename curve::byte_array_ct(&builder, ss),
-                                                                    proof_system::plonk::stdlib::uint8<Builder>(
-                                                                        &builder, vv) };
+        bb::plonk::stdlib::ecdsa::signature<Builder> sig{ typename curve::byte_array_ct(&builder, rr),
+                                                          typename curve::byte_array_ct(&builder, ss),
+                                                          bb::plonk::stdlib::uint8<Builder>(&builder, vv) };
 
         typename curve::byte_array_ct message(&builder, message_string);
 
         // Verify ecdsa signature
-        proof_system::plonk::stdlib::ecdsa::verify_signature<Builder,
-                                                             curve,
-                                                             typename curve::fq_ct,
-                                                             typename curve::bigfr_ct,
-                                                             typename curve::g1_bigfr_ct>(message, public_key, sig);
+        bb::plonk::stdlib::ecdsa::verify_signature<Builder,
+                                                   curve,
+                                                   typename curve::fq_ct,
+                                                   typename curve::bigfr_ct,
+                                                   typename curve::g1_bigfr_ct>(message, public_key, sig);
     }
 }
 
@@ -138,7 +137,7 @@ template <typename Builder> void generate_ecdsa_verification_test_circuit(Builde
  */
 template <typename Builder> void generate_merkle_membership_test_circuit(Builder& builder, size_t num_iterations)
 {
-    using namespace proof_system::plonk::stdlib;
+    using namespace bb::plonk::stdlib;
     using field_ct = field_t<Builder>;
     using witness_ct = witness_t<Builder>;
     using witness_ct = witness_t<Builder>;
@@ -165,35 +164,33 @@ template <typename Builder> void generate_merkle_membership_test_circuit(Builder
 }
 
 // ultrahonk
-inline proof_system::honk::UltraProver get_prover(
-    proof_system::honk::UltraComposer& composer,
-    void (*test_circuit_function)(proof_system::honk::UltraComposer::CircuitBuilder&, size_t),
-    size_t num_iterations)
+inline bb::honk::UltraProver get_prover(bb::honk::UltraComposer& composer,
+                                        void (*test_circuit_function)(bb::honk::UltraComposer::CircuitBuilder&, size_t),
+                                        size_t num_iterations)
 {
-    proof_system::honk::UltraComposer::CircuitBuilder builder;
+    bb::honk::UltraComposer::CircuitBuilder builder;
     test_circuit_function(builder, num_iterations);
-    std::shared_ptr<proof_system::honk::UltraComposer::Instance> instance = composer.create_instance(builder);
+    std::shared_ptr<bb::honk::UltraComposer::Instance> instance = composer.create_instance(builder);
     return composer.create_prover(instance);
 }
 
 // standard plonk
-inline proof_system::plonk::Prover get_prover(proof_system::plonk::StandardComposer& composer,
-                                              void (*test_circuit_function)(proof_system::StandardCircuitBuilder&,
-                                                                            size_t),
-                                              size_t num_iterations)
+inline bb::plonk::Prover get_prover(bb::plonk::StandardComposer& composer,
+                                    void (*test_circuit_function)(bb::StandardCircuitBuilder&, size_t),
+                                    size_t num_iterations)
 {
-    proof_system::StandardCircuitBuilder builder;
+    bb::StandardCircuitBuilder builder;
     test_circuit_function(builder, num_iterations);
     return composer.create_prover(builder);
 }
 
 // ultraplonk
-inline proof_system::plonk::UltraProver get_prover(
-    proof_system::plonk::UltraComposer& composer,
-    void (*test_circuit_function)(proof_system::honk::UltraComposer::CircuitBuilder&, size_t),
-    size_t num_iterations)
+inline bb::plonk::UltraProver get_prover(bb::plonk::UltraComposer& composer,
+                                         void (*test_circuit_function)(bb::honk::UltraComposer::CircuitBuilder&,
+                                                                       size_t),
+                                         size_t num_iterations)
 {
-    proof_system::plonk::UltraComposer::CircuitBuilder builder;
+    bb::plonk::UltraComposer::CircuitBuilder builder;
     test_circuit_function(builder, num_iterations);
     return composer.create_prover(builder);
 }
diff --git a/barretenberg/cpp/src/barretenberg/benchmark/ultra_bench/ultra_honk.bench.cpp b/barretenberg/cpp/src/barretenberg/benchmark/ultra_bench/ultra_honk.bench.cpp
index 610f968157fc..1109a928f4ce 100644
--- a/barretenberg/cpp/src/barretenberg/benchmark/ultra_bench/ultra_honk.bench.cpp
+++ b/barretenberg/cpp/src/barretenberg/benchmark/ultra_bench/ultra_honk.bench.cpp
@@ -5,7 +5,7 @@
 #include "barretenberg/ultra_honk/ultra_composer.hpp"
 
 using namespace benchmark;
-using namespace proof_system;
+using namespace bb;
 
 /**
  * @brief Benchmark: Construction of a Ultra Honk proof for a circuit determined by the provided circuit function
diff --git a/barretenberg/cpp/src/barretenberg/benchmark/ultra_bench/ultra_honk_rounds.bench.cpp b/barretenberg/cpp/src/barretenberg/benchmark/ultra_bench/ultra_honk_rounds.bench.cpp
index 333b6ddcc86b..b36e168b446f 100644
--- a/barretenberg/cpp/src/barretenberg/benchmark/ultra_bench/ultra_honk_rounds.bench.cpp
+++ b/barretenberg/cpp/src/barretenberg/benchmark/ultra_bench/ultra_honk_rounds.bench.cpp
@@ -6,7 +6,7 @@
 #include "barretenberg/ultra_honk/ultra_prover.hpp"
 
 using namespace benchmark;
-using namespace proof_system;
+using namespace bb;
 
 // The rounds to measure
 enum {
diff --git a/barretenberg/cpp/src/barretenberg/benchmark/ultra_bench/ultra_plonk.bench.cpp b/barretenberg/cpp/src/barretenberg/benchmark/ultra_bench/ultra_plonk.bench.cpp
index c9fc158c532c..0f16f152d2ce 100644
--- a/barretenberg/cpp/src/barretenberg/benchmark/ultra_bench/ultra_plonk.bench.cpp
+++ b/barretenberg/cpp/src/barretenberg/benchmark/ultra_bench/ultra_plonk.bench.cpp
@@ -3,7 +3,7 @@
 #include "barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp"
 
 using namespace benchmark;
-using namespace proof_system;
+using namespace bb;
 
 /**
  * @brief Benchmark: Construction of a Ultra Plonk proof for a circuit determined by the provided circuit function
diff --git a/barretenberg/cpp/src/barretenberg/benchmark/ultra_bench/ultra_plonk_rounds.bench.cpp b/barretenberg/cpp/src/barretenberg/benchmark/ultra_bench/ultra_plonk_rounds.bench.cpp
index ecc086303b97..8565dd96fbee 100644
--- a/barretenberg/cpp/src/barretenberg/benchmark/ultra_bench/ultra_plonk_rounds.bench.cpp
+++ b/barretenberg/cpp/src/barretenberg/benchmark/ultra_bench/ultra_plonk_rounds.bench.cpp
@@ -4,7 +4,7 @@
 #include "barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp"
 
 using namespace benchmark;
-using namespace proof_system;
+using namespace bb;
 
 // The rounds to measure
 enum {
diff --git a/barretenberg/cpp/src/barretenberg/benchmark/widgets_bench/widget.bench.cpp b/barretenberg/cpp/src/barretenberg/benchmark/widgets_bench/widget.bench.cpp
index 0ec974da527d..b96f9f6ce78c 100644
--- a/barretenberg/cpp/src/barretenberg/benchmark/widgets_bench/widget.bench.cpp
+++ b/barretenberg/cpp/src/barretenberg/benchmark/widgets_bench/widget.bench.cpp
@@ -22,7 +22,7 @@ namespace {
 auto& engine = numeric::random::get_debug_engine();
 }
 
-namespace proof_system::plonk {
+namespace bb::plonk {
 
 #ifdef GET_PER_ROW_TIME
 constexpr size_t LARGE_DOMAIN_SIZE = 4;
@@ -113,4 +113,4 @@ BENCHMARK(accumulate_contribution<ProverGenPermSortWidget<ultra_settings>>);
 BENCHMARK(accumulate_contribution<ProverEllipticWidget<ultra_settings>>);
 BENCHMARK(accumulate_contribution<ProverPlookupAuxiliaryWidget<ultra_settings>>);
 
-} // namespace proof_system::plonk
+} // namespace bb::plonk
diff --git a/barretenberg/cpp/src/barretenberg/commitment_schemes/claim.hpp b/barretenberg/cpp/src/barretenberg/commitment_schemes/claim.hpp
index 27dea27d3582..2ef8c69637ed 100644
--- a/barretenberg/cpp/src/barretenberg/commitment_schemes/claim.hpp
+++ b/barretenberg/cpp/src/barretenberg/commitment_schemes/claim.hpp
@@ -3,7 +3,7 @@
 #include "barretenberg/commitment_schemes/commitment_key.hpp"
 #include "barretenberg/polynomials/polynomial.hpp"
 
-namespace proof_system::honk::pcs {
+namespace bb::honk::pcs {
 /**
  * @brief Opening pair (r,v) for some witness polynomial p(X) such that p(r) = v
  *
@@ -72,4 +72,4 @@ template <typename Curve> class OpeningClaim {
 
     bool operator==(const OpeningClaim& other) const = default;
 };
-} // namespace proof_system::honk::pcs
+} // namespace bb::honk::pcs
diff --git a/barretenberg/cpp/src/barretenberg/commitment_schemes/commitment_key.hpp b/barretenberg/cpp/src/barretenberg/commitment_schemes/commitment_key.hpp
index c820054558a9..201a022fdb57 100644
--- a/barretenberg/cpp/src/barretenberg/commitment_schemes/commitment_key.hpp
+++ b/barretenberg/cpp/src/barretenberg/commitment_schemes/commitment_key.hpp
@@ -19,7 +19,7 @@
 #include <memory>
 #include <string_view>
 
-namespace proof_system::honk::pcs {
+namespace bb::honk::pcs {
 
 /**
  * @brief CommitmentKey object over a pairing group 𝔾₁.
@@ -74,4 +74,4 @@ template <class Curve> class CommitmentKey {
     std::shared_ptr<bb::srs::factories::ProverCrs<Curve>> srs;
 };
 
-} // namespace proof_system::honk::pcs
+} // namespace bb::honk::pcs
diff --git a/barretenberg/cpp/src/barretenberg/commitment_schemes/commitment_key.test.hpp b/barretenberg/cpp/src/barretenberg/commitment_schemes/commitment_key.test.hpp
index 27d8e2ed93fc..df031f7404dc 100644
--- a/barretenberg/cpp/src/barretenberg/commitment_schemes/commitment_key.test.hpp
+++ b/barretenberg/cpp/src/barretenberg/commitment_schemes/commitment_key.test.hpp
@@ -13,7 +13,7 @@
 
 #include <gtest/gtest.h>
 
-namespace proof_system::honk::pcs {
+namespace bb::honk::pcs {
 
 template <class CK> inline std::shared_ptr<CK> CreateCommitmentKey();
 
@@ -206,4 +206,4 @@ using IpaCommitmentSchemeParams = ::testing::Types<curve::Grumpkin>;
 // using CommitmentSchemeParams =
 //     ::testing::Types<fake::Params<bb::g1>, fake::Params<grumpkin::g1>, kzg::Params>;
 
-} // namespace proof_system::honk::pcs
+} // namespace bb::honk::pcs
diff --git a/barretenberg/cpp/src/barretenberg/commitment_schemes/gemini/gemini.cpp b/barretenberg/cpp/src/barretenberg/commitment_schemes/gemini/gemini.cpp
index 72705c516db7..0d1890abd669 100644
--- a/barretenberg/cpp/src/barretenberg/commitment_schemes/gemini/gemini.cpp
+++ b/barretenberg/cpp/src/barretenberg/commitment_schemes/gemini/gemini.cpp
@@ -42,7 +42,7 @@
  * The verifier is able to computed the simulated commitments to A₀₊(X) and A₀₋(X)
  * since they are linear-combinations of the commitments [fⱼ] and [gⱼ].
  */
-namespace proof_system::honk::pcs::gemini {
+namespace bb::honk::pcs::gemini {
 
 /**
  * @brief Computes d-1 fold polynomials Fold_i, i = 1, ..., d-1
@@ -188,4 +188,4 @@ ProverOutput<Curve> GeminiProver_<Curve>::compute_fold_polynomial_evaluations(
 
 template class GeminiProver_<curve::BN254>;
 template class GeminiProver_<curve::Grumpkin>;
-}; // namespace proof_system::honk::pcs::gemini
+}; // namespace bb::honk::pcs::gemini
diff --git a/barretenberg/cpp/src/barretenberg/commitment_schemes/gemini/gemini.hpp b/barretenberg/cpp/src/barretenberg/commitment_schemes/gemini/gemini.hpp
index 03b77e9645f1..c417b4b76b35 100644
--- a/barretenberg/cpp/src/barretenberg/commitment_schemes/gemini/gemini.hpp
+++ b/barretenberg/cpp/src/barretenberg/commitment_schemes/gemini/gemini.hpp
@@ -42,7 +42,7 @@
  * The verifier is able to computed the simulated commitments to A₀₊(X) and A₀₋(X)
  * since they are linear-combinations of the commitments [fⱼ] and [gⱼ].
  */
-namespace proof_system::honk::pcs::gemini {
+namespace bb::honk::pcs::gemini {
 
 /**
  * @brief Prover output (evalutation pair, witness) that can be passed on to Shplonk batch opening.
@@ -109,7 +109,7 @@ template <typename Curve> class GeminiProver_ {
     static ProverOutput<Curve> compute_fold_polynomial_evaluations(std::span<const Fr> mle_opening_point,
                                                                    std::vector<Polynomial>&& gemini_polynomials,
                                                                    const Fr& r_challenge);
-}; // namespace proof_system::honk::pcs::gemini
+}; // namespace bb::honk::pcs::gemini
 
 template <typename Curve> class GeminiVerifier_ {
     using Fr = typename Curve::ScalarField;
@@ -262,6 +262,6 @@ template <typename Curve> class GeminiVerifier_ {
         return { C0_r_pos, C0_r_neg };
     }
 
-}; // namespace proof_system::honk::pcs::gemini
+}; // namespace bb::honk::pcs::gemini
 
-} // namespace proof_system::honk::pcs::gemini
+} // namespace bb::honk::pcs::gemini
diff --git a/barretenberg/cpp/src/barretenberg/commitment_schemes/gemini/gemini.test.cpp b/barretenberg/cpp/src/barretenberg/commitment_schemes/gemini/gemini.test.cpp
index 80b93ed89e3c..1d6dd6779c21 100644
--- a/barretenberg/cpp/src/barretenberg/commitment_schemes/gemini/gemini.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/commitment_schemes/gemini/gemini.test.cpp
@@ -7,7 +7,7 @@
 #include <gtest/gtest.h>
 #include <span>
 
-namespace proof_system::honk::pcs::gemini {
+namespace bb::honk::pcs::gemini {
 
 template <class Curve> class GeminiTest : public CommitmentTest<Curve> {
     using GeminiProver = GeminiProver_<Curve>;
@@ -238,4 +238,4 @@ TYPED_TEST(GeminiTest, DoubleWithShift)
                                            multilinear_commitments_to_be_shifted);
 }
 
-} // namespace proof_system::honk::pcs::gemini
+} // namespace bb::honk::pcs::gemini
diff --git a/barretenberg/cpp/src/barretenberg/commitment_schemes/ipa/ipa.hpp b/barretenberg/cpp/src/barretenberg/commitment_schemes/ipa/ipa.hpp
index b4b2a405187a..9a254f347402 100644
--- a/barretenberg/cpp/src/barretenberg/commitment_schemes/ipa/ipa.hpp
+++ b/barretenberg/cpp/src/barretenberg/commitment_schemes/ipa/ipa.hpp
@@ -14,7 +14,7 @@
  * https://hackmd.io/q-A8y6aITWyWJrvsGGMWNA?view.
  *
  */
-namespace proof_system::honk::pcs::ipa {
+namespace bb::honk::pcs::ipa {
 template <typename Curve> class IPA {
     using Fr = typename Curve::ScalarField;
     using GroupElement = typename Curve::Element;
@@ -280,4 +280,4 @@ template <typename Curve> class IPA {
     }
 };
 
-} // namespace proof_system::honk::pcs::ipa
\ No newline at end of file
+} // namespace bb::honk::pcs::ipa
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/commitment_schemes/ipa/ipa.test.cpp b/barretenberg/cpp/src/barretenberg/commitment_schemes/ipa/ipa.test.cpp
index 6abfce080c67..3a9c26d1961d 100644
--- a/barretenberg/cpp/src/barretenberg/commitment_schemes/ipa/ipa.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/commitment_schemes/ipa/ipa.test.cpp
@@ -9,7 +9,7 @@
 #include "barretenberg/polynomials/polynomial_arithmetic.hpp"
 #include <gtest/gtest.h>
 using namespace bb;
-namespace proof_system::honk::pcs::ipa::test {
+namespace bb::honk::pcs::ipa::test {
 
 using Curve = curve::Grumpkin;
 
@@ -176,4 +176,4 @@ TEST_F(IPATest, GeminiShplonkIPAWithShift)
 
     EXPECT_EQ(verified, true);
 }
-} // namespace proof_system::honk::pcs::ipa::test
+} // namespace bb::honk::pcs::ipa::test
diff --git a/barretenberg/cpp/src/barretenberg/commitment_schemes/kzg/kzg.hpp b/barretenberg/cpp/src/barretenberg/commitment_schemes/kzg/kzg.hpp
index 940cefd30e85..3780b10ef85d 100644
--- a/barretenberg/cpp/src/barretenberg/commitment_schemes/kzg/kzg.hpp
+++ b/barretenberg/cpp/src/barretenberg/commitment_schemes/kzg/kzg.hpp
@@ -9,7 +9,7 @@
 #include <memory>
 #include <utility>
 
-namespace proof_system::honk::pcs::kzg {
+namespace bb::honk::pcs::kzg {
 
 template <typename Curve> class KZG {
     using CK = CommitmentKey<Curve>;
@@ -101,4 +101,4 @@ template <typename Curve> class KZG {
         return { P_0, P_1 };
     };
 };
-} // namespace proof_system::honk::pcs::kzg
+} // namespace bb::honk::pcs::kzg
diff --git a/barretenberg/cpp/src/barretenberg/commitment_schemes/kzg/kzg.test.cpp b/barretenberg/cpp/src/barretenberg/commitment_schemes/kzg/kzg.test.cpp
index e55633c575ce..5e933bb7d6cd 100644
--- a/barretenberg/cpp/src/barretenberg/commitment_schemes/kzg/kzg.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/commitment_schemes/kzg/kzg.test.cpp
@@ -12,7 +12,7 @@
 #include <gtest/gtest.h>
 #include <vector>
 
-namespace proof_system::honk::pcs::kzg {
+namespace bb::honk::pcs::kzg {
 
 template <class Curve> class KZGTest : public CommitmentTest<Curve> {
   public:
@@ -177,4 +177,4 @@ TYPED_TEST(KZGTest, GeminiShplonkKzgWithShift)
     EXPECT_EQ(verified, true);
 }
 
-} // namespace proof_system::honk::pcs::kzg
+} // namespace bb::honk::pcs::kzg
diff --git a/barretenberg/cpp/src/barretenberg/commitment_schemes/shplonk/shplonk.hpp b/barretenberg/cpp/src/barretenberg/commitment_schemes/shplonk/shplonk.hpp
index fd61cf431913..7f0f53093a47 100644
--- a/barretenberg/cpp/src/barretenberg/commitment_schemes/shplonk/shplonk.hpp
+++ b/barretenberg/cpp/src/barretenberg/commitment_schemes/shplonk/shplonk.hpp
@@ -18,7 +18,7 @@
  * The challenges are ρ (batching) and r (random evaluation).
  *
  */
-namespace proof_system::honk::pcs::shplonk {
+namespace bb::honk::pcs::shplonk {
 
 /**
  * @brief Polynomial G(X) = Q(X) - ∑ₖ ẑₖ(r)⋅( Bₖ(X) − Tₖ(z) ), where Q(X) = ∑ₖ ( Bₖ(X) − Tₖ(X) ) / zₖ(X)
@@ -271,4 +271,4 @@ template <typename Curve> class ShplonkVerifier_ {
         return { { z_challenge, Fr(0) }, G_commitment };
     };
 };
-} // namespace proof_system::honk::pcs::shplonk
+} // namespace bb::honk::pcs::shplonk
diff --git a/barretenberg/cpp/src/barretenberg/commitment_schemes/shplonk/shplonk.test.cpp b/barretenberg/cpp/src/barretenberg/commitment_schemes/shplonk/shplonk.test.cpp
index fbf01d10f5d0..6e754ae127b1 100644
--- a/barretenberg/cpp/src/barretenberg/commitment_schemes/shplonk/shplonk.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/commitment_schemes/shplonk/shplonk.test.cpp
@@ -10,7 +10,7 @@
 #include "../commitment_key.test.hpp"
 #include "barretenberg/commitment_schemes/claim.hpp"
 #include "barretenberg/polynomials/polynomial.hpp"
-namespace proof_system::honk::pcs::shplonk {
+namespace bb::honk::pcs::shplonk {
 template <class Params> class ShplonkTest : public CommitmentTest<Params> {};
 
 using CurveTypes = ::testing::Types<curve::BN254, curve::Grumpkin>;
@@ -71,4 +71,4 @@ TYPED_TEST(ShplonkTest, ShplonkSimple)
 
     this->verify_opening_claim(verifier_claim, shplonk_prover_witness);
 }
-} // namespace proof_system::honk::pcs::shplonk
+} // namespace bb::honk::pcs::shplonk
diff --git a/barretenberg/cpp/src/barretenberg/commitment_schemes/verification_key.hpp b/barretenberg/cpp/src/barretenberg/commitment_schemes/verification_key.hpp
index b9bcb636d11b..3d6429875bc5 100644
--- a/barretenberg/cpp/src/barretenberg/commitment_schemes/verification_key.hpp
+++ b/barretenberg/cpp/src/barretenberg/commitment_schemes/verification_key.hpp
@@ -20,7 +20,7 @@
 #include <memory>
 #include <string_view>
 
-namespace proof_system::honk::pcs {
+namespace bb::honk::pcs {
 
 template <class Curve> class VerifierCommitmentKey;
 
@@ -98,4 +98,4 @@ template <> class VerifierCommitmentKey<curve::Grumpkin> {
     std::shared_ptr<bb::srs::factories::VerifierCrs<Curve>> srs;
 };
 
-} // namespace proof_system::honk::pcs
+} // namespace bb::honk::pcs
diff --git a/barretenberg/cpp/src/barretenberg/commitment_schemes/wrapper.hpp b/barretenberg/cpp/src/barretenberg/commitment_schemes/wrapper.hpp
index 0fb5d130875a..a79d42e5f1f4 100644
--- a/barretenberg/cpp/src/barretenberg/commitment_schemes/wrapper.hpp
+++ b/barretenberg/cpp/src/barretenberg/commitment_schemes/wrapper.hpp
@@ -3,7 +3,7 @@
 #include "barretenberg/ecc/curves/bn254/g1.hpp"
 #include "gemini/gemini.hpp"
 
-namespace proof_system::honk {
+namespace bb::honk {
 
 struct OpeningProof {
     std::vector<bb::g1::affine_element> gemini;
@@ -11,4 +11,4 @@ struct OpeningProof {
     bb::g1::affine_element kzg;
 };
 
-} // namespace proof_system::honk
+} // namespace bb::honk
diff --git a/barretenberg/cpp/src/barretenberg/commitment_schemes/zeromorph/zeromorph.hpp b/barretenberg/cpp/src/barretenberg/commitment_schemes/zeromorph/zeromorph.hpp
index 562f90cf3554..9878925c2361 100644
--- a/barretenberg/cpp/src/barretenberg/commitment_schemes/zeromorph/zeromorph.hpp
+++ b/barretenberg/cpp/src/barretenberg/commitment_schemes/zeromorph/zeromorph.hpp
@@ -5,7 +5,7 @@
 #include "barretenberg/polynomials/polynomial.hpp"
 #include "barretenberg/transcript/transcript.hpp"
 
-namespace proof_system::honk::pcs::zeromorph {
+namespace bb::honk::pcs::zeromorph {
 
 /**
  * @brief Compute powers of a given challenge
@@ -728,4 +728,4 @@ template <typename Curve> class ZeroMorphVerifier_ {
     }
 };
 
-} // namespace proof_system::honk::pcs::zeromorph
+} // namespace bb::honk::pcs::zeromorph
diff --git a/barretenberg/cpp/src/barretenberg/commitment_schemes/zeromorph/zeromorph.test.cpp b/barretenberg/cpp/src/barretenberg/commitment_schemes/zeromorph/zeromorph.test.cpp
index dcc5e39bed1a..e933aaa07faf 100644
--- a/barretenberg/cpp/src/barretenberg/commitment_schemes/zeromorph/zeromorph.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/commitment_schemes/zeromorph/zeromorph.test.cpp
@@ -4,7 +4,7 @@
 
 #include <gtest/gtest.h>
 
-namespace proof_system::honk::pcs::zeromorph {
+namespace bb::honk::pcs::zeromorph {
 
 template <class Curve> class ZeroMorphTest : public CommitmentTest<Curve> {
   public:
@@ -532,4 +532,4 @@ TYPED_TEST(ZeroMorphWithConcatenationTest, ProveAndVerify)
     auto verified = this->execute_zeromorph_protocol(num_unshifted, num_shifted, num_concatenated);
     EXPECT_TRUE(verified);
 }
-} // namespace proof_system::honk::pcs::zeromorph
+} // namespace bb::honk::pcs::zeromorph
diff --git a/barretenberg/cpp/src/barretenberg/common/fuzzer.hpp b/barretenberg/cpp/src/barretenberg/common/fuzzer.hpp
index 2e56c71afa98..9ffa30975f04 100644
--- a/barretenberg/cpp/src/barretenberg/common/fuzzer.hpp
+++ b/barretenberg/cpp/src/barretenberg/common/fuzzer.hpp
@@ -690,7 +690,7 @@ template <template <typename> class Fuzzer, uint64_t Composers>
 constexpr void RunWithBuilders(const uint8_t* Data, const size_t Size, FastRandom& VarianceRNG)
 {
     if (Composers & 1) {
-        RunWithBuilder<Fuzzer, proof_system::StandardCircuitBuilder>(Data, Size, VarianceRNG);
+        RunWithBuilder<Fuzzer, bb::StandardCircuitBuilder>(Data, Size, VarianceRNG);
     }
 }
 
diff --git a/barretenberg/cpp/src/barretenberg/dsl/acir_format/blake2s_constraint.cpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/blake2s_constraint.cpp
index f36730658e0c..caaae5c3e996 100644
--- a/barretenberg/cpp/src/barretenberg/dsl/acir_format/blake2s_constraint.cpp
+++ b/barretenberg/cpp/src/barretenberg/dsl/acir_format/blake2s_constraint.cpp
@@ -5,8 +5,8 @@ namespace acir_format {
 
 template <typename Builder> void create_blake2s_constraints(Builder& builder, const Blake2sConstraint& constraint)
 {
-    using byte_array_ct = proof_system::plonk::stdlib::byte_array<Builder>;
-    using field_ct = proof_system::plonk::stdlib::field_t<Builder>;
+    using byte_array_ct = bb::plonk::stdlib::byte_array<Builder>;
+    using field_ct = bb::plonk::stdlib::field_t<Builder>;
 
     // Create byte array struct
     byte_array_ct arr(&builder);
@@ -26,7 +26,7 @@ template <typename Builder> void create_blake2s_constraints(Builder& builder, co
         arr.write(element_bytes);
     }
 
-    byte_array_ct output_bytes = proof_system::plonk::stdlib::blake2s<Builder>(arr);
+    byte_array_ct output_bytes = bb::plonk::stdlib::blake2s<Builder>(arr);
 
     // Convert byte array to vector of field_t
     auto bytes = output_bytes.bytes();
diff --git a/barretenberg/cpp/src/barretenberg/dsl/acir_format/blake3_constraint.cpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/blake3_constraint.cpp
index 7348ee25d0da..6a97e13440d8 100644
--- a/barretenberg/cpp/src/barretenberg/dsl/acir_format/blake3_constraint.cpp
+++ b/barretenberg/cpp/src/barretenberg/dsl/acir_format/blake3_constraint.cpp
@@ -5,8 +5,8 @@ namespace acir_format {
 
 template <typename Builder> void create_blake3_constraints(Builder& builder, const Blake3Constraint& constraint)
 {
-    using byte_array_ct = proof_system::plonk::stdlib::byte_array<Builder>;
-    using field_ct = proof_system::plonk::stdlib::field_t<Builder>;
+    using byte_array_ct = bb::plonk::stdlib::byte_array<Builder>;
+    using field_ct = bb::plonk::stdlib::field_t<Builder>;
 
     // Create byte array struct
     byte_array_ct arr(&builder);
@@ -26,7 +26,7 @@ template <typename Builder> void create_blake3_constraints(Builder& builder, con
         arr.write(element_bytes);
     }
 
-    byte_array_ct output_bytes = proof_system::plonk::stdlib::blake3s<Builder>(arr);
+    byte_array_ct output_bytes = bb::plonk::stdlib::blake3s<Builder>(arr);
 
     // Convert byte array to vector of field_t
     auto bytes = output_bytes.bytes();
diff --git a/barretenberg/cpp/src/barretenberg/dsl/acir_format/block_constraint.cpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/block_constraint.cpp
index 8bdb99fb39a9..2fe512eba983 100644
--- a/barretenberg/cpp/src/barretenberg/dsl/acir_format/block_constraint.cpp
+++ b/barretenberg/cpp/src/barretenberg/dsl/acir_format/block_constraint.cpp
@@ -2,14 +2,14 @@
 #include "barretenberg/stdlib/primitives/memory/ram_table.hpp"
 #include "barretenberg/stdlib/primitives/memory/rom_table.hpp"
 
-using namespace proof_system::plonk;
+using namespace bb::plonk;
 
 namespace acir_format {
 
 template <typename Builder>
-proof_system::plonk::stdlib::field_t<Builder> poly_to_field_ct(const poly_triple poly, Builder& builder)
+bb::plonk::stdlib::field_t<Builder> poly_to_field_ct(const poly_triple poly, Builder& builder)
 {
-    using field_ct = proof_system::plonk::stdlib::field_t<Builder>;
+    using field_ct = bb::plonk::stdlib::field_t<Builder>;
 
     ASSERT(poly.q_m == 0);
     ASSERT(poly.q_r == 0);
@@ -26,9 +26,9 @@ proof_system::plonk::stdlib::field_t<Builder> poly_to_field_ct(const poly_triple
 template <typename Builder>
 void create_block_constraints(Builder& builder, const BlockConstraint constraint, bool has_valid_witness_assignments)
 {
-    using field_ct = proof_system::plonk::stdlib::field_t<Builder>;
-    using rom_table_ct = proof_system::plonk::stdlib::rom_table<Builder>;
-    using ram_table_ct = proof_system::plonk::stdlib::ram_table<Builder>;
+    using field_ct = bb::plonk::stdlib::field_t<Builder>;
+    using rom_table_ct = bb::plonk::stdlib::rom_table<Builder>;
+    using ram_table_ct = bb::plonk::stdlib::ram_table<Builder>;
 
     std::vector<field_ct> init;
     for (auto i : constraint.init) {
diff --git a/barretenberg/cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256k1.cpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256k1.cpp
index 6711b237439b..2558e1478acf 100644
--- a/barretenberg/cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256k1.cpp
+++ b/barretenberg/cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256k1.cpp
@@ -3,7 +3,7 @@
 
 namespace acir_format {
 
-using namespace proof_system::plonk;
+using namespace bb::plonk;
 
 template <typename Builder>
 crypto::ecdsa::signature ecdsa_convert_signature(Builder& builder, std::vector<uint32_t> signature)
@@ -64,11 +64,11 @@ secp256k1_ct::g1_ct ecdsa_convert_inputs(Builder* ctx, const secp256k1::g1::affi
 // with just a byte.
 // notice that this function truncates each field_element to a byte
 template <typename Builder>
-proof_system::plonk::stdlib::byte_array<Builder> ecdsa_vector_of_bytes_to_byte_array(
-    Builder& builder, std::vector<uint32_t> vector_of_bytes)
+bb::plonk::stdlib::byte_array<Builder> ecdsa_vector_of_bytes_to_byte_array(Builder& builder,
+                                                                           std::vector<uint32_t> vector_of_bytes)
 {
-    using byte_array_ct = proof_system::plonk::stdlib::byte_array<Builder>;
-    using field_ct = proof_system::plonk::stdlib::field_t<Builder>;
+    using byte_array_ct = bb::plonk::stdlib::byte_array<Builder>;
+    using field_ct = bb::plonk::stdlib::field_t<Builder>;
 
     byte_array_ct arr(&builder);
 
@@ -95,10 +95,10 @@ void create_ecdsa_k1_verify_constraints(Builder& builder,
                                         const EcdsaSecp256k1Constraint& input,
                                         bool has_valid_witness_assignments)
 {
-    using secp256k1_ct = proof_system::plonk::stdlib::secp256k1<Builder>;
-    using field_ct = proof_system::plonk::stdlib::field_t<Builder>;
-    using bool_ct = proof_system::plonk::stdlib::bool_t<Builder>;
-    using byte_array_ct = proof_system::plonk::stdlib::byte_array<Builder>;
+    using secp256k1_ct = bb::plonk::stdlib::secp256k1<Builder>;
+    using field_ct = bb::plonk::stdlib::field_t<Builder>;
+    using bool_ct = bb::plonk::stdlib::bool_t<Builder>;
+    using byte_array_ct = bb::plonk::stdlib::byte_array<Builder>;
 
     if (has_valid_witness_assignments == false) {
         dummy_ecdsa_constraint(builder, input);
diff --git a/barretenberg/cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256k1.hpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256k1.hpp
index 287e9cccda1f..447a07e983ce 100644
--- a/barretenberg/cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256k1.hpp
+++ b/barretenberg/cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256k1.hpp
@@ -41,7 +41,7 @@ template <typename Builder>
 crypto::ecdsa::signature ecdsa_convert_signature(Builder& builder, std::vector<uint32_t> signature);
 witness_ct ecdsa_index_to_witness(Builder& builder, uint32_t index);
 template <typename Builder>
-proof_system::plonk::stdlib::byte_array<Builder> ecdsa_vector_of_bytes_to_byte_array(
-    Builder& builder, std::vector<uint32_t> vector_of_bytes);
+bb::plonk::stdlib::byte_array<Builder> ecdsa_vector_of_bytes_to_byte_array(Builder& builder,
+                                                                           std::vector<uint32_t> vector_of_bytes);
 
 } // namespace acir_format
diff --git a/barretenberg/cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256k1.test.cpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256k1.test.cpp
index 86a7be58ef5a..2ae2978ba02a 100644
--- a/barretenberg/cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256k1.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256k1.test.cpp
@@ -8,7 +8,7 @@
 #include <vector>
 
 namespace acir_format::tests {
-using curve_ct = proof_system::plonk::stdlib::secp256k1<Builder>;
+using curve_ct = bb::plonk::stdlib::secp256k1<Builder>;
 
 class ECDSASecp256k1 : public ::testing::Test {
   protected:
diff --git a/barretenberg/cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256r1.cpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256r1.cpp
index ab68a947ff09..1947929a9088 100644
--- a/barretenberg/cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256r1.cpp
+++ b/barretenberg/cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256r1.cpp
@@ -5,7 +5,7 @@
 
 namespace acir_format {
 
-using namespace proof_system::plonk;
+using namespace bb::plonk;
 
 secp256r1_ct::g1_ct ecdsa_convert_inputs(Builder* ctx, const secp256r1::g1::affine_element& input)
 {
@@ -28,9 +28,9 @@ void create_ecdsa_r1_verify_constraints(Builder& builder,
                                         const EcdsaSecp256r1Constraint& input,
                                         bool has_valid_witness_assignments)
 {
-    using secp256r1_ct = proof_system::plonk::stdlib::secp256r1<Builder>;
-    using bool_ct = proof_system::plonk::stdlib::bool_t<Builder>;
-    using field_ct = proof_system::plonk::stdlib::field_t<Builder>;
+    using secp256r1_ct = bb::plonk::stdlib::secp256r1<Builder>;
+    using bool_ct = bb::plonk::stdlib::bool_t<Builder>;
+    using field_ct = bb::plonk::stdlib::field_t<Builder>;
 
     if (has_valid_witness_assignments == false) {
         dummy_ecdsa_constraint(builder, input);
diff --git a/barretenberg/cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256r1.test.cpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256r1.test.cpp
index a87876e87892..e53f09e2498d 100644
--- a/barretenberg/cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256r1.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256r1.test.cpp
@@ -8,7 +8,7 @@
 #include <vector>
 
 namespace acir_format::tests {
-using curve_ct = proof_system::plonk::stdlib::secp256r1<Builder>;
+using curve_ct = bb::plonk::stdlib::secp256r1<Builder>;
 
 // Generate r1 constraints given pre generated pubkey, sig and message values
 size_t generate_r1_constraints(EcdsaSecp256r1Constraint& ecdsa_r1_constraint,
diff --git a/barretenberg/cpp/src/barretenberg/dsl/acir_format/fixed_base_scalar_mul.cpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/fixed_base_scalar_mul.cpp
index 71e281e99b61..89bc674eb3c9 100644
--- a/barretenberg/cpp/src/barretenberg/dsl/acir_format/fixed_base_scalar_mul.cpp
+++ b/barretenberg/cpp/src/barretenberg/dsl/acir_format/fixed_base_scalar_mul.cpp
@@ -8,9 +8,9 @@ namespace acir_format {
 
 template <typename Builder> void create_fixed_base_constraint(Builder& builder, const FixedBaseScalarMul& input)
 {
-    using cycle_group_ct = proof_system::plonk::stdlib::cycle_group<Builder>;
-    using cycle_scalar_ct = typename proof_system::plonk::stdlib::cycle_group<Builder>::cycle_scalar;
-    using field_ct = proof_system::plonk::stdlib::field_t<Builder>;
+    using cycle_group_ct = bb::plonk::stdlib::cycle_group<Builder>;
+    using cycle_scalar_ct = typename bb::plonk::stdlib::cycle_group<Builder>::cycle_scalar;
+    using field_ct = bb::plonk::stdlib::field_t<Builder>;
 
     // Computes low * G + high * 2^128 * G
     //
diff --git a/barretenberg/cpp/src/barretenberg/dsl/acir_format/keccak_constraint.cpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/keccak_constraint.cpp
index bd26897dbadb..6b41897e0a9c 100644
--- a/barretenberg/cpp/src/barretenberg/dsl/acir_format/keccak_constraint.cpp
+++ b/barretenberg/cpp/src/barretenberg/dsl/acir_format/keccak_constraint.cpp
@@ -7,8 +7,8 @@ namespace acir_format {
 
 template <typename Builder> void create_keccak_constraints(Builder& builder, const KeccakConstraint& constraint)
 {
-    using byte_array_ct = proof_system::plonk::stdlib::byte_array<Builder>;
-    using field_ct = proof_system::plonk::stdlib::field_t<Builder>;
+    using byte_array_ct = bb::plonk::stdlib::byte_array<Builder>;
+    using field_ct = bb::plonk::stdlib::field_t<Builder>;
 
     // Create byte array struct
     byte_array_ct arr(&builder);
@@ -28,7 +28,7 @@ template <typename Builder> void create_keccak_constraints(Builder& builder, con
         arr.write(element_bytes);
     }
 
-    byte_array_ct output_bytes = proof_system::plonk::stdlib::keccak<Builder>::hash(arr);
+    byte_array_ct output_bytes = bb::plonk::stdlib::keccak<Builder>::hash(arr);
 
     // Convert byte array to vector of field_t
     auto bytes = output_bytes.bytes();
@@ -40,9 +40,9 @@ template <typename Builder> void create_keccak_constraints(Builder& builder, con
 
 template <typename Builder> void create_keccak_var_constraints(Builder& builder, const KeccakVarConstraint& constraint)
 {
-    using byte_array_ct = proof_system::plonk::stdlib::byte_array<Builder>;
-    using field_ct = proof_system::plonk::stdlib::field_t<Builder>;
-    using uint32_ct = proof_system::plonk::stdlib::uint32<Builder>;
+    using byte_array_ct = bb::plonk::stdlib::byte_array<Builder>;
+    using field_ct = bb::plonk::stdlib::field_t<Builder>;
+    using uint32_ct = bb::plonk::stdlib::uint32<Builder>;
 
     // Create byte array struct
     byte_array_ct arr(&builder);
@@ -64,7 +64,7 @@ template <typename Builder> void create_keccak_var_constraints(Builder& builder,
 
     uint32_ct length = field_ct::from_witness_index(&builder, constraint.var_message_size);
 
-    byte_array_ct output_bytes = proof_system::plonk::stdlib::keccak<Builder>::hash(arr, length);
+    byte_array_ct output_bytes = bb::plonk::stdlib::keccak<Builder>::hash(arr, length);
 
     // Convert byte array to vector of field_t
     auto bytes = output_bytes.bytes();
@@ -76,10 +76,10 @@ template <typename Builder> void create_keccak_var_constraints(Builder& builder,
 
 template <typename Builder> void create_keccak_permutations(Builder& builder, const Keccakf1600& constraint)
 {
-    using field_ct = proof_system::plonk::stdlib::field_t<Builder>;
+    using field_ct = bb::plonk::stdlib::field_t<Builder>;
 
     // Create the array containing the permuted state
-    std::array<field_ct, proof_system::plonk::stdlib::keccak<Builder>::NUM_KECCAK_LANES> state;
+    std::array<field_ct, bb::plonk::stdlib::keccak<Builder>::NUM_KECCAK_LANES> state;
 
     // Get the witness assignment for each witness index
     // Write the witness assignment to the byte_array
@@ -88,8 +88,7 @@ template <typename Builder> void create_keccak_permutations(Builder& builder, co
         state[i] = field_ct::from_witness_index(&builder, constraint.state[i]);
     }
 
-    std::array<field_ct, 25> output_state =
-        proof_system::plonk::stdlib::keccak<Builder>::permutation_opcode(state, &builder);
+    std::array<field_ct, 25> output_state = bb::plonk::stdlib::keccak<Builder>::permutation_opcode(state, &builder);
 
     for (size_t i = 0; i < output_state.size(); ++i) {
         builder.assert_equal(output_state[i].normalize().witness_index, constraint.result[i]);
diff --git a/barretenberg/cpp/src/barretenberg/dsl/acir_format/logic_constraint.cpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/logic_constraint.cpp
index b9d501f354ab..74e706187b78 100644
--- a/barretenberg/cpp/src/barretenberg/dsl/acir_format/logic_constraint.cpp
+++ b/barretenberg/cpp/src/barretenberg/dsl/acir_format/logic_constraint.cpp
@@ -3,7 +3,7 @@
 
 namespace acir_format {
 
-using namespace proof_system::plonk;
+using namespace bb::plonk;
 
 template <typename Builder>
 void create_logic_gate(Builder& builder,
@@ -13,7 +13,7 @@ void create_logic_gate(Builder& builder,
                        const size_t num_bits,
                        const bool is_xor_gate)
 {
-    using field_ct = proof_system::plonk::stdlib::field_t<Builder>;
+    using field_ct = bb::plonk::stdlib::field_t<Builder>;
 
     field_ct left = field_ct::from_witness_index(&builder, a);
     field_ct right = field_ct::from_witness_index(&builder, b);
diff --git a/barretenberg/cpp/src/barretenberg/dsl/acir_format/pedersen.cpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/pedersen.cpp
index a633420053ca..eac057ca4d92 100644
--- a/barretenberg/cpp/src/barretenberg/dsl/acir_format/pedersen.cpp
+++ b/barretenberg/cpp/src/barretenberg/dsl/acir_format/pedersen.cpp
@@ -2,11 +2,11 @@
 
 namespace acir_format {
 
-using namespace proof_system::plonk;
+using namespace bb::plonk;
 
 template <typename Builder> void create_pedersen_constraint(Builder& builder, const PedersenConstraint& input)
 {
-    using field_ct = proof_system::plonk::stdlib::field_t<Builder>;
+    using field_ct = bb::plonk::stdlib::field_t<Builder>;
 
     std::vector<field_ct> scalars;
 
@@ -24,7 +24,7 @@ template <typename Builder> void create_pedersen_constraint(Builder& builder, co
 
 template <typename Builder> void create_pedersen_hash_constraint(Builder& builder, const PedersenHashConstraint& input)
 {
-    using field_ct = proof_system::plonk::stdlib::field_t<Builder>;
+    using field_ct = bb::plonk::stdlib::field_t<Builder>;
 
     std::vector<field_ct> scalars;
 
diff --git a/barretenberg/cpp/src/barretenberg/dsl/acir_format/recursion_constraint.cpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/recursion_constraint.cpp
index 449b2b972b1c..0cdae501c48d 100644
--- a/barretenberg/cpp/src/barretenberg/dsl/acir_format/recursion_constraint.cpp
+++ b/barretenberg/cpp/src/barretenberg/dsl/acir_format/recursion_constraint.cpp
@@ -7,7 +7,7 @@
 
 namespace acir_format {
 
-using namespace proof_system::plonk;
+using namespace bb::plonk;
 
 // `NUM_LIMB_BITS_IN_FIELD_SIMULATION` is the limb size when simulating a non-native field using the bigfield class
 // A aggregation object is two acir_format::g1_ct types where each coordinate in a point is a non-native field.
@@ -136,7 +136,7 @@ std::array<uint32_t, RecursionConstraint::AGGREGATION_OBJECT_SIZE> create_recurs
     vkey->program_width = noir_recursive_settings::program_width;
 
     Transcript_ct transcript(&builder, manifest, proof_fields, input.public_inputs.size());
-    aggregation_state_ct result = proof_system::plonk::stdlib::recursion::verify_proof_<bn254, noir_recursive_settings>(
+    aggregation_state_ct result = bb::plonk::stdlib::recursion::verify_proof_<bn254, noir_recursive_settings>(
         &builder, vkey, transcript, previous_aggregation);
 
     // Assign correct witness value to the verification key hash
diff --git a/barretenberg/cpp/src/barretenberg/dsl/acir_format/recursion_constraint.hpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/recursion_constraint.hpp
index 7be0282be1a0..b7cdde81f1ed 100644
--- a/barretenberg/cpp/src/barretenberg/dsl/acir_format/recursion_constraint.hpp
+++ b/barretenberg/cpp/src/barretenberg/dsl/acir_format/recursion_constraint.hpp
@@ -5,7 +5,7 @@
 
 namespace acir_format {
 
-using namespace proof_system::plonk;
+using namespace bb::plonk;
 
 /**
  * @brief RecursionConstraint struct contains information required to recursively verify a proof!
diff --git a/barretenberg/cpp/src/barretenberg/dsl/acir_format/recursion_constraint.test.cpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/recursion_constraint.test.cpp
index ba6ff3a6f5f5..457184ed0253 100644
--- a/barretenberg/cpp/src/barretenberg/dsl/acir_format/recursion_constraint.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/dsl/acir_format/recursion_constraint.test.cpp
@@ -6,7 +6,7 @@
 #include <gtest/gtest.h>
 #include <vector>
 
-using namespace proof_system::plonk;
+using namespace bb::plonk;
 
 class AcirRecursionConstraint : public ::testing::Test {
   protected:
diff --git a/barretenberg/cpp/src/barretenberg/dsl/acir_format/schnorr_verify.cpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/schnorr_verify.cpp
index 5f31c2690ba3..21137203aede 100644
--- a/barretenberg/cpp/src/barretenberg/dsl/acir_format/schnorr_verify.cpp
+++ b/barretenberg/cpp/src/barretenberg/dsl/acir_format/schnorr_verify.cpp
@@ -4,7 +4,7 @@
 
 namespace acir_format {
 
-using namespace proof_system::plonk::stdlib;
+using namespace bb::plonk::stdlib;
 
 template <typename Builder>
 crypto::schnorr::signature convert_signature(Builder& builder, std::vector<uint32_t> signature)
@@ -45,11 +45,11 @@ crypto::schnorr::signature convert_signature(Builder& builder, std::vector<uint3
 // with just a byte.
 // notice that this function truncates each field_element to a byte
 template <typename Builder>
-proof_system::plonk::stdlib::byte_array<Builder> vector_of_bytes_to_byte_array(Builder& builder,
-                                                                               std::vector<uint32_t> vector_of_bytes)
+bb::plonk::stdlib::byte_array<Builder> vector_of_bytes_to_byte_array(Builder& builder,
+                                                                     std::vector<uint32_t> vector_of_bytes)
 {
-    using byte_array_ct = proof_system::plonk::stdlib::byte_array<Builder>;
-    using field_ct = proof_system::plonk::stdlib::field_t<Builder>;
+    using byte_array_ct = bb::plonk::stdlib::byte_array<Builder>;
+    using field_ct = bb::plonk::stdlib::field_t<Builder>;
 
     byte_array_ct arr(&builder);
 
@@ -66,8 +66,7 @@ proof_system::plonk::stdlib::byte_array<Builder> vector_of_bytes_to_byte_array(B
     return arr;
 }
 
-template <typename Builder>
-proof_system::plonk::stdlib::witness_t<Builder> index_to_witness(Builder& builder, uint32_t index)
+template <typename Builder> bb::plonk::stdlib::witness_t<Builder> index_to_witness(Builder& builder, uint32_t index)
 {
     fr value = builder.get_variable(index);
     return { &builder, value };
@@ -75,10 +74,10 @@ proof_system::plonk::stdlib::witness_t<Builder> index_to_witness(Builder& builde
 
 template <typename Builder> void create_schnorr_verify_constraints(Builder& builder, const SchnorrConstraint& input)
 {
-    using witness_ct = proof_system::plonk::stdlib::witness_t<Builder>;
-    using cycle_group_ct = proof_system::plonk::stdlib::cycle_group<Builder>;
-    using schnorr_signature_bits_ct = proof_system::plonk::stdlib::schnorr::signature_bits<Builder>;
-    using bool_ct = proof_system::plonk::stdlib::bool_t<Builder>;
+    using witness_ct = bb::plonk::stdlib::witness_t<Builder>;
+    using cycle_group_ct = bb::plonk::stdlib::cycle_group<Builder>;
+    using schnorr_signature_bits_ct = bb::plonk::stdlib::schnorr::signature_bits<Builder>;
+    using bool_ct = bb::plonk::stdlib::bool_t<Builder>;
 
     auto new_sig = convert_signature(builder, input.signature);
     // From ignorance, you will see me convert a bunch of witnesses from ByteArray -> BitArray
diff --git a/barretenberg/cpp/src/barretenberg/dsl/acir_format/sha256_constraint.cpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/sha256_constraint.cpp
index bfe814f3b581..3f9c241162fe 100644
--- a/barretenberg/cpp/src/barretenberg/dsl/acir_format/sha256_constraint.cpp
+++ b/barretenberg/cpp/src/barretenberg/dsl/acir_format/sha256_constraint.cpp
@@ -9,8 +9,8 @@ namespace acir_format {
 // pair<witness_index, bits>
 template <typename Builder> void create_sha256_constraints(Builder& builder, const Sha256Constraint& constraint)
 {
-    using byte_array_ct = proof_system::plonk::stdlib::byte_array<Builder>;
-    using field_ct = proof_system::plonk::stdlib::field_t<Builder>;
+    using byte_array_ct = bb::plonk::stdlib::byte_array<Builder>;
+    using field_ct = bb::plonk::stdlib::field_t<Builder>;
 
     // Create byte array struct
     byte_array_ct arr(&builder);
@@ -31,7 +31,7 @@ template <typename Builder> void create_sha256_constraints(Builder& builder, con
     }
 
     // Compute sha256
-    byte_array_ct output_bytes = proof_system::plonk::stdlib::sha256<Builder>(arr);
+    byte_array_ct output_bytes = bb::plonk::stdlib::sha256<Builder>(arr);
 
     // Convert byte array to vector of field_t
     auto bytes = output_bytes.bytes();
diff --git a/barretenberg/cpp/src/barretenberg/dsl/acir_proofs/acir_composer.cpp b/barretenberg/cpp/src/barretenberg/dsl/acir_proofs/acir_composer.cpp
index a17e430d9373..7c17e46d19bb 100644
--- a/barretenberg/cpp/src/barretenberg/dsl/acir_proofs/acir_composer.cpp
+++ b/barretenberg/cpp/src/barretenberg/dsl/acir_proofs/acir_composer.cpp
@@ -32,7 +32,7 @@ void AcirComposer::create_circuit(acir_format::acir_format& constraint_system, W
     vinfo("gates: ", builder_.get_total_circuit_size());
 }
 
-std::shared_ptr<proof_system::plonk::proving_key> AcirComposer::init_proving_key()
+std::shared_ptr<bb::plonk::proving_key> AcirComposer::init_proving_key()
 {
     acir_format::Composer composer;
     vinfo("computing proving key...");
@@ -82,7 +82,7 @@ std::vector<uint8_t> AcirComposer::create_goblin_proof()
     return goblin.construct_proof(goblin_builder_);
 }
 
-std::shared_ptr<proof_system::plonk::verification_key> AcirComposer::init_verification_key()
+std::shared_ptr<bb::plonk::verification_key> AcirComposer::init_verification_key()
 {
     if (!proving_key_) {
         throw_or_abort("Compute proving key first.");
@@ -94,10 +94,10 @@ std::shared_ptr<proof_system::plonk::verification_key> AcirComposer::init_verifi
     return verification_key_;
 }
 
-void AcirComposer::load_verification_key(proof_system::plonk::verification_key_data&& data)
+void AcirComposer::load_verification_key(bb::plonk::verification_key_data&& data)
 {
-    verification_key_ = std::make_shared<proof_system::plonk::verification_key>(
-        std::move(data), srs::get_crs_factory()->get_verifier_crs());
+    verification_key_ =
+        std::make_shared<bb::plonk::verification_key>(std::move(data), srs::get_crs_factory()->get_verifier_crs());
 }
 
 bool AcirComposer::verify_proof(std::vector<uint8_t> const& proof, bool is_recursive)
diff --git a/barretenberg/cpp/src/barretenberg/dsl/acir_proofs/acir_composer.hpp b/barretenberg/cpp/src/barretenberg/dsl/acir_proofs/acir_composer.hpp
index aaf77de67fa4..7acad4ff622a 100644
--- a/barretenberg/cpp/src/barretenberg/dsl/acir_proofs/acir_composer.hpp
+++ b/barretenberg/cpp/src/barretenberg/dsl/acir_proofs/acir_composer.hpp
@@ -20,13 +20,13 @@ class AcirComposer {
     template <typename Builder = UltraCircuitBuilder>
     void create_circuit(acir_format::acir_format& constraint_system, WitnessVector const& witness = {});
 
-    std::shared_ptr<proof_system::plonk::proving_key> init_proving_key();
+    std::shared_ptr<bb::plonk::proving_key> init_proving_key();
 
     std::vector<uint8_t> create_proof(bool is_recursive);
 
-    void load_verification_key(proof_system::plonk::verification_key_data&& data);
+    void load_verification_key(bb::plonk::verification_key_data&& data);
 
-    std::shared_ptr<proof_system::plonk::verification_key> init_verification_key();
+    std::shared_ptr<bb::plonk::verification_key> init_verification_key();
 
     bool verify_proof(std::vector<uint8_t> const& proof, bool is_recursive);
 
@@ -48,8 +48,8 @@ class AcirComposer {
     acir_format::GoblinBuilder goblin_builder_;
     Goblin goblin;
     size_t size_hint_;
-    std::shared_ptr<proof_system::plonk::proving_key> proving_key_;
-    std::shared_ptr<proof_system::plonk::verification_key> verification_key_;
+    std::shared_ptr<bb::plonk::proving_key> proving_key_;
+    std::shared_ptr<bb::plonk::verification_key> verification_key_;
     bool verbose_ = true;
 
     template <typename... Args> inline void vinfo(Args... args)
diff --git a/barretenberg/cpp/src/barretenberg/dsl/types.hpp b/barretenberg/cpp/src/barretenberg/dsl/types.hpp
index 6969eae44109..7c11ac9e521d 100644
--- a/barretenberg/cpp/src/barretenberg/dsl/types.hpp
+++ b/barretenberg/cpp/src/barretenberg/dsl/types.hpp
@@ -25,7 +25,7 @@
 
 namespace acir_format {
 
-using Builder = proof_system::UltraCircuitBuilder;
+using Builder = bb::UltraCircuitBuilder;
 using GoblinBuilder = bb::Goblin::Builder;
 using Composer = plonk::UltraComposer;
 
@@ -37,38 +37,38 @@ using Verifier =
 
 using RecursiveProver = plonk::UltraProver;
 
-using witness_ct = proof_system::plonk::stdlib::witness_t<Builder>;
-using public_witness_ct = proof_system::plonk::stdlib::public_witness_t<Builder>;
-using bool_ct = proof_system::plonk::stdlib::bool_t<Builder>;
-using byte_array_ct = proof_system::plonk::stdlib::byte_array<Builder>;
-using packed_byte_array_ct = proof_system::plonk::stdlib::packed_byte_array<Builder>;
-using field_ct = proof_system::plonk::stdlib::field_t<Builder>;
-using suint_ct = proof_system::plonk::stdlib::safe_uint_t<Builder>;
-using uint8_ct = proof_system::plonk::stdlib::uint8<Builder>;
-using uint16_ct = proof_system::plonk::stdlib::uint16<Builder>;
-using uint32_ct = proof_system::plonk::stdlib::uint32<Builder>;
-using uint64_ct = proof_system::plonk::stdlib::uint64<Builder>;
-using bit_array_ct = proof_system::plonk::stdlib::bit_array<Builder>;
-using fq_ct = proof_system::plonk::stdlib::bigfield<Builder, bb::Bn254FqParams>;
-using biggroup_ct = proof_system::plonk::stdlib::element<Builder, fq_ct, field_ct, bb::g1>;
-using cycle_group_ct = proof_system::plonk::stdlib::cycle_group<Builder>;
-using cycle_scalar_ct = proof_system::plonk::stdlib::cycle_group<Builder>::cycle_scalar;
-using pedersen_commitment = proof_system::plonk::stdlib::pedersen_commitment<Builder>;
-using bn254 = proof_system::plonk::stdlib::bn254<Builder>;
-using secp256k1_ct = proof_system::plonk::stdlib::secp256k1<Builder>;
-using secp256r1_ct = proof_system::plonk::stdlib::secp256r1<Builder>;
+using witness_ct = bb::plonk::stdlib::witness_t<Builder>;
+using public_witness_ct = bb::plonk::stdlib::public_witness_t<Builder>;
+using bool_ct = bb::plonk::stdlib::bool_t<Builder>;
+using byte_array_ct = bb::plonk::stdlib::byte_array<Builder>;
+using packed_byte_array_ct = bb::plonk::stdlib::packed_byte_array<Builder>;
+using field_ct = bb::plonk::stdlib::field_t<Builder>;
+using suint_ct = bb::plonk::stdlib::safe_uint_t<Builder>;
+using uint8_ct = bb::plonk::stdlib::uint8<Builder>;
+using uint16_ct = bb::plonk::stdlib::uint16<Builder>;
+using uint32_ct = bb::plonk::stdlib::uint32<Builder>;
+using uint64_ct = bb::plonk::stdlib::uint64<Builder>;
+using bit_array_ct = bb::plonk::stdlib::bit_array<Builder>;
+using fq_ct = bb::plonk::stdlib::bigfield<Builder, bb::Bn254FqParams>;
+using biggroup_ct = bb::plonk::stdlib::element<Builder, fq_ct, field_ct, bb::g1>;
+using cycle_group_ct = bb::plonk::stdlib::cycle_group<Builder>;
+using cycle_scalar_ct = bb::plonk::stdlib::cycle_group<Builder>::cycle_scalar;
+using pedersen_commitment = bb::plonk::stdlib::pedersen_commitment<Builder>;
+using bn254 = bb::plonk::stdlib::bn254<Builder>;
+using secp256k1_ct = bb::plonk::stdlib::secp256k1<Builder>;
+using secp256r1_ct = bb::plonk::stdlib::secp256r1<Builder>;
 
-using hash_path_ct = proof_system::plonk::stdlib::merkle_tree::hash_path<Builder>;
+using hash_path_ct = bb::plonk::stdlib::merkle_tree::hash_path<Builder>;
 
-using schnorr_signature_bits_ct = proof_system::plonk::stdlib::schnorr::signature_bits<Builder>;
+using schnorr_signature_bits_ct = bb::plonk::stdlib::schnorr::signature_bits<Builder>;
 
 // Ultra-composer specific typesv
-using rom_table_ct = proof_system::plonk::stdlib::rom_table<Builder>;
-using ram_table_ct = proof_system::plonk::stdlib::ram_table<Builder>;
+using rom_table_ct = bb::plonk::stdlib::rom_table<Builder>;
+using ram_table_ct = bb::plonk::stdlib::ram_table<Builder>;
 
-using verification_key_ct = proof_system::plonk::stdlib::recursion::verification_key<bn254>;
-using aggregation_state_ct = proof_system::plonk::stdlib::recursion::aggregation_state<bn254>;
-using noir_recursive_settings = proof_system::plonk::stdlib::recursion::recursive_ultra_verifier_settings<bn254>;
-using Transcript_ct = proof_system::plonk::stdlib::recursion::Transcript<Builder>;
+using verification_key_ct = bb::plonk::stdlib::recursion::verification_key<bn254>;
+using aggregation_state_ct = bb::plonk::stdlib::recursion::aggregation_state<bn254>;
+using noir_recursive_settings = bb::plonk::stdlib::recursion::recursive_ultra_verifier_settings<bn254>;
+using Transcript_ct = bb::plonk::stdlib::recursion::Transcript<Builder>;
 
 } // namespace acir_format
diff --git a/barretenberg/cpp/src/barretenberg/ecc/curves/types.hpp b/barretenberg/cpp/src/barretenberg/ecc/curves/types.hpp
index deb738421639..9409eb2d3b8c 100644
--- a/barretenberg/cpp/src/barretenberg/ecc/curves/types.hpp
+++ b/barretenberg/cpp/src/barretenberg/ecc/curves/types.hpp
@@ -1,5 +1,5 @@
 #pragma once
 
-namespace proof_system {
+namespace bb {
 enum CurveType { BN254, SECP256K1, SECP256R1, GRUMPKIN };
 }
diff --git a/barretenberg/cpp/src/barretenberg/eccvm/eccvm_composer.cpp b/barretenberg/cpp/src/barretenberg/eccvm/eccvm_composer.cpp
index 97202fa2da4c..530e36f047b6 100644
--- a/barretenberg/cpp/src/barretenberg/eccvm/eccvm_composer.cpp
+++ b/barretenberg/cpp/src/barretenberg/eccvm/eccvm_composer.cpp
@@ -2,7 +2,7 @@
 #include "barretenberg/proof_system/composer/composer_lib.hpp"
 #include "barretenberg/proof_system/composer/permutation_lib.hpp"
 
-namespace proof_system::honk {
+namespace bb::honk {
 
 /**
  * @brief Compute witness polynomials
@@ -119,4 +119,4 @@ std::shared_ptr<typename Flavor::VerificationKey> ECCVMComposer_<Flavor>::comput
 }
 template class ECCVMComposer_<honk::flavor::ECCVM>;
 
-} // namespace proof_system::honk
+} // namespace bb::honk
diff --git a/barretenberg/cpp/src/barretenberg/eccvm/eccvm_composer.hpp b/barretenberg/cpp/src/barretenberg/eccvm/eccvm_composer.hpp
index 34eede401c74..e8a57b012cdb 100644
--- a/barretenberg/cpp/src/barretenberg/eccvm/eccvm_composer.hpp
+++ b/barretenberg/cpp/src/barretenberg/eccvm/eccvm_composer.hpp
@@ -7,7 +7,7 @@
 #include "barretenberg/srs/factories/file_crs_factory.hpp"
 #include "barretenberg/srs/global_crs.hpp"
 
-namespace proof_system::honk {
+namespace bb::honk {
 template <ECCVMFlavor Flavor> class ECCVMComposer_ {
   public:
     using FF = typename Flavor::FF;
@@ -77,4 +77,4 @@ template <ECCVMFlavor Flavor> class ECCVMComposer_ {
 // TODO(#532): this pattern is weird; is this not instantiating the templates?
 using ECCVMComposer = ECCVMComposer_<honk::flavor::ECCVM>;
 
-} // namespace proof_system::honk
+} // namespace bb::honk
diff --git a/barretenberg/cpp/src/barretenberg/eccvm/eccvm_composer.test.cpp b/barretenberg/cpp/src/barretenberg/eccvm/eccvm_composer.test.cpp
index 7fa288957e22..da81ec37eda3 100644
--- a/barretenberg/cpp/src/barretenberg/eccvm/eccvm_composer.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/eccvm/eccvm_composer.test.cpp
@@ -12,7 +12,7 @@
 #include "barretenberg/relations/relation_parameters.hpp"
 #include "barretenberg/sumcheck/sumcheck_round.hpp"
 
-using namespace proof_system::honk;
+using namespace bb::honk;
 
 namespace test_eccvm_composer {
 
@@ -35,10 +35,9 @@ TYPED_TEST_SUITE(ECCVMComposerTests, FlavorTypes);
 namespace {
 auto& engine = numeric::random::get_debug_engine();
 }
-template <typename Flavor>
-proof_system::ECCVMCircuitBuilder<Flavor> generate_trace(numeric::random::Engine* engine = nullptr)
+template <typename Flavor> bb::ECCVMCircuitBuilder<Flavor> generate_trace(numeric::random::Engine* engine = nullptr)
 {
-    proof_system::ECCVMCircuitBuilder<Flavor> result;
+    bb::ECCVMCircuitBuilder<Flavor> result;
     using G1 = typename Flavor::CycleGroup;
     using Fr = typename G1::Fr;
 
diff --git a/barretenberg/cpp/src/barretenberg/eccvm/eccvm_prover.cpp b/barretenberg/cpp/src/barretenberg/eccvm/eccvm_prover.cpp
index f58b95248051..3ab2a27fcce8 100644
--- a/barretenberg/cpp/src/barretenberg/eccvm/eccvm_prover.cpp
+++ b/barretenberg/cpp/src/barretenberg/eccvm/eccvm_prover.cpp
@@ -10,7 +10,7 @@
 #include "barretenberg/relations/permutation_relation.hpp"
 #include "barretenberg/sumcheck/sumcheck.hpp"
 
-namespace proof_system::honk {
+namespace bb::honk {
 
 /**
  * Create ECCVMProver_ from proving key, witness and manifest.
@@ -309,4 +309,4 @@ template <ECCVMFlavor Flavor> plonk::proof& ECCVMProver_<Flavor>::construct_proo
 
 template class ECCVMProver_<honk::flavor::ECCVM>;
 
-} // namespace proof_system::honk
+} // namespace bb::honk
diff --git a/barretenberg/cpp/src/barretenberg/eccvm/eccvm_prover.hpp b/barretenberg/cpp/src/barretenberg/eccvm/eccvm_prover.hpp
index a3dc81a67da0..b613a0697efe 100644
--- a/barretenberg/cpp/src/barretenberg/eccvm/eccvm_prover.hpp
+++ b/barretenberg/cpp/src/barretenberg/eccvm/eccvm_prover.hpp
@@ -8,7 +8,7 @@
 #include "barretenberg/sumcheck/sumcheck_output.hpp"
 #include "barretenberg/transcript/transcript.hpp"
 
-namespace proof_system::honk {
+namespace bb::honk {
 
 // We won't compile this class with honk::flavor::Standard, but we will like want to compile it (at least for testing)
 // with a flavor that uses the curve Grumpkin, or a flavor that does/does not have zk, etc.
@@ -51,7 +51,7 @@ template <ECCVMFlavor Flavor> class ECCVMProver_ {
 
     std::vector<FF> public_inputs;
 
-    proof_system::RelationParameters<FF> relation_parameters;
+    bb::RelationParameters<FF> relation_parameters;
 
     std::shared_ptr<ProvingKey> key;
 
@@ -83,4 +83,4 @@ template <ECCVMFlavor Flavor> class ECCVMProver_ {
     plonk::proof proof;
 };
 
-} // namespace proof_system::honk
+} // namespace bb::honk
diff --git a/barretenberg/cpp/src/barretenberg/eccvm/eccvm_transcript.test.cpp b/barretenberg/cpp/src/barretenberg/eccvm/eccvm_transcript.test.cpp
index e501bc304894..653275023654 100644
--- a/barretenberg/cpp/src/barretenberg/eccvm/eccvm_transcript.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/eccvm/eccvm_transcript.test.cpp
@@ -6,7 +6,7 @@
 #include "barretenberg/transcript/transcript.hpp"
 #include <gtest/gtest.h>
 
-using namespace proof_system::honk;
+using namespace bb::honk;
 
 template <typename Flavor> class ECCVMTranscriptTests : public ::testing::Test {
   public:
@@ -183,9 +183,9 @@ template <typename Flavor> class ECCVMTranscriptTests : public ::testing::Test {
 
         return manifest_expected;
     }
-    proof_system::ECCVMCircuitBuilder<Flavor> generate_trace(numeric::random::Engine* engine = nullptr)
+    bb::ECCVMCircuitBuilder<Flavor> generate_trace(numeric::random::Engine* engine = nullptr)
     {
-        proof_system::ECCVMCircuitBuilder<Flavor> result;
+        bb::ECCVMCircuitBuilder<Flavor> result;
         using G1 = typename Flavor::CycleGroup;
         using Fr = typename G1::Fr;
 
diff --git a/barretenberg/cpp/src/barretenberg/eccvm/eccvm_verifier.cpp b/barretenberg/cpp/src/barretenberg/eccvm/eccvm_verifier.cpp
index e23019988e86..198cd6540893 100644
--- a/barretenberg/cpp/src/barretenberg/eccvm/eccvm_verifier.cpp
+++ b/barretenberg/cpp/src/barretenberg/eccvm/eccvm_verifier.cpp
@@ -5,9 +5,9 @@
 #include "barretenberg/transcript/transcript.hpp"
 
 using namespace bb;
-using namespace proof_system::honk::sumcheck;
+using namespace bb::honk::sumcheck;
 
-namespace proof_system::honk {
+namespace bb::honk {
 template <typename Flavor>
 ECCVMVerifier_<Flavor>::ECCVMVerifier_(const std::shared_ptr<typename Flavor::VerificationKey>& verifier_key)
     : key(verifier_key)
@@ -283,4 +283,4 @@ template <typename Flavor> bool ECCVMVerifier_<Flavor>::verify_proof(const plonk
 
 template class ECCVMVerifier_<honk::flavor::ECCVM>;
 
-} // namespace proof_system::honk
+} // namespace bb::honk
diff --git a/barretenberg/cpp/src/barretenberg/eccvm/eccvm_verifier.hpp b/barretenberg/cpp/src/barretenberg/eccvm/eccvm_verifier.hpp
index fca7f03b12f8..44ae6c720d46 100644
--- a/barretenberg/cpp/src/barretenberg/eccvm/eccvm_verifier.hpp
+++ b/barretenberg/cpp/src/barretenberg/eccvm/eccvm_verifier.hpp
@@ -3,7 +3,7 @@
 #include "barretenberg/plonk/proof_system/types/proof.hpp"
 #include "barretenberg/sumcheck/sumcheck.hpp"
 
-namespace proof_system::honk {
+namespace bb::honk {
 template <typename Flavor> class ECCVMVerifier_ {
     using FF = typename Flavor::FF;
     using Commitment = typename Flavor::Commitment;
@@ -41,4 +41,4 @@ template <typename Flavor> class ECCVMVerifier_ {
 
 using ECCVMVerifierGrumpkin = ECCVMVerifier_<honk::flavor::ECCVM>;
 
-} // namespace proof_system::honk
+} // namespace bb::honk
diff --git a/barretenberg/cpp/src/barretenberg/examples/c_bind.cpp b/barretenberg/cpp/src/barretenberg/examples/c_bind.cpp
index 53f373658feb..761670b04764 100644
--- a/barretenberg/cpp/src/barretenberg/examples/c_bind.cpp
+++ b/barretenberg/cpp/src/barretenberg/examples/c_bind.cpp
@@ -2,7 +2,7 @@
 #include "barretenberg/srs/global_crs.hpp"
 #include "simple/simple.hpp"
 
-using namespace proof_system::plonk::stdlib::types;
+using namespace bb::plonk::stdlib::types;
 
 WASM_EXPORT void examples_simple_create_and_verify_proof(bool* valid)
 {
diff --git a/barretenberg/cpp/src/barretenberg/examples/simple/simple.cpp b/barretenberg/cpp/src/barretenberg/examples/simple/simple.cpp
index e1094e719d18..6d24c3dbbca0 100644
--- a/barretenberg/cpp/src/barretenberg/examples/simple/simple.cpp
+++ b/barretenberg/cpp/src/barretenberg/examples/simple/simple.cpp
@@ -6,7 +6,7 @@
 
 namespace examples::simple {
 
-using namespace proof_system::plonk;
+using namespace bb::plonk;
 using namespace stdlib::types;
 
 const size_t CIRCUIT_SIZE = 1 << 19;
@@ -51,7 +51,7 @@ proof create_proof(BuilderComposerPtrs pair)
     return proof;
 }
 
-bool verify_proof(BuilderComposerPtrs pair, proof_system::plonk::proof const& proof)
+bool verify_proof(BuilderComposerPtrs pair, bb::plonk::proof const& proof)
 {
     info("computing verification key...");
     pair.composer->compute_verification_key(*pair.builder);
diff --git a/barretenberg/cpp/src/barretenberg/examples/simple/simple.hpp b/barretenberg/cpp/src/barretenberg/examples/simple/simple.hpp
index 264d328d2d20..0780c75d5297 100644
--- a/barretenberg/cpp/src/barretenberg/examples/simple/simple.hpp
+++ b/barretenberg/cpp/src/barretenberg/examples/simple/simple.hpp
@@ -4,7 +4,7 @@
 
 namespace examples::simple {
 
-using namespace proof_system::plonk;
+using namespace bb::plonk;
 using namespace stdlib::types;
 
 struct BuilderComposerPtrs {
@@ -16,7 +16,7 @@ BuilderComposerPtrs create_builder_and_composer();
 
 proof create_proof(BuilderComposerPtrs pair);
 
-bool verify_proof(BuilderComposerPtrs pair, proof_system::plonk::proof const& proof);
+bool verify_proof(BuilderComposerPtrs pair, bb::plonk::proof const& proof);
 
 void delete_builder_and_composer(BuilderComposerPtrs pair);
 
diff --git a/barretenberg/cpp/src/barretenberg/flavor/ecc_vm.hpp b/barretenberg/cpp/src/barretenberg/flavor/ecc_vm.hpp
index e7ac05b68f43..6af3285b00cf 100644
--- a/barretenberg/cpp/src/barretenberg/flavor/ecc_vm.hpp
+++ b/barretenberg/cpp/src/barretenberg/flavor/ecc_vm.hpp
@@ -26,7 +26,7 @@
 
 // NOLINTBEGIN(cppcoreguidelines-avoid-const-or-ref-data-members)
 
-namespace proof_system::honk {
+namespace bb::honk {
 namespace flavor {
 
 template <typename CycleGroup_T, typename Curve_T, typename PCS_T> class ECCVMBase {
@@ -930,4 +930,4 @@ class ECCVM : public ECCVMBase<bb::g1, curve::Grumpkin, pcs::ipa::IPA<curve::Gru
 // NOLINTEND(cppcoreguidelines-avoid-const-or-ref-data-members)
 
 } // namespace flavor
-} // namespace proof_system::honk
+} // namespace bb::honk
diff --git a/barretenberg/cpp/src/barretenberg/flavor/flavor.hpp b/barretenberg/cpp/src/barretenberg/flavor/flavor.hpp
index e5979a6cd826..3272ed951641 100644
--- a/barretenberg/cpp/src/barretenberg/flavor/flavor.hpp
+++ b/barretenberg/cpp/src/barretenberg/flavor/flavor.hpp
@@ -76,7 +76,7 @@
 #include <concepts>
 #include <vector>
 
-namespace proof_system::honk::flavor {
+namespace bb::honk::flavor {
 
 /**
  * @brief Base class template containing circuit-specifying data.
@@ -255,25 +255,25 @@ template <typename Tuple, std::size_t Index = 0> static constexpr auto create_tu
     }
 }
 
-} // namespace proof_system::honk::flavor
+} // namespace bb::honk::flavor
 
 // Forward declare honk flavors
-namespace proof_system::honk::flavor {
+namespace bb::honk::flavor {
 class Ultra;
 class ECCVM;
 class GoblinUltra;
 template <typename BuilderType> class UltraRecursive_;
-class GoblinUltraRecursive;
-} // namespace proof_system::honk::flavor
+template <typename BuilderType> class GoblinUltraRecursive_;
+} // namespace bb::honk::flavor
 
 // Forward declare plonk flavors
-namespace proof_system::plonk::flavor {
+namespace bb::plonk::flavor {
 class Standard;
 class Ultra;
-} // namespace proof_system::plonk::flavor
+} // namespace bb::plonk::flavor
 
 // Establish concepts for testing flavor attributes
-namespace proof_system {
+namespace bb {
 /**
  * @brief Test whether a type T lies in a list of types ...U.
  *
@@ -293,18 +293,23 @@ concept IsUltraFlavor = IsAnyOf<T, honk::flavor::Ultra, honk::flavor::GoblinUltr
 
 template <typename T> 
 concept IsGoblinFlavor = IsAnyOf<T, honk::flavor::GoblinUltra,
-                                    honk::flavor::GoblinUltraRecursive>;
+                                    honk::flavor::GoblinUltraRecursive_<UltraCircuitBuilder>,
+                                    honk::flavor::GoblinUltraRecursive_<GoblinUltraCircuitBuilder>>;
 
 template <typename T> 
 concept IsRecursiveFlavor = IsAnyOf<T, honk::flavor::UltraRecursive_<UltraCircuitBuilder>, 
                                        honk::flavor::UltraRecursive_<GoblinUltraCircuitBuilder>, 
-                                       honk::flavor::GoblinUltraRecursive>;
+                                       honk::flavor::GoblinUltraRecursive_<UltraCircuitBuilder>,
+                                       honk::flavor::GoblinUltraRecursive_<GoblinUltraCircuitBuilder>>;
 
 template <typename T> concept IsGrumpkinFlavor = IsAnyOf<T, honk::flavor::ECCVM>;
 
-template <typename T> concept IsFoldingFlavor = IsAnyOf<T, honk::flavor::Ultra, honk::flavor::GoblinUltra,honk::flavor::UltraRecursive_<UltraCircuitBuilder>, 
-                                       honk::flavor::UltraRecursive_<GoblinUltraCircuitBuilder>, 
-                                       honk::flavor::GoblinUltraRecursive>;
+template <typename T> concept IsFoldingFlavor = IsAnyOf<T, honk::flavor::Ultra, 
+                                                           honk::flavor::GoblinUltra, 
+                                                           honk::flavor::UltraRecursive_<UltraCircuitBuilder>, 
+                                                           honk::flavor::UltraRecursive_<GoblinUltraCircuitBuilder>, 
+                                                           honk::flavor::GoblinUltraRecursive_<UltraCircuitBuilder>, 
+                                                           honk::flavor::GoblinUltraRecursive_<GoblinUltraCircuitBuilder>>;
 
 template <typename T> concept UltraFlavor = IsAnyOf<T, honk::flavor::Ultra, honk::flavor::GoblinUltra>;
 
@@ -321,4 +326,4 @@ inline std::string flavor_get_label(Container&& container, const Element& elemen
 }
 
 // clang-format on
-} // namespace proof_system
+} // namespace bb
diff --git a/barretenberg/cpp/src/barretenberg/flavor/flavor.test.cpp b/barretenberg/cpp/src/barretenberg/flavor/flavor.test.cpp
index efed36edf11c..3a60a0c810da 100644
--- a/barretenberg/cpp/src/barretenberg/flavor/flavor.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/flavor/flavor.test.cpp
@@ -4,10 +4,10 @@
 #include <cstddef>
 #include <gtest/gtest.h>
 
-namespace proof_system::test_flavor {
+namespace bb::test_flavor {
 TEST(Flavor, Getters)
 {
-    using Flavor = proof_system::honk::flavor::Ultra;
+    using Flavor = bb::honk::flavor::Ultra;
     using FF = Flavor::FF;
     using ProvingKey = typename Flavor::ProvingKey;
 
@@ -42,7 +42,7 @@ TEST(Flavor, Getters)
 
 TEST(Flavor, AllEntitiesSpecialMemberFunctions)
 {
-    using Flavor = proof_system::honk::flavor::Ultra;
+    using Flavor = bb::honk::flavor::Ultra;
     using FF = Flavor::FF;
     using PartiallyEvaluatedMultivariates = Flavor::PartiallyEvaluatedMultivariates;
     using Polynomial = bb::Polynomial<FF>;
@@ -68,7 +68,7 @@ TEST(Flavor, AllEntitiesSpecialMemberFunctions)
 
 TEST(Flavor, GetRow)
 {
-    using Flavor = proof_system::honk::flavor::Ultra;
+    using Flavor = bb::honk::flavor::Ultra;
     using FF = typename Flavor::FF;
     std::array<std::vector<FF>, Flavor::NUM_ALL_ENTITIES> data;
     std::generate(data.begin(), data.end(), []() {
@@ -83,4 +83,4 @@ TEST(Flavor, GetRow)
     EXPECT_EQ(row0.q_elliptic, prover_polynomials.q_elliptic[0]);
     EXPECT_EQ(row1.w_4_shift, prover_polynomials.w_4_shift[1]);
 }
-} // namespace proof_system::test_flavor
+} // namespace bb::test_flavor
diff --git a/barretenberg/cpp/src/barretenberg/flavor/generated/AvmMini_flavor.hpp b/barretenberg/cpp/src/barretenberg/flavor/generated/AvmMini_flavor.hpp
index 6dd48112facc..f0ec7f92ee82 100644
--- a/barretenberg/cpp/src/barretenberg/flavor/generated/AvmMini_flavor.hpp
+++ b/barretenberg/cpp/src/barretenberg/flavor/generated/AvmMini_flavor.hpp
@@ -17,7 +17,7 @@
 #include "barretenberg/relations/generated/AvmMini/mem_trace.hpp"
 #include "barretenberg/transcript/transcript.hpp"
 
-namespace proof_system::honk::flavor {
+namespace bb::honk::flavor {
 
 class AvmMiniFlavor {
   public:
@@ -636,4 +636,4 @@ class AvmMiniFlavor {
     };
 };
 
-} // namespace proof_system::honk::flavor
+} // namespace bb::honk::flavor
diff --git a/barretenberg/cpp/src/barretenberg/flavor/generated/Toy_flavor.hpp b/barretenberg/cpp/src/barretenberg/flavor/generated/Toy_flavor.hpp
index 2be19ce53c97..63554a740639 100644
--- a/barretenberg/cpp/src/barretenberg/flavor/generated/Toy_flavor.hpp
+++ b/barretenberg/cpp/src/barretenberg/flavor/generated/Toy_flavor.hpp
@@ -17,7 +17,7 @@
 #include "barretenberg/relations/generated/Toy/two_column_perm.hpp"
 #include "barretenberg/transcript/transcript.hpp"
 
-namespace proof_system::honk {
+namespace bb::honk {
 namespace flavor {
 
 class ToyFlavor {
@@ -369,4 +369,4 @@ class ToyFlavor {
 };
 
 } // namespace flavor
-} // namespace proof_system::honk
+} // namespace bb::honk
diff --git a/barretenberg/cpp/src/barretenberg/flavor/goblin_translator.hpp b/barretenberg/cpp/src/barretenberg/flavor/goblin_translator.hpp
index d8c27e69b47a..062c0bf48146 100644
--- a/barretenberg/cpp/src/barretenberg/flavor/goblin_translator.hpp
+++ b/barretenberg/cpp/src/barretenberg/flavor/goblin_translator.hpp
@@ -16,7 +16,7 @@
 #include "barretenberg/relations/translator_vm/translator_permutation_relation.hpp"
 #include "relation_definitions.hpp"
 
-namespace proof_system::honk::flavor {
+namespace bb::honk::flavor {
 
 class GoblinTranslator {
 
@@ -1138,4 +1138,4 @@ class GoblinTranslator {
 
     using Transcript = BaseTranscript;
 };
-} // namespace proof_system::honk::flavor
\ No newline at end of file
+} // namespace bb::honk::flavor
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/flavor/goblin_ultra.hpp b/barretenberg/cpp/src/barretenberg/flavor/goblin_ultra.hpp
index 1ab99dd30315..643cbc792045 100644
--- a/barretenberg/cpp/src/barretenberg/flavor/goblin_ultra.hpp
+++ b/barretenberg/cpp/src/barretenberg/flavor/goblin_ultra.hpp
@@ -19,7 +19,7 @@
 #include "barretenberg/transcript/transcript.hpp"
 #include "relation_definitions.hpp"
 
-namespace proof_system::honk::flavor {
+namespace bb::honk::flavor {
 
 class GoblinUltra {
   public:
@@ -46,25 +46,24 @@ class GoblinUltra {
     // The total number of witness entities not including shifts.
     static constexpr size_t NUM_WITNESS_ENTITIES = 14;
 
-    using GrandProductRelations =
-        std::tuple<proof_system::UltraPermutationRelation<FF>, proof_system::LookupRelation<FF>>;
+    using GrandProductRelations = std::tuple<bb::UltraPermutationRelation<FF>, bb::LookupRelation<FF>>;
 
     // define the tuple of Relations that comprise the Sumcheck relation
     // Note: made generic for use in GoblinUltraRecursive.
     template <typename FF>
-    using Relations_ = std::tuple<proof_system::UltraArithmeticRelation<FF>,
-                                  proof_system::UltraPermutationRelation<FF>,
-                                  proof_system::LookupRelation<FF>,
-                                  proof_system::GenPermSortRelation<FF>,
-                                  proof_system::EllipticRelation<FF>,
-                                  proof_system::AuxiliaryRelation<FF>,
-                                  proof_system::EccOpQueueRelation<FF>,
-                                  proof_system::DatabusLookupRelation<FF>,
-                                  proof_system::Poseidon2ExternalRelation<FF>,
-                                  proof_system::Poseidon2InternalRelation<FF>>;
+    using Relations_ = std::tuple<bb::UltraArithmeticRelation<FF>,
+                                  bb::UltraPermutationRelation<FF>,
+                                  bb::LookupRelation<FF>,
+                                  bb::GenPermSortRelation<FF>,
+                                  bb::EllipticRelation<FF>,
+                                  bb::AuxiliaryRelation<FF>,
+                                  bb::EccOpQueueRelation<FF>,
+                                  bb::DatabusLookupRelation<FF>,
+                                  bb::Poseidon2ExternalRelation<FF>,
+                                  bb::Poseidon2InternalRelation<FF>>;
     using Relations = Relations_<FF>;
 
-    using LogDerivLookupRelation = proof_system::DatabusLookupRelation<FF>;
+    using LogDerivLookupRelation = bb::DatabusLookupRelation<FF>;
 
     static constexpr size_t MAX_PARTIAL_RELATION_LENGTH = compute_max_partial_relation_length<Relations>();
     static constexpr size_t MAX_TOTAL_RELATION_LENGTH = compute_max_total_relation_length<Relations>();
@@ -623,4 +622,4 @@ class GoblinUltra {
     using Transcript = Transcript_<Commitment>;
 };
 
-} // namespace proof_system::honk::flavor
+} // namespace bb::honk::flavor
diff --git a/barretenberg/cpp/src/barretenberg/flavor/goblin_ultra_recursive.hpp b/barretenberg/cpp/src/barretenberg/flavor/goblin_ultra_recursive.hpp
index d9f275bf21b6..0a148c338f4c 100644
--- a/barretenberg/cpp/src/barretenberg/flavor/goblin_ultra_recursive.hpp
+++ b/barretenberg/cpp/src/barretenberg/flavor/goblin_ultra_recursive.hpp
@@ -22,7 +22,7 @@
 #include "barretenberg/stdlib/primitives/field/field.hpp"
 #include "barretenberg/stdlib/recursion/honk/transcript/transcript.hpp"
 
-namespace proof_system::honk::flavor {
+namespace bb::honk::flavor {
 
 /**
  * @brief The recursive counterpart to the "native" Goblin Ultra flavor.
@@ -38,14 +38,14 @@ namespace proof_system::honk::flavor {
  *
  * @tparam BuilderType Determines the arithmetization of the verifier circuit defined based on this flavor.
  */
-class GoblinUltraRecursive {
+template <typename BuilderType> class GoblinUltraRecursive_ {
   public:
-    using CircuitBuilder = GoblinUltraCircuitBuilder;
+    using CircuitBuilder = BuilderType; // Determines arithmetization of circuit instantiated with this flavor
     using Curve = plonk::stdlib::bn254<CircuitBuilder>;
-    using GroupElement = Curve::Element;
-    using FF = Curve::ScalarField;
-    using Commitment = Curve::Element;
-    using CommitmentHandle = Curve::Element;
+    using GroupElement = typename Curve::Element;
+    using FF = typename Curve::ScalarField;
+    using Commitment = typename Curve::Element;
+    using CommitmentHandle = typename Curve::Element;
     using NativeVerificationKey = flavor::GoblinUltra::VerificationKey;
 
     // Note(luke): Eventually this may not be needed at all
@@ -166,7 +166,7 @@ class GoblinUltraRecursive {
     // Reuse the VerifierCommitments from GoblinUltra
     using VerifierCommitments = GoblinUltra::VerifierCommitments_<Commitment, VerificationKey>;
     // Reuse the transcript from GoblinUltra
-    using Transcript = proof_system::plonk::stdlib::recursion::honk::Transcript<CircuitBuilder>;
+    using Transcript = bb::plonk::stdlib::recursion::honk::Transcript<CircuitBuilder>;
 };
 
-} // namespace proof_system::honk::flavor
+} // namespace bb::honk::flavor
diff --git a/barretenberg/cpp/src/barretenberg/flavor/plonk_flavors.hpp b/barretenberg/cpp/src/barretenberg/flavor/plonk_flavors.hpp
index 6ecbe0c90e6d..f2c180a593a5 100644
--- a/barretenberg/cpp/src/barretenberg/flavor/plonk_flavors.hpp
+++ b/barretenberg/cpp/src/barretenberg/flavor/plonk_flavors.hpp
@@ -5,10 +5,10 @@
 #include "barretenberg/proof_system/circuit_builder/standard_circuit_builder.hpp"
 #include "barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp"
 
-namespace proof_system::plonk::flavor {
+namespace bb::plonk::flavor {
 class Standard {
   public:
-    using CircuitBuilder = proof_system::StandardCircuitBuilder;
+    using CircuitBuilder = bb::StandardCircuitBuilder;
     using ProvingKey = plonk::proving_key;
     using Curve = curve::BN254;
     using FF = Curve::ScalarField;
@@ -20,7 +20,7 @@ class Standard {
 
 class Ultra {
   public:
-    using CircuitBuilder = proof_system::UltraCircuitBuilder;
+    using CircuitBuilder = bb::UltraCircuitBuilder;
     using ProvingKey = plonk::proving_key;
     using Curve = curve::BN254;
     using FF = Curve::ScalarField;
@@ -151,4 +151,4 @@ class Ultra {
         return output;
     }
 };
-} // namespace proof_system::plonk::flavor
\ No newline at end of file
+} // namespace bb::plonk::flavor
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/flavor/relation_definitions.hpp b/barretenberg/cpp/src/barretenberg/flavor/relation_definitions.hpp
index 347dd9e7abaa..203542d91275 100644
--- a/barretenberg/cpp/src/barretenberg/flavor/relation_definitions.hpp
+++ b/barretenberg/cpp/src/barretenberg/flavor/relation_definitions.hpp
@@ -11,19 +11,17 @@
 #define ACCUMULATE(...) _ACCUMULATE(__VA_ARGS__)
 #define _ACCUMULATE(RelationImpl, Flavor, AccumulatorType, EdgeType)                                                   \
     template void                                                                                                      \
-    RelationImpl<Flavor::FF>::accumulate<proof_system::Relation<RelationImpl<Flavor::FF>>::AccumulatorType,            \
-                                         EdgeType(Flavor)>(                                                            \
-        proof_system::Relation<RelationImpl<Flavor::FF>>::AccumulatorType&,                                            \
+    RelationImpl<Flavor::FF>::accumulate<bb::Relation<RelationImpl<Flavor::FF>>::AccumulatorType, EdgeType(Flavor)>(   \
+        bb::Relation<RelationImpl<Flavor::FF>>::AccumulatorType&,                                                      \
         EdgeType(Flavor) const&,                                                                                       \
         RelationParameters<Flavor::FF> const&,                                                                         \
         Flavor::FF const&);
 
 #define PERMUTATION_METHOD(...) _PERMUTATION_METHOD(__VA_ARGS__)
 #define _PERMUTATION_METHOD(MethodName, RelationImpl, Flavor, AccumulatorType, EdgeType)                               \
-    template typename proof_system::Relation<RelationImpl<Flavor::FF>>::AccumulatorType                                \
-    RelationImpl<Flavor::FF>::MethodName<proof_system::Relation<RelationImpl<Flavor::FF>>::AccumulatorType,            \
-                                         EdgeType(Flavor)>(EdgeType(Flavor) const&,                                    \
-                                                           RelationParameters<Flavor::FF> const&);
+    template typename bb::Relation<RelationImpl<Flavor::FF>>::AccumulatorType                                          \
+    RelationImpl<Flavor::FF>::MethodName<bb::Relation<RelationImpl<Flavor::FF>>::AccumulatorType, EdgeType(Flavor)>(   \
+        EdgeType(Flavor) const&, RelationParameters<Flavor::FF> const&);
 
 #define SUMCHECK_RELATION_CLASS(...) _SUMCHECK_RELATION_CLASS(__VA_ARGS__)
 #define DEFINE_SUMCHECK_RELATION_CLASS(RelationImpl, Flavor)                                                           \
diff --git a/barretenberg/cpp/src/barretenberg/flavor/ultra.hpp b/barretenberg/cpp/src/barretenberg/flavor/ultra.hpp
index e2527750bf6a..3bf08e29b8f4 100644
--- a/barretenberg/cpp/src/barretenberg/flavor/ultra.hpp
+++ b/barretenberg/cpp/src/barretenberg/flavor/ultra.hpp
@@ -16,7 +16,7 @@
 #include "barretenberg/relations/ultra_arithmetic_relation.hpp"
 #include "barretenberg/transcript/transcript.hpp"
 
-namespace proof_system::honk::flavor {
+namespace bb::honk::flavor {
 
 class Ultra {
   public:
@@ -43,15 +43,14 @@ class Ultra {
     // The total number of witness entities not including shifts.
     static constexpr size_t NUM_WITNESS_ENTITIES = 7;
 
-    using GrandProductRelations =
-        std::tuple<proof_system::UltraPermutationRelation<FF>, proof_system::LookupRelation<FF>>;
+    using GrandProductRelations = std::tuple<bb::UltraPermutationRelation<FF>, bb::LookupRelation<FF>>;
     // define the tuple of Relations that comprise the Sumcheck relation
-    using Relations = std::tuple<proof_system::UltraArithmeticRelation<FF>,
-                                 proof_system::UltraPermutationRelation<FF>,
-                                 proof_system::LookupRelation<FF>,
-                                 proof_system::GenPermSortRelation<FF>,
-                                 proof_system::EllipticRelation<FF>,
-                                 proof_system::AuxiliaryRelation<FF>>;
+    using Relations = std::tuple<bb::UltraArithmeticRelation<FF>,
+                                 bb::UltraPermutationRelation<FF>,
+                                 bb::LookupRelation<FF>,
+                                 bb::GenPermSortRelation<FF>,
+                                 bb::EllipticRelation<FF>,
+                                 bb::AuxiliaryRelation<FF>>;
 
     static constexpr size_t MAX_PARTIAL_RELATION_LENGTH = compute_max_partial_relation_length<Relations>();
     static_assert(MAX_PARTIAL_RELATION_LENGTH == 6);
@@ -603,4 +602,4 @@ class Ultra {
     };
 };
 
-} // namespace proof_system::honk::flavor
+} // namespace bb::honk::flavor
diff --git a/barretenberg/cpp/src/barretenberg/flavor/ultra_recursive.hpp b/barretenberg/cpp/src/barretenberg/flavor/ultra_recursive.hpp
index 60cc3e5e2d40..56a385937040 100644
--- a/barretenberg/cpp/src/barretenberg/flavor/ultra_recursive.hpp
+++ b/barretenberg/cpp/src/barretenberg/flavor/ultra_recursive.hpp
@@ -30,7 +30,7 @@
 #include "barretenberg/stdlib/primitives/curves/bn254.hpp"
 #include "barretenberg/stdlib/primitives/field/field.hpp"
 
-namespace proof_system::honk::flavor {
+namespace bb::honk::flavor {
 
 /**
  * @brief The recursive counterpart to the "native" Ultra flavor.
@@ -71,12 +71,12 @@ template <typename BuilderType> class UltraRecursive_ {
     static constexpr size_t NUM_WITNESS_ENTITIES = 7;
 
     // define the tuple of Relations that comprise the Sumcheck relation
-    using Relations = std::tuple<proof_system::UltraArithmeticRelation<FF>,
-                                 proof_system::UltraPermutationRelation<FF>,
-                                 proof_system::LookupRelation<FF>,
-                                 proof_system::GenPermSortRelation<FF>,
-                                 proof_system::EllipticRelation<FF>,
-                                 proof_system::AuxiliaryRelation<FF>>;
+    using Relations = std::tuple<bb::UltraArithmeticRelation<FF>,
+                                 bb::UltraPermutationRelation<FF>,
+                                 bb::LookupRelation<FF>,
+                                 bb::GenPermSortRelation<FF>,
+                                 bb::EllipticRelation<FF>,
+                                 bb::AuxiliaryRelation<FF>>;
 
     static constexpr size_t MAX_PARTIAL_RELATION_LENGTH = compute_max_partial_relation_length<Relations>();
     static_assert(MAX_PARTIAL_RELATION_LENGTH == 6);
@@ -444,7 +444,7 @@ template <typename BuilderType> class UltraRecursive_ {
         }
     };
 
-    using Transcript = proof_system::plonk::stdlib::recursion::honk::Transcript<CircuitBuilder>;
+    using Transcript = bb::plonk::stdlib::recursion::honk::Transcript<CircuitBuilder>;
 };
 
-} // namespace proof_system::honk::flavor
+} // namespace bb::honk::flavor
diff --git a/barretenberg/cpp/src/barretenberg/goblin/full_goblin_recursion.test.cpp b/barretenberg/cpp/src/barretenberg/goblin/full_goblin_recursion.test.cpp
index 1ed235df14b2..088a341e29f5 100644
--- a/barretenberg/cpp/src/barretenberg/goblin/full_goblin_recursion.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/goblin/full_goblin_recursion.test.cpp
@@ -11,7 +11,7 @@
 
 #include <gtest/gtest.h>
 
-using namespace proof_system::honk;
+using namespace bb::honk;
 namespace goblin_recursion_tests {
 
 class GoblinRecursionTests : public ::testing::Test {
@@ -24,7 +24,7 @@ class GoblinRecursionTests : public ::testing::Test {
 
     using Curve = curve::BN254;
     using FF = Curve::ScalarField;
-    using GoblinUltraBuilder = proof_system::GoblinUltraCircuitBuilder;
+    using GoblinUltraBuilder = bb::GoblinUltraCircuitBuilder;
     using KernelInput = Goblin::AccumulationOutput;
 };
 
diff --git a/barretenberg/cpp/src/barretenberg/goblin/goblin.hpp b/barretenberg/cpp/src/barretenberg/goblin/goblin.hpp
index 1d669484f933..c2c685f20209 100644
--- a/barretenberg/cpp/src/barretenberg/goblin/goblin.hpp
+++ b/barretenberg/cpp/src/barretenberg/goblin/goblin.hpp
@@ -12,10 +12,10 @@
 namespace bb {
 
 class Goblin {
-    using HonkProof = proof_system::plonk::proof;
+    using HonkProof = bb::plonk::proof;
 
-    using GUHFlavor = proof_system::honk::flavor::GoblinUltra;
-    using GoblinUltraCircuitBuilder = proof_system::GoblinUltraCircuitBuilder;
+    using GUHFlavor = bb::honk::flavor::GoblinUltra;
+    using GoblinUltraCircuitBuilder = bb::GoblinUltraCircuitBuilder;
 
     using GUHVerificationKey = GUHFlavor::VerificationKey;
     using Commitment = GUHFlavor::Commitment;
@@ -55,19 +55,19 @@ class Goblin {
         }
     };
 
-    using GoblinUltraComposer = proof_system::honk::UltraComposer_<GUHFlavor>;
-    using GoblinUltraVerifier = proof_system::honk::UltraVerifier_<GUHFlavor>;
+    using GoblinUltraComposer = bb::honk::UltraComposer_<GUHFlavor>;
+    using GoblinUltraVerifier = bb::honk::UltraVerifier_<GUHFlavor>;
     using Builder = GoblinUltraCircuitBuilder;
-    using OpQueue = proof_system::ECCOpQueue;
-    using ECCVMFlavor = proof_system::honk::flavor::ECCVM;
-    using ECCVMBuilder = proof_system::ECCVMCircuitBuilder<ECCVMFlavor>;
-    using ECCVMComposer = proof_system::honk::ECCVMComposer;
-    using ECCVMProver = proof_system::honk::ECCVMProver_<ECCVMFlavor>;
-    using TranslatorBuilder = proof_system::GoblinTranslatorCircuitBuilder;
-    using TranslatorComposer = proof_system::honk::GoblinTranslatorComposer;
+    using OpQueue = bb::ECCOpQueue;
+    using ECCVMFlavor = bb::honk::flavor::ECCVM;
+    using ECCVMBuilder = bb::ECCVMCircuitBuilder<ECCVMFlavor>;
+    using ECCVMComposer = bb::honk::ECCVMComposer;
+    using ECCVMProver = bb::honk::ECCVMProver_<ECCVMFlavor>;
+    using TranslatorBuilder = bb::GoblinTranslatorCircuitBuilder;
+    using TranslatorComposer = bb::honk::GoblinTranslatorComposer;
     using RecursiveMergeVerifier =
-        proof_system::plonk::stdlib::recursion::goblin::MergeRecursiveVerifier_<GoblinUltraCircuitBuilder>;
-    using MergeVerifier = proof_system::honk::MergeVerifier_<GUHFlavor>;
+        bb::plonk::stdlib::recursion::goblin::MergeRecursiveVerifier_<GoblinUltraCircuitBuilder>;
+    using MergeVerifier = bb::honk::MergeVerifier_<GUHFlavor>;
 
     std::shared_ptr<OpQueue> op_queue = std::make_shared<OpQueue>();
 
@@ -256,7 +256,7 @@ class Goblin {
     }
 
     // ACIRHACK
-    bool verify_proof([[maybe_unused]] const proof_system::plonk::proof& proof) const
+    bool verify_proof([[maybe_unused]] const bb::plonk::proof& proof) const
     {
         // ACIRHACK: to do this properly, extract the proof correctly or maybe share transcripts.
         const auto extract_final_kernel_proof = [&]([[maybe_unused]] auto& input_proof) { return accumulator.proof; };
diff --git a/barretenberg/cpp/src/barretenberg/goblin/mock_circuits.hpp b/barretenberg/cpp/src/barretenberg/goblin/mock_circuits.hpp
index bd959eeea776..fbbdc2a834d7 100644
--- a/barretenberg/cpp/src/barretenberg/goblin/mock_circuits.hpp
+++ b/barretenberg/cpp/src/barretenberg/goblin/mock_circuits.hpp
@@ -14,12 +14,12 @@ class GoblinMockCircuits {
     using FF = Curve::ScalarField;
     using Fbase = Curve::BaseField;
     using Point = Curve::AffineElement;
-    using CommitmentKey = proof_system::honk::pcs::CommitmentKey<Curve>;
-    using OpQueue = proof_system::ECCOpQueue;
-    using GoblinUltraBuilder = proof_system::GoblinUltraCircuitBuilder;
-    using Flavor = proof_system::honk::flavor::GoblinUltra;
-    using RecursiveFlavor = proof_system::honk::flavor::GoblinUltraRecursive;
-    using RecursiveVerifier = proof_system::plonk::stdlib::recursion::honk::GoblinRecursiveVerifier;
+    using CommitmentKey = bb::honk::pcs::CommitmentKey<Curve>;
+    using OpQueue = bb::ECCOpQueue;
+    using GoblinUltraBuilder = bb::GoblinUltraCircuitBuilder;
+    using Flavor = bb::honk::flavor::GoblinUltra;
+    using RecursiveFlavor = bb::honk::flavor::GoblinUltraRecursive_<GoblinUltraBuilder>;
+    using RecursiveVerifier = bb::plonk::stdlib::recursion::honk::UltraRecursiveVerifier_<RecursiveFlavor>;
     using KernelInput = Goblin::AccumulationOutput;
     static constexpr size_t NUM_OP_QUEUE_COLUMNS = Flavor::NUM_WIRES;
 
@@ -61,10 +61,9 @@ class GoblinMockCircuits {
      *
      * @param op_queue
      */
-    static void perform_op_queue_interactions_for_mock_first_circuit(
-        std::shared_ptr<proof_system::ECCOpQueue>& op_queue)
+    static void perform_op_queue_interactions_for_mock_first_circuit(std::shared_ptr<bb::ECCOpQueue>& op_queue)
     {
-        proof_system::GoblinUltraCircuitBuilder builder{ op_queue };
+        bb::GoblinUltraCircuitBuilder builder{ op_queue };
 
         // Add some goblinized ecc ops
         construct_goblin_ecc_op_circuit(builder);
diff --git a/barretenberg/cpp/src/barretenberg/honk/proof_system/logderivative_library.hpp b/barretenberg/cpp/src/barretenberg/honk/proof_system/logderivative_library.hpp
index 53914202f438..adf3355d6185 100644
--- a/barretenberg/cpp/src/barretenberg/honk/proof_system/logderivative_library.hpp
+++ b/barretenberg/cpp/src/barretenberg/honk/proof_system/logderivative_library.hpp
@@ -1,7 +1,7 @@
 #pragma once
 #include <typeinfo>
 
-namespace proof_system::honk::logderivative_library {
+namespace bb::honk::logderivative_library {
 
 /**
  * @brief Compute the inverse polynomial I(X) required for logderivative lookups
@@ -246,4 +246,4 @@ void accumulate_logderivative_permutation_subrelation_contributions(ContainerOve
     std::get<1>(accumulator) -=
         permutation_relation.template compute_write_term_predicate<Accumulator, 0>(in) * denominator_accumulator[1];
 }
-} // namespace proof_system::honk::logderivative_library
\ No newline at end of file
+} // namespace bb::honk::logderivative_library
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/honk/proof_system/permutation_library.hpp b/barretenberg/cpp/src/barretenberg/honk/proof_system/permutation_library.hpp
index 59572097c7e0..31800d41bb88 100644
--- a/barretenberg/cpp/src/barretenberg/honk/proof_system/permutation_library.hpp
+++ b/barretenberg/cpp/src/barretenberg/honk/proof_system/permutation_library.hpp
@@ -4,7 +4,7 @@
 #include "barretenberg/polynomials/polynomial.hpp"
 #include <typeinfo>
 
-namespace proof_system::honk::permutation_library {
+namespace bb::honk::permutation_library {
 
 /**
  * @brief Compute a permutation grand product polynomial Z_perm(X)
@@ -45,7 +45,7 @@ namespace proof_system::honk::permutation_library {
 template <typename Flavor, typename GrandProdRelation>
 void compute_permutation_grand_product(const size_t circuit_size,
                                        auto& full_polynomials,
-                                       proof_system::RelationParameters<typename Flavor::FF>& relation_parameters)
+                                       bb::RelationParameters<typename Flavor::FF>& relation_parameters)
 {
     using FF = typename Flavor::FF;
     using Polynomial = typename Flavor::Polynomial;
@@ -142,7 +142,7 @@ void compute_permutation_grand_product(const size_t circuit_size,
 template <typename Flavor>
 void compute_permutation_grand_products(std::shared_ptr<typename Flavor::ProvingKey>& key,
                                         typename Flavor::ProverPolynomials& full_polynomials,
-                                        proof_system::RelationParameters<typename Flavor::FF>& relation_parameters)
+                                        bb::RelationParameters<typename Flavor::FF>& relation_parameters)
 {
     using GrandProductRelations = typename Flavor::GrandProductRelations;
     using FF = typename Flavor::FF;
@@ -427,4 +427,4 @@ template <typename Flavor> inline void compute_lagrange_polynomials_for_goblin_t
     proving_key->lagrange_second = lagrange_polynomial_second.share();
 }
 
-} // namespace proof_system::honk::permutation_library
\ No newline at end of file
+} // namespace bb::honk::permutation_library
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/honk/utils/testing.hpp b/barretenberg/cpp/src/barretenberg/honk/utils/testing.hpp
index d0eed0fca88c..69613d673983 100644
--- a/barretenberg/cpp/src/barretenberg/honk/utils/testing.hpp
+++ b/barretenberg/cpp/src/barretenberg/honk/utils/testing.hpp
@@ -2,7 +2,7 @@
 #include "barretenberg/common/zip_view.hpp"
 #include "barretenberg/polynomials/polynomial.hpp"
 
-namespace proof_system::honk {
+namespace bb::honk {
 /**
  * @brief Get a ProverPolynomials instance initialized to sequential values starting at 0.
  * @details Values are assigned according to the order specified in the underlying array of the flavor class. The
@@ -43,4 +43,4 @@ template <typename Flavor> typename Flavor::ProverPolynomials get_zero_prover_po
     return prover_polynomials;
 }
 
-} // namespace proof_system::honk
\ No newline at end of file
+} // namespace bb::honk
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/compute_circuit_data.cpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/compute_circuit_data.cpp
index 5e1e8d2c1eeb..259fedf2199f 100644
--- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/compute_circuit_data.cpp
+++ b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/compute_circuit_data.cpp
@@ -10,9 +10,9 @@ namespace proofs {
 namespace join_split {
 
 using namespace join_split_example::proofs::join_split;
-using namespace proof_system::plonk::stdlib;
+using namespace bb::plonk::stdlib;
 using namespace join_split_example::proofs::notes::native;
-using namespace proof_system::plonk::stdlib::merkle_tree;
+using namespace bb::plonk::stdlib::merkle_tree;
 
 join_split_tx noop_tx()
 {
diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split.cpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split.cpp
index c4c52a1be381..4521a4310eae 100644
--- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split.cpp
+++ b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split.cpp
@@ -8,8 +8,8 @@ namespace join_split_example {
 namespace proofs {
 namespace join_split {
 
-using namespace proof_system::plonk;
-using namespace proof_system::plonk::stdlib::merkle_tree;
+using namespace bb::plonk;
+using namespace bb::plonk::stdlib::merkle_tree;
 
 static std::shared_ptr<plonk::proving_key> proving_key;
 static std::shared_ptr<plonk::verification_key> verification_key;
@@ -49,7 +49,7 @@ void init_verification_key()
     }
 
     verification_key =
-        proof_system::plonk::compute_verification_key_common(proving_key, srs::get_crs_factory()->get_verifier_crs());
+        bb::plonk::compute_verification_key_common(proving_key, srs::get_crs_factory()->get_verifier_crs());
 }
 
 Prover new_join_split_prover(join_split_tx const& tx, bool mock)
diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split.test.cpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split.test.cpp
index 69909b43d2ed..e98b4ca7b1ca 100644
--- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split.test.cpp
@@ -13,7 +13,7 @@
 
 namespace join_split_example::proofs::join_split {
 
-using namespace proof_system::plonk::stdlib::merkle_tree;
+using namespace bb::plonk::stdlib::merkle_tree;
 
 /* Old join-split tests below. The value of having all of these logic tests is unclear, but we'll
    leave them around, at least for a while. */
@@ -26,8 +26,8 @@ constexpr bool CIRCUIT_CHANGE_EXPECTED = false;
 #endif
 
 using namespace bb;
-using namespace proof_system::plonk::stdlib;
-using namespace proof_system::plonk::stdlib::merkle_tree;
+using namespace bb::plonk::stdlib;
+using namespace bb::plonk::stdlib::merkle_tree;
 using namespace join_split_example::proofs::notes::native;
 using key_pair = join_split_example::fixtures::grumpkin_key_pair;
 
diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_circuit.cpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_circuit.cpp
index b0c108b801f9..343e99595ca1 100644
--- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_circuit.cpp
+++ b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_circuit.cpp
@@ -12,9 +12,9 @@ namespace join_split_example {
 namespace proofs {
 namespace join_split {
 
-using namespace proof_system::plonk;
+using namespace bb::plonk;
 using namespace notes::circuit;
-using namespace proof_system::plonk::stdlib::merkle_tree;
+using namespace bb::plonk::stdlib::merkle_tree;
 using namespace crypto::schnorr;
 
 /**
@@ -33,7 +33,7 @@ field_ct process_input_note(field_ct const& account_private_key,
     const bool_ct valid_value = note.value == 0 || is_note_in_use;
     valid_value.assert_equal(true, "padding note non zero");
 
-    const bool_ct exists = proof_system::plonk::stdlib::merkle_tree::check_membership(
+    const bool_ct exists = bb::plonk::stdlib::merkle_tree::check_membership(
         merkle_root, hash_path, note.commitment, index.value.decompose_into_bits(DATA_TREE_DEPTH));
     const bool_ct valid = exists || is_propagated || !is_note_in_use;
     valid.assert_equal(true, "input note not a member");
diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_js_parity.test.cpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_js_parity.test.cpp
index b6a9734e264c..5c08686b9938 100644
--- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_js_parity.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_js_parity.test.cpp
@@ -13,8 +13,8 @@ namespace proofs {
 namespace join_split {
 
 using namespace bb;
-// using namespace proof_system::plonk::stdlib::types;
-using namespace proof_system::plonk::stdlib::merkle_tree;
+// using namespace bb::plonk::stdlib::types;
+using namespace bb::plonk::stdlib::merkle_tree;
 using namespace join_split_example::proofs::notes::native;
 using key_pair = join_split_example::fixtures::grumpkin_key_pair;
 
diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_tx.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_tx.hpp
index 99be198d910f..3665b4e626cd 100644
--- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_tx.hpp
+++ b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_tx.hpp
@@ -17,7 +17,7 @@ struct join_split_tx {
     uint32_t num_input_notes;
     std::array<uint32_t, 2> input_index;
     bb::fr old_data_root;
-    std::array<proof_system::plonk::stdlib::merkle_tree::fr_hash_path, 2> input_path;
+    std::array<bb::plonk::stdlib::merkle_tree::fr_hash_path, 2> input_path;
     std::array<notes::native::value::value_note, 2> input_note;
     std::array<notes::native::value::value_note, 2> output_note;
 
@@ -27,7 +27,7 @@ struct join_split_tx {
     bb::fr alias_hash;
     bool account_required;
     uint32_t account_note_index;
-    proof_system::plonk::stdlib::merkle_tree::fr_hash_path account_note_path;
+    bb::plonk::stdlib::merkle_tree::fr_hash_path account_note_path;
     grumpkin::g1::affine_element signing_pub_key;
 
     bb::fr backward_link; // 0: no link, otherwise: any commitment.
diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/mock/mock_circuit.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/mock/mock_circuit.hpp
index 23e65d902aa4..3cfe9bbf57e8 100644
--- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/mock/mock_circuit.hpp
+++ b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/mock/mock_circuit.hpp
@@ -6,7 +6,7 @@ namespace join_split_example {
 namespace proofs {
 namespace mock {
 
-using namespace proof_system::plonk;
+using namespace bb::plonk;
 
 template <typename Builder> void mock_circuit(Builder& builder, std::vector<bb::fr> const& public_inputs_)
 {
diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/mock/mock_circuit.test.cpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/mock/mock_circuit.test.cpp
index 89a768d17f6b..99343a2a5c43 100644
--- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/mock/mock_circuit.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/mock/mock_circuit.test.cpp
@@ -3,7 +3,7 @@
 #include "barretenberg/common/test.hpp"
 #include "barretenberg/join_split_example/types.hpp"
 
-using namespace proof_system::plonk::stdlib;
+using namespace bb::plonk::stdlib;
 
 namespace rollup {
 namespace proofs {
diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/asset_id.cpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/asset_id.cpp
index c58cb8cf298a..1bdc248a76ba 100644
--- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/asset_id.cpp
+++ b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/asset_id.cpp
@@ -3,7 +3,7 @@
 
 namespace join_split_example::proofs::notes::circuit {
 
-using namespace proof_system::plonk::stdlib;
+using namespace bb::plonk::stdlib;
 
 std::pair<bool_ct, suint_ct> deflag_asset_id(suint_ct const& asset_id)
 {
diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/asset_id.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/asset_id.hpp
index 89e244f39bf6..f7232882545b 100644
--- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/asset_id.hpp
+++ b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/asset_id.hpp
@@ -3,7 +3,7 @@
 
 namespace join_split_example::proofs::notes::circuit {
 
-using namespace proof_system::plonk::stdlib;
+using namespace bb::plonk::stdlib;
 
 std::pair<bool_ct, suint_ct> deflag_asset_id(suint_ct const& asset_id);
 
diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/bridge_call_data.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/bridge_call_data.hpp
index 8617b9641e33..6ab4421cb95c 100644
--- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/bridge_call_data.hpp
+++ b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/bridge_call_data.hpp
@@ -9,7 +9,7 @@ namespace proofs {
 namespace notes {
 namespace circuit {
 
-using namespace proof_system::plonk::stdlib;
+using namespace bb::plonk::stdlib;
 
 constexpr uint32_t input_asset_id_a_shift = DEFI_BRIDGE_ADDRESS_ID_LEN;
 constexpr uint32_t input_asset_id_b_shift = input_asset_id_a_shift + DEFI_BRIDGE_INPUT_A_ASSET_ID_LEN;
diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/claim_note.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/claim_note.hpp
index 1749cffd0cb6..8d4b278ba808 100644
--- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/claim_note.hpp
+++ b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/claim_note.hpp
@@ -13,7 +13,7 @@ namespace notes {
 namespace circuit {
 namespace claim {
 
-using namespace proof_system::plonk::stdlib;
+using namespace bb::plonk::stdlib;
 
 struct partial_claim_note {
     suint_ct deposit_value;
diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/complete_partial_commitment.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/complete_partial_commitment.hpp
index a3d12ee5f6da..0458b8c4fd65 100644
--- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/complete_partial_commitment.hpp
+++ b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/complete_partial_commitment.hpp
@@ -9,7 +9,7 @@ namespace notes {
 namespace circuit {
 namespace claim {
 
-using namespace proof_system::plonk::stdlib;
+using namespace bb::plonk::stdlib;
 
 inline auto complete_partial_commitment(field_ct const& partial_commitment,
                                         field_ct const& interaction_nonce,
diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/witness_data.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/witness_data.hpp
index 725e61b3a3d7..6b2f63076546 100644
--- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/witness_data.hpp
+++ b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/witness_data.hpp
@@ -8,7 +8,7 @@
 
 namespace join_split_example::proofs::notes::circuit::claim {
 
-using namespace proof_system::plonk::stdlib;
+using namespace bb::plonk::stdlib;
 
 /**
  * Convert native claim note data into circuit witness data.
diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/compute_nullifier.cpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/compute_nullifier.cpp
index 440cd4244156..806c5f04987f 100644
--- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/compute_nullifier.cpp
+++ b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/compute_nullifier.cpp
@@ -5,7 +5,7 @@
 namespace join_split_example::proofs::notes::circuit {
 
 using namespace bb;
-using namespace proof_system::plonk::stdlib;
+using namespace bb::plonk::stdlib;
 
 field_ct compute_nullifier(field_ct const& note_commitment,
                            field_ct const& account_private_key,
@@ -40,7 +40,7 @@ field_ct compute_nullifier(field_ct const& note_commitment,
      * eth address.
      */
     auto blake_input = byte_array_ct(hashed_inputs);
-    auto blake_result = proof_system::plonk::stdlib::blake2s(blake_input);
+    auto blake_result = bb::plonk::stdlib::blake2s(blake_input);
     return field_ct(blake_result);
 }
 
diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/value_note.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/value_note.hpp
index 26a635473163..d30908feadad 100644
--- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/value_note.hpp
+++ b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/value_note.hpp
@@ -5,7 +5,7 @@
 
 namespace join_split_example::proofs::notes::circuit::value {
 
-using namespace proof_system::plonk::stdlib;
+using namespace bb::plonk::stdlib;
 
 struct value_note {
     group_ct owner;
diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/value_note.test.cpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/value_note.test.cpp
index d73431384e2a..4d78a764a588 100644
--- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/value_note.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/value_note.test.cpp
@@ -7,7 +7,7 @@
 
 namespace join_split_example {
 using namespace bb;
-using namespace proof_system::plonk::stdlib;
+using namespace bb::plonk::stdlib;
 using namespace join_split_example::proofs::notes;
 using namespace join_split_example::proofs::notes::circuit::value;
 
diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/witness_data.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/witness_data.hpp
index f5afa5ae10d9..f8056266d00e 100644
--- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/witness_data.hpp
+++ b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/witness_data.hpp
@@ -4,7 +4,7 @@
 
 namespace join_split_example::proofs::notes::circuit::value {
 
-using namespace proof_system::plonk::stdlib;
+using namespace bb::plonk::stdlib;
 
 struct witness_data {
     group_ct owner;
diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/types.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/types.hpp
index 2c2672087973..d3e53440f8c6 100644
--- a/barretenberg/cpp/src/barretenberg/join_split_example/types.hpp
+++ b/barretenberg/cpp/src/barretenberg/join_split_example/types.hpp
@@ -17,7 +17,7 @@
 
 namespace join_split_example {
 
-using Builder = proof_system::UltraCircuitBuilder;
+using Builder = bb::UltraCircuitBuilder;
 using Composer = plonk::UltraComposer;
 
 using Prover = std::conditional_t<std::same_as<Composer, plonk::UltraComposer>, plonk::UltraProver, plonk::Prover>;
@@ -25,22 +25,22 @@ using Prover = std::conditional_t<std::same_as<Composer, plonk::UltraComposer>,
 using Verifier =
     std::conditional_t<std::same_as<Composer, plonk::UltraComposer>, plonk::UltraVerifier, plonk::Verifier>;
 
-using witness_ct = proof_system::plonk::stdlib::witness_t<Builder>;
-using public_witness_ct = proof_system::plonk::stdlib::public_witness_t<Builder>;
-using bool_ct = proof_system::plonk::stdlib::bool_t<Builder>;
-using byte_array_ct = proof_system::plonk::stdlib::byte_array<Builder>;
-using field_ct = proof_system::plonk::stdlib::field_t<Builder>;
-using suint_ct = proof_system::plonk::stdlib::safe_uint_t<Builder>;
-using uint32_ct = proof_system::plonk::stdlib::uint32<Builder>;
-using group_ct = proof_system::plonk::stdlib::cycle_group<Builder>;
-using pedersen_commitment = proof_system::plonk::stdlib::pedersen_commitment<Builder>;
-using pedersen_hash = proof_system::plonk::stdlib::pedersen_hash<Builder>;
-using bn254 = proof_system::plonk::stdlib::bn254<Builder>;
+using witness_ct = bb::plonk::stdlib::witness_t<Builder>;
+using public_witness_ct = bb::plonk::stdlib::public_witness_t<Builder>;
+using bool_ct = bb::plonk::stdlib::bool_t<Builder>;
+using byte_array_ct = bb::plonk::stdlib::byte_array<Builder>;
+using field_ct = bb::plonk::stdlib::field_t<Builder>;
+using suint_ct = bb::plonk::stdlib::safe_uint_t<Builder>;
+using uint32_ct = bb::plonk::stdlib::uint32<Builder>;
+using group_ct = bb::plonk::stdlib::cycle_group<Builder>;
+using pedersen_commitment = bb::plonk::stdlib::pedersen_commitment<Builder>;
+using pedersen_hash = bb::plonk::stdlib::pedersen_hash<Builder>;
+using bn254 = bb::plonk::stdlib::bn254<Builder>;
 
-using hash_path_ct = proof_system::plonk::stdlib::merkle_tree::hash_path<Builder>;
+using hash_path_ct = bb::plonk::stdlib::merkle_tree::hash_path<Builder>;
 
 namespace schnorr {
-using signature_bits = proof_system::plonk::stdlib::schnorr::signature_bits<Builder>;
+using signature_bits = bb::plonk::stdlib::schnorr::signature_bits<Builder>;
 } // namespace schnorr
 
 } // namespace join_split_example
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/plonk/composer/composer_lib.cpp b/barretenberg/cpp/src/barretenberg/plonk/composer/composer_lib.cpp
index 7adf8861e956..21cc5dabe460 100644
--- a/barretenberg/cpp/src/barretenberg/plonk/composer/composer_lib.cpp
+++ b/barretenberg/cpp/src/barretenberg/plonk/composer/composer_lib.cpp
@@ -6,7 +6,7 @@
 #include "barretenberg/commitment_schemes/commitment_key.hpp"
 #include "barretenberg/srs/factories/crs_factory.hpp"
 
-namespace proof_system::plonk {
+namespace bb::plonk {
 
 /**
  * @brief Retrieve lagrange forms of selector polynomials and compute monomial and coset-monomial forms and put into
@@ -71,9 +71,9 @@ std::shared_ptr<plonk::verification_key> compute_verification_key_common(
     }
 
     // Set the polynomial manifest in verification key.
-    circuit_verification_key->polynomial_manifest = proof_system::plonk::PolynomialManifest(proving_key->circuit_type);
+    circuit_verification_key->polynomial_manifest = bb::plonk::PolynomialManifest(proving_key->circuit_type);
 
     return circuit_verification_key;
 }
 
-} // namespace proof_system::plonk
+} // namespace bb::plonk
diff --git a/barretenberg/cpp/src/barretenberg/plonk/composer/composer_lib.hpp b/barretenberg/cpp/src/barretenberg/plonk/composer/composer_lib.hpp
index 74b060cfaebc..e34e8ba86545 100644
--- a/barretenberg/cpp/src/barretenberg/plonk/composer/composer_lib.hpp
+++ b/barretenberg/cpp/src/barretenberg/plonk/composer/composer_lib.hpp
@@ -3,7 +3,7 @@
 #include "barretenberg/plonk/proof_system/proving_key/proving_key.hpp"
 #include "barretenberg/plonk/proof_system/verification_key/verification_key.hpp"
 
-namespace proof_system::plonk {
+namespace bb::plonk {
 struct SelectorProperties {
     std::string name;
     // TODO: does the prover need the raw lagrange-base selector values?
@@ -81,4 +81,4 @@ std::shared_ptr<plonk::verification_key> compute_verification_key_common(
     // silencing for now but need to figure out where to extract type of VerifierCrs from :-/
     std::shared_ptr<bb::srs::factories::VerifierCrs<curve::BN254>> const& vrs);
 
-} // namespace proof_system::plonk
+} // namespace bb::plonk
diff --git a/barretenberg/cpp/src/barretenberg/plonk/composer/standard_composer.cpp b/barretenberg/cpp/src/barretenberg/plonk/composer/standard_composer.cpp
index cc0c73577cf9..16aab4bce43f 100644
--- a/barretenberg/cpp/src/barretenberg/plonk/composer/standard_composer.cpp
+++ b/barretenberg/cpp/src/barretenberg/plonk/composer/standard_composer.cpp
@@ -12,7 +12,7 @@
 #include <cstdint>
 #include <string>
 
-namespace proof_system::plonk {
+namespace bb::plonk {
 
 /**
  * Compute witness polynomials (w_1, w_2, w_3, w_4).
@@ -169,4 +169,4 @@ plonk::Prover StandardComposer::create_prover(const CircuitBuilder& circuit_cons
     return output_state;
 }
 
-} // namespace proof_system::plonk
+} // namespace bb::plonk
diff --git a/barretenberg/cpp/src/barretenberg/plonk/composer/standard_composer.hpp b/barretenberg/cpp/src/barretenberg/plonk/composer/standard_composer.hpp
index 836da4eba12f..3961a59bc606 100644
--- a/barretenberg/cpp/src/barretenberg/plonk/composer/standard_composer.hpp
+++ b/barretenberg/cpp/src/barretenberg/plonk/composer/standard_composer.hpp
@@ -10,7 +10,7 @@
 #include "barretenberg/srs/factories/file_crs_factory.hpp"
 #include <utility>
 
-namespace proof_system::plonk {
+namespace bb::plonk {
 class StandardComposer {
   public:
     using Flavor = plonk::flavor::Standard;
@@ -153,4 +153,4 @@ class StandardComposer {
     }
 };
 
-} // namespace proof_system::plonk
+} // namespace bb::plonk
diff --git a/barretenberg/cpp/src/barretenberg/plonk/composer/standard_composer.test.cpp b/barretenberg/cpp/src/barretenberg/plonk/composer/standard_composer.test.cpp
index 4e02ca4e689e..e99f9a2144c6 100644
--- a/barretenberg/cpp/src/barretenberg/plonk/composer/standard_composer.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/plonk/composer/standard_composer.test.cpp
@@ -6,8 +6,8 @@
 #include <gtest/gtest.h>
 
 using namespace bb;
-using namespace proof_system;
-using namespace proof_system::plonk;
+using namespace bb;
+using namespace bb::plonk;
 
 namespace {
 auto& engine = numeric::random::get_debug_engine();
diff --git a/barretenberg/cpp/src/barretenberg/plonk/composer/ultra_composer.cpp b/barretenberg/cpp/src/barretenberg/plonk/composer/ultra_composer.cpp
index d83c9706eff3..d293f509d4fa 100644
--- a/barretenberg/cpp/src/barretenberg/plonk/composer/ultra_composer.cpp
+++ b/barretenberg/cpp/src/barretenberg/plonk/composer/ultra_composer.cpp
@@ -11,7 +11,7 @@
 #include <cstdint>
 #include <string>
 
-namespace proof_system::plonk {
+namespace bb::plonk {
 
 /**
  * @brief Computes `this.witness`, which is basiclly a set of polynomials mapped-to by strings.
@@ -516,4 +516,4 @@ void UltraComposer::add_table_column_selector_poly_to_proving_key(polynomial& se
     circuit_proving_key->polynomial_store.put(tag + "_fft", std::move(selector_poly_coset_form));
 }
 
-} // namespace proof_system::plonk
+} // namespace bb::plonk
diff --git a/barretenberg/cpp/src/barretenberg/plonk/composer/ultra_composer.hpp b/barretenberg/cpp/src/barretenberg/plonk/composer/ultra_composer.hpp
index 2570f2239526..e95888e9f521 100644
--- a/barretenberg/cpp/src/barretenberg/plonk/composer/ultra_composer.hpp
+++ b/barretenberg/cpp/src/barretenberg/plonk/composer/ultra_composer.hpp
@@ -12,7 +12,7 @@
 #include <cstddef>
 #include <utility>
 
-namespace proof_system::plonk {
+namespace bb::plonk {
 class UltraComposer {
   public:
     using Flavor = flavor::Ultra;
@@ -97,4 +97,4 @@ class UltraComposer {
     }
 };
 
-} // namespace proof_system::plonk
+} // namespace bb::plonk
diff --git a/barretenberg/cpp/src/barretenberg/plonk/composer/ultra_composer.test.cpp b/barretenberg/cpp/src/barretenberg/plonk/composer/ultra_composer.test.cpp
index 81b6eabdcc3a..0a5dea87edcb 100644
--- a/barretenberg/cpp/src/barretenberg/plonk/composer/ultra_composer.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/plonk/composer/ultra_composer.test.cpp
@@ -10,10 +10,10 @@
 #include "barretenberg/stdlib/primitives/plookup/plookup.hpp"
 
 using namespace bb;
-using namespace proof_system;
-using namespace proof_system::plonk;
+using namespace bb;
+using namespace bb::plonk;
 
-namespace proof_system::plonk::test_ultra_plonk_composer {
+namespace bb::plonk::test_ultra_plonk_composer {
 
 namespace {
 auto& engine = numeric::random::get_debug_engine();
@@ -66,7 +66,7 @@ TYPED_TEST_SUITE(ultra_plonk_composer, BooleanTypes);
 
 TYPED_TEST(ultra_plonk_composer, create_gates_from_plookup_accumulators)
 {
-    auto circuit_builder = proof_system::UltraCircuitBuilder();
+    auto circuit_builder = bb::UltraCircuitBuilder();
     auto composer = UltraComposer();
 
     bb::fr input_value = fr::random_element();
@@ -647,7 +647,7 @@ TYPED_TEST(ultra_plonk_composer, non_native_field_multiplication)
     const auto q_indices = get_limb_witness_indices(split_into_limbs(uint256_t(q)));
     const auto r_indices = get_limb_witness_indices(split_into_limbs(uint256_t(r)));
 
-    proof_system::non_native_field_witnesses<fr> inputs{
+    bb::non_native_field_witnesses<fr> inputs{
         a_indices, b_indices, q_indices, r_indices, modulus_limbs, fr(uint256_t(modulus)),
     };
     const auto [lo_1_idx, hi_1_idx] = builder.evaluate_non_native_field_multiplication(inputs);
@@ -824,4 +824,4 @@ TEST(ultra_plonk_composer, range_constraint_small_variable)
     EXPECT_EQ(result, true);
 }
 
-} // namespace proof_system::plonk::test_ultra_plonk_composer
+} // namespace bb::plonk::test_ultra_plonk_composer
diff --git a/barretenberg/cpp/src/barretenberg/plonk/proof_system/commitment_scheme/commitment_scheme.hpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/commitment_scheme/commitment_scheme.hpp
index d113e597f436..800af9d672d4 100644
--- a/barretenberg/cpp/src/barretenberg/plonk/proof_system/commitment_scheme/commitment_scheme.hpp
+++ b/barretenberg/cpp/src/barretenberg/plonk/proof_system/commitment_scheme/commitment_scheme.hpp
@@ -5,7 +5,7 @@
 #include "../types/program_settings.hpp"
 #include "barretenberg/plonk/work_queue/work_queue.hpp"
 
-namespace proof_system::plonk {
+namespace bb::plonk {
 
 class CommitmentScheme {
   public:
@@ -45,4 +45,4 @@ class CommitmentScheme {
                                                        bool in_lagrange_form = false) = 0;
 };
 
-} // namespace proof_system::plonk
+} // namespace bb::plonk
diff --git a/barretenberg/cpp/src/barretenberg/plonk/proof_system/commitment_scheme/commitment_scheme.test.cpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/commitment_scheme/commitment_scheme.test.cpp
index 0ed872d19b3c..bd446e47c10c 100644
--- a/barretenberg/cpp/src/barretenberg/plonk/proof_system/commitment_scheme/commitment_scheme.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/plonk/proof_system/commitment_scheme/commitment_scheme.test.cpp
@@ -15,7 +15,7 @@
 #include "barretenberg/ecc/curves/bn254/pairing.hpp"
 
 using namespace bb;
-using namespace proof_system::plonk;
+using namespace bb::plonk;
 
 TEST(commitment_scheme, kate_open)
 {
diff --git a/barretenberg/cpp/src/barretenberg/plonk/proof_system/commitment_scheme/kate_commitment_scheme.cpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/commitment_scheme/kate_commitment_scheme.cpp
index 4c905d4c0a3c..9257756e9249 100644
--- a/barretenberg/cpp/src/barretenberg/plonk/proof_system/commitment_scheme/kate_commitment_scheme.cpp
+++ b/barretenberg/cpp/src/barretenberg/plonk/proof_system/commitment_scheme/kate_commitment_scheme.cpp
@@ -2,7 +2,7 @@
 #include "../../../polynomials/polynomial_arithmetic.hpp"
 #include "barretenberg/common/throw_or_abort.hpp"
 
-namespace proof_system::plonk {
+namespace bb::plonk {
 
 // Constructors for KateCommitmentScheme
 template <typename settings>
@@ -391,4 +391,4 @@ template class KateCommitmentScheme<standard_settings>;
 template class KateCommitmentScheme<ultra_settings>;
 template class KateCommitmentScheme<ultra_to_standard_settings>;
 template class KateCommitmentScheme<ultra_with_keccak_settings>;
-} // namespace proof_system::plonk
+} // namespace bb::plonk
diff --git a/barretenberg/cpp/src/barretenberg/plonk/proof_system/commitment_scheme/kate_commitment_scheme.hpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/commitment_scheme/kate_commitment_scheme.hpp
index 58a9dd120e00..0ec4c34f08c5 100644
--- a/barretenberg/cpp/src/barretenberg/plonk/proof_system/commitment_scheme/kate_commitment_scheme.hpp
+++ b/barretenberg/cpp/src/barretenberg/plonk/proof_system/commitment_scheme/kate_commitment_scheme.hpp
@@ -1,7 +1,7 @@
 #pragma once
 #include "commitment_scheme.hpp"
 
-namespace proof_system::plonk {
+namespace bb::plonk {
 
 template <typename settings> class KateCommitmentScheme : public CommitmentScheme {
   public:
@@ -39,4 +39,4 @@ template <typename settings> class KateCommitmentScheme : public CommitmentSchem
     plonk::commitment_open_proof kate_open_proof;
 };
 
-} // namespace proof_system::plonk
+} // namespace bb::plonk
diff --git a/barretenberg/cpp/src/barretenberg/plonk/proof_system/constants.hpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/constants.hpp
index ac2ee70fec37..86e3f688e981 100644
--- a/barretenberg/cpp/src/barretenberg/plonk/proof_system/constants.hpp
+++ b/barretenberg/cpp/src/barretenberg/plonk/proof_system/constants.hpp
@@ -1,10 +1,10 @@
 #pragma once
 #include <cstdint>
 
-namespace proof_system::plonk {
+namespace bb::plonk {
 
 // limb size when simulating a non-native field using bigfield class
 // (needs to be a universal constant to be used by native verifier)
 static constexpr uint64_t NUM_LIMB_BITS_IN_FIELD_SIMULATION = 68;
 static constexpr uint32_t NUM_QUOTIENT_PARTS = 4;
-} // namespace proof_system::plonk
+} // namespace bb::plonk
diff --git a/barretenberg/cpp/src/barretenberg/plonk/proof_system/prover/prover.cpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/prover/prover.cpp
index 9a6588f2716d..07a0dadbf2c9 100644
--- a/barretenberg/cpp/src/barretenberg/plonk/proof_system/prover/prover.cpp
+++ b/barretenberg/cpp/src/barretenberg/plonk/proof_system/prover/prover.cpp
@@ -9,7 +9,7 @@
 
 using namespace bb;
 
-namespace proof_system::plonk {
+namespace bb::plonk {
 
 /**
  * Create ProverBase from proving key, witness and manifest.
@@ -397,7 +397,7 @@ template <typename settings> void ProverBase<settings>::execute_fourth_round()
     add_blinding_to_quotient_polynomial_parts();
 
     compute_quotient_commitments();
-} // namespace proof_system::plonk
+} // namespace bb::plonk
 
 template <typename settings> void ProverBase<settings>::execute_fifth_round()
 {
@@ -577,4 +577,4 @@ template class ProverBase<ultra_settings>;
 template class ProverBase<ultra_to_standard_settings>;
 template class ProverBase<ultra_with_keccak_settings>;
 
-} // namespace proof_system::plonk
+} // namespace bb::plonk
diff --git a/barretenberg/cpp/src/barretenberg/plonk/proof_system/prover/prover.hpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/prover/prover.hpp
index a37377310552..7f01159e95c6 100644
--- a/barretenberg/cpp/src/barretenberg/plonk/proof_system/prover/prover.hpp
+++ b/barretenberg/cpp/src/barretenberg/plonk/proof_system/prover/prover.hpp
@@ -7,7 +7,7 @@
 #include "barretenberg/plonk/proof_system/proving_key/proving_key.hpp"
 #include "barretenberg/plonk/work_queue/work_queue.hpp"
 
-namespace proof_system::plonk {
+namespace bb::plonk {
 
 template <typename settings> class ProverBase {
 
@@ -106,4 +106,4 @@ typedef ProverBase<ultra_settings> UltraProver; // TODO(Mike): maybe just return
 typedef ProverBase<ultra_to_standard_settings> UltraToStandardProver;
 typedef ProverBase<ultra_with_keccak_settings> UltraWithKeccakProver;
 
-} // namespace proof_system::plonk
+} // namespace bb::plonk
diff --git a/barretenberg/cpp/src/barretenberg/plonk/proof_system/prover/prover.test.cpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/prover/prover.test.cpp
index e7e4214cd12f..f7b92b5bdafe 100644
--- a/barretenberg/cpp/src/barretenberg/plonk/proof_system/prover/prover.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/plonk/proof_system/prover/prover.test.cpp
@@ -66,7 +66,7 @@ sigma_3 = [39, 23, 4, 40, 41, 25, 33, 36, 37, 42, 43, 44, 45, 46, 47, 48]
 ```
 */
 using namespace bb;
-using namespace proof_system::plonk;
+using namespace bb::plonk;
 
 namespace prover_helpers {
 
diff --git a/barretenberg/cpp/src/barretenberg/plonk/proof_system/proving_key/proving_key.cpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/proving_key/proving_key.cpp
index 37785c62f6fb..a1ce93f77337 100644
--- a/barretenberg/cpp/src/barretenberg/plonk/proof_system/proving_key/proving_key.cpp
+++ b/barretenberg/cpp/src/barretenberg/plonk/proof_system/proving_key/proving_key.cpp
@@ -3,7 +3,7 @@
 #include "barretenberg/numeric/bitop/get_msb.hpp"
 #include "barretenberg/polynomials/polynomial_arithmetic.hpp"
 
-namespace proof_system::plonk {
+namespace bb::plonk {
 
 // In all the constructors below, the pippenger_runtime_state takes (n + 1) as the input
 // as the degree of t_{high}(X) is (n + 1) for standard plonk. Refer to
@@ -88,4 +88,4 @@ void proving_key::init()
     memset((void*)&quotient_polynomial_parts[3][0], 0x00, sizeof(bb::fr) * circuit_size);
 }
 
-} // namespace proof_system::plonk
+} // namespace bb::plonk
diff --git a/barretenberg/cpp/src/barretenberg/plonk/proof_system/proving_key/proving_key.hpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/proving_key/proving_key.hpp
index 1c851bd33866..13d8c80b3c5a 100644
--- a/barretenberg/cpp/src/barretenberg/plonk/proof_system/proving_key/proving_key.hpp
+++ b/barretenberg/cpp/src/barretenberg/plonk/proof_system/proving_key/proving_key.hpp
@@ -17,7 +17,7 @@
 #include "barretenberg/proof_system/polynomial_store/polynomial_store.hpp"
 #endif
 
-namespace proof_system::plonk {
+namespace bb::plonk {
 
 struct proving_key_data {
     uint32_t circuit_type;
@@ -84,4 +84,4 @@ struct proving_key {
     static constexpr size_t min_thread_block = 4UL;
 };
 
-} // namespace proof_system::plonk
+} // namespace bb::plonk
diff --git a/barretenberg/cpp/src/barretenberg/plonk/proof_system/proving_key/proving_key.test.cpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/proving_key/proving_key.test.cpp
index 47a2ba92eb33..9353566f712d 100644
--- a/barretenberg/cpp/src/barretenberg/plonk/proof_system/proving_key/proving_key.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/plonk/proof_system/proving_key/proving_key.test.cpp
@@ -12,8 +12,8 @@
 #endif
 
 using namespace bb;
-using namespace proof_system;
-using namespace proof_system::plonk;
+using namespace bb;
+using namespace bb::plonk;
 
 // Test proving key serialization/deserialization to/from buffer
 TEST(proving_key, proving_key_from_serialized_key)
diff --git a/barretenberg/cpp/src/barretenberg/plonk/proof_system/proving_key/serialize.hpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/proving_key/serialize.hpp
index 06ab405c1687..5900997677d8 100644
--- a/barretenberg/cpp/src/barretenberg/plonk/proof_system/proving_key/serialize.hpp
+++ b/barretenberg/cpp/src/barretenberg/plonk/proof_system/proving_key/serialize.hpp
@@ -8,7 +8,7 @@
 #include <ios>
 #include <sys/stat.h>
 
-namespace proof_system::plonk {
+namespace bb::plonk {
 
 // Read the pre-computed polynomials
 template <typename B> inline void read(B& any, proving_key_data& key)
@@ -138,4 +138,4 @@ template <typename B> inline void write_to_file(B& os, std::string const& path,
     write(os, key.memory_write_records);
 }
 
-} // namespace proof_system::plonk
+} // namespace bb::plonk
diff --git a/barretenberg/cpp/src/barretenberg/plonk/proof_system/public_inputs/public_inputs.hpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/public_inputs/public_inputs.hpp
index 13b9effd29f0..de3db783a5ee 100644
--- a/barretenberg/cpp/src/barretenberg/plonk/proof_system/public_inputs/public_inputs.hpp
+++ b/barretenberg/cpp/src/barretenberg/plonk/proof_system/public_inputs/public_inputs.hpp
@@ -2,7 +2,7 @@
 #include "barretenberg/ecc/curves/bn254/fr.hpp"
 #include <vector>
 
-namespace proof_system::plonk {
+namespace bb::plonk {
 template <typename Field>
 Field compute_public_input_delta(const std::vector<Field>& inputs,
                                  const Field& beta,
diff --git a/barretenberg/cpp/src/barretenberg/plonk/proof_system/public_inputs/public_inputs.test.cpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/public_inputs/public_inputs.test.cpp
index 011659978964..9e9923a02204 100644
--- a/barretenberg/cpp/src/barretenberg/plonk/proof_system/public_inputs/public_inputs.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/plonk/proof_system/public_inputs/public_inputs.test.cpp
@@ -61,7 +61,7 @@ sigma_3 = [39, 23, 4, 40, 41, 25, 33, 36, 37, 42, 43, 44, 45, 46, 47, 48]
 ```
 */
 using namespace bb;
-using namespace proof_system::plonk;
+using namespace bb::plonk;
 
 namespace {
 
@@ -138,7 +138,7 @@ TEST(test_public_inputs, compute_delta)
     for (size_t i = 0; i < num_public_inputs; ++i) {
         public_inputs.push_back(left[i]);
     }
-    fr target_delta = proof_system::plonk::compute_public_input_delta<fr>(public_inputs, beta, gamma, domain.root);
+    fr target_delta = bb::plonk::compute_public_input_delta<fr>(public_inputs, beta, gamma, domain.root);
 
     EXPECT_EQ((modified_result == target_delta), true);
 }
diff --git a/barretenberg/cpp/src/barretenberg/plonk/proof_system/public_inputs/public_inputs_impl.hpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/public_inputs/public_inputs_impl.hpp
index cb28bca3c428..013b9c99f117 100644
--- a/barretenberg/cpp/src/barretenberg/plonk/proof_system/public_inputs/public_inputs_impl.hpp
+++ b/barretenberg/cpp/src/barretenberg/plonk/proof_system/public_inputs/public_inputs_impl.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-namespace proof_system::plonk {
+namespace bb::plonk {
 
 /**
  * Public inputs!
@@ -137,4 +137,4 @@ Field compute_public_input_delta(const std::vector<Field>& public_inputs,
     T0 = numerator / denominator;
     return T0;
 }
-} // namespace proof_system::plonk
\ No newline at end of file
+} // namespace bb::plonk
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/plonk/proof_system/types/commitment_open_proof.hpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/types/commitment_open_proof.hpp
index e35951dc9b05..00728d23e54c 100644
--- a/barretenberg/cpp/src/barretenberg/plonk/proof_system/types/commitment_open_proof.hpp
+++ b/barretenberg/cpp/src/barretenberg/plonk/proof_system/types/commitment_open_proof.hpp
@@ -3,10 +3,10 @@
 #include <cstdint>
 #include <vector>
 
-namespace proof_system::plonk {
+namespace bb::plonk {
 
 struct commitment_open_proof {
     std::vector<uint8_t> proof_data;
 };
 
-} // namespace proof_system::plonk
+} // namespace bb::plonk
diff --git a/barretenberg/cpp/src/barretenberg/plonk/proof_system/types/polynomial_manifest.hpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/types/polynomial_manifest.hpp
index be4a634883f4..4f51a58ad17e 100644
--- a/barretenberg/cpp/src/barretenberg/plonk/proof_system/types/polynomial_manifest.hpp
+++ b/barretenberg/cpp/src/barretenberg/plonk/proof_system/types/polynomial_manifest.hpp
@@ -5,7 +5,7 @@
 #include <string>
 #include <vector>
 
-namespace proof_system::plonk {
+namespace bb::plonk {
 
 enum PolynomialSource { WITNESS, SELECTOR, PERMUTATION, OTHER };
 
@@ -224,4 +224,4 @@ class PrecomputedPolyList {
     std::string operator[](size_t index) const { return precomputed_poly_ids[index]; }
 };
 
-} // namespace proof_system::plonk
\ No newline at end of file
+} // namespace bb::plonk
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/plonk/proof_system/types/program_settings.hpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/types/program_settings.hpp
index 190a1c28944b..677d336e0fc4 100644
--- a/barretenberg/cpp/src/barretenberg/plonk/proof_system/types/program_settings.hpp
+++ b/barretenberg/cpp/src/barretenberg/plonk/proof_system/types/program_settings.hpp
@@ -13,7 +13,7 @@
 #include "./prover_settings.hpp"
 #include "barretenberg/plonk/transcript/transcript.hpp"
 
-namespace proof_system::plonk {
+namespace bb::plonk {
 
 class standard_verifier_settings : public standard_settings {
   public:
@@ -137,4 +137,4 @@ class ultra_with_keccak_verifier_settings : public ultra_verifier_settings {
     static constexpr size_t num_challenge_bytes = 32;
     static constexpr transcript::HashType hash_type = transcript::HashType::Keccak256;
 };
-} // namespace proof_system::plonk
+} // namespace bb::plonk
diff --git a/barretenberg/cpp/src/barretenberg/plonk/proof_system/types/proof.hpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/types/proof.hpp
index 9ac63d39d63c..f9632f1185fe 100644
--- a/barretenberg/cpp/src/barretenberg/plonk/proof_system/types/proof.hpp
+++ b/barretenberg/cpp/src/barretenberg/plonk/proof_system/types/proof.hpp
@@ -6,7 +6,7 @@
 #include <ostream>
 #include <vector>
 
-namespace proof_system::plonk {
+namespace bb::plonk {
 
 struct proof {
     std::vector<uint8_t> proof_data;
@@ -45,4 +45,4 @@ inline std::ostream& operator<<(std::ostream& os, proof const& data)
     return os;
 }
 
-} // namespace proof_system::plonk
+} // namespace bb::plonk
diff --git a/barretenberg/cpp/src/barretenberg/plonk/proof_system/types/prover_settings.hpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/types/prover_settings.hpp
index c76edca4a372..eaf863a1c7bf 100644
--- a/barretenberg/cpp/src/barretenberg/plonk/proof_system/types/prover_settings.hpp
+++ b/barretenberg/cpp/src/barretenberg/plonk/proof_system/types/prover_settings.hpp
@@ -1,7 +1,7 @@
 #pragma once
 #include "barretenberg/proof_system/arithmetization/arithmetization.hpp"
 #include "barretenberg/transcript/transcript.hpp"
-namespace proof_system::plonk {
+namespace bb::plonk {
 class settings_base {
   public:
     static constexpr bool requires_shifted_wire(const uint64_t wire_shift_settings, const uint64_t wire_index)
@@ -52,4 +52,4 @@ class ultra_with_keccak_settings : public ultra_settings {
     static constexpr transcript::HashType hash_type = transcript::HashType::Keccak256;
 };
 
-} // namespace proof_system::plonk
+} // namespace bb::plonk
diff --git a/barretenberg/cpp/src/barretenberg/plonk/proof_system/utils/generalized_permutation.hpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/utils/generalized_permutation.hpp
index 22c542553234..eeb09526502f 100644
--- a/barretenberg/cpp/src/barretenberg/plonk/proof_system/utils/generalized_permutation.hpp
+++ b/barretenberg/cpp/src/barretenberg/plonk/proof_system/utils/generalized_permutation.hpp
@@ -3,7 +3,7 @@
 #include "barretenberg/polynomials/iterate_over_domain.hpp"
 #include "barretenberg/polynomials/polynomial.hpp"
 
-namespace proof_system::plonk {
+namespace bb::plonk {
 template <typename program_settings>
 inline void compute_gen_permutation_lagrange_base_single(bb::polynomial& output,
                                                          const std::vector<uint32_t>& permutation,
@@ -63,4 +63,4 @@ inline void compute_gen_permutation_lagrange_base_single(bb::polynomial& output,
     }
     ITERATE_OVER_DOMAIN_END;
 }
-} // namespace proof_system::plonk
+} // namespace bb::plonk
diff --git a/barretenberg/cpp/src/barretenberg/plonk/proof_system/utils/kate_verification.hpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/utils/kate_verification.hpp
index fe40c41f2029..a04497e55b1b 100644
--- a/barretenberg/cpp/src/barretenberg/plonk/proof_system/utils/kate_verification.hpp
+++ b/barretenberg/cpp/src/barretenberg/plonk/proof_system/utils/kate_verification.hpp
@@ -3,7 +3,7 @@
 #include "barretenberg/plonk/proof_system/verification_key/verification_key.hpp"
 #include <map>
 
-namespace proof_system::plonk {
+namespace bb::plonk {
 
 template <typename Field, typename Transcript, typename program_settings>
 Field compute_kate_batch_evaluation(typename Transcript::Key* key, const Transcript& transcript)
@@ -106,4 +106,4 @@ void populate_kate_element_map(verification_key* key,
     }
 }
 
-} // namespace proof_system::plonk
\ No newline at end of file
+} // namespace bb::plonk
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/plonk/proof_system/utils/permutation.hpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/utils/permutation.hpp
index b947971dfbac..ad50503df8dc 100644
--- a/barretenberg/cpp/src/barretenberg/plonk/proof_system/utils/permutation.hpp
+++ b/barretenberg/cpp/src/barretenberg/plonk/proof_system/utils/permutation.hpp
@@ -5,7 +5,7 @@
 #include "barretenberg/polynomials/iterate_over_domain.hpp"
 #include "barretenberg/polynomials/polynomial.hpp"
 
-namespace proof_system::plonk {
+namespace bb::plonk {
 
 struct permutation_subgroup_element {
     uint32_t subgroup_index = 0;
@@ -108,4 +108,4 @@ inline void compute_permutation_lagrange_base_single(bb::polynomial& output,
     }
     ITERATE_OVER_DOMAIN_END;
 }
-} // namespace proof_system::plonk
+} // namespace bb::plonk
diff --git a/barretenberg/cpp/src/barretenberg/plonk/proof_system/verification_key/sol_gen.hpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/verification_key/sol_gen.hpp
index 3d23a3d71937..6daa53211748 100644
--- a/barretenberg/cpp/src/barretenberg/plonk/proof_system/verification_key/sol_gen.hpp
+++ b/barretenberg/cpp/src/barretenberg/plonk/proof_system/verification_key/sol_gen.hpp
@@ -1,4 +1,4 @@
-namespace proof_system {
+namespace bb {
 
 /**
  * Write a solidity file containing the vk params to the given stream.
@@ -154,9 +154,9 @@ inline void output_vk_sol(std::ostream& os, std::shared_ptr<plonk::verification_
         break;
     }
     default: {
-        std::cerr << "proof_system::output_vk_sol unsupported composer type. Defaulting to standard composer" << std::endl;
+        std::cerr << "bb::output_vk_sol unsupported composer type. Defaulting to standard composer" << std::endl;
         return output_vk_sol_standard(os, key, class_name);
     }
     }
 }
-} // namespace proof_system
+} // namespace bb
diff --git a/barretenberg/cpp/src/barretenberg/plonk/proof_system/verification_key/verification_key.cpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/verification_key/verification_key.cpp
index 0f51ef4f0875..2b7ee9fa75e7 100644
--- a/barretenberg/cpp/src/barretenberg/plonk/proof_system/verification_key/verification_key.cpp
+++ b/barretenberg/cpp/src/barretenberg/plonk/proof_system/verification_key/verification_key.cpp
@@ -4,7 +4,7 @@
 #include "barretenberg/plonk/proof_system/constants.hpp"
 #include "barretenberg/polynomials/evaluation_domain.hpp"
 
-namespace proof_system::plonk {
+namespace bb::plonk {
 
 /**
  * @brief Hashes the evaluation domain to match the 'circuit' approach taken in
@@ -44,7 +44,7 @@ bb::fr verification_key_data::hash_native(const size_t hash_index) const
 
     std::vector<uint8_t> preimage_data;
 
-    preimage_data.push_back(static_cast<uint8_t>(proof_system::CircuitType(circuit_type)));
+    preimage_data.push_back(static_cast<uint8_t>(bb::CircuitType(circuit_type)));
 
     const uint256_t domain = eval_domain.domain;
     const uint256_t generator = eval_domain.generator;
@@ -152,4 +152,4 @@ sha256::hash verification_key::sha256_hash()
     return sha256::sha256(to_buffer(vk_data));
 }
 
-} // namespace proof_system::plonk
+} // namespace bb::plonk
diff --git a/barretenberg/cpp/src/barretenberg/plonk/proof_system/verification_key/verification_key.hpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/verification_key/verification_key.hpp
index a9686b2f1a97..5bf59acd4d2e 100644
--- a/barretenberg/cpp/src/barretenberg/plonk/proof_system/verification_key/verification_key.hpp
+++ b/barretenberg/cpp/src/barretenberg/plonk/proof_system/verification_key/verification_key.hpp
@@ -9,7 +9,7 @@
 #include "barretenberg/srs/global_crs.hpp"
 #include <map>
 
-namespace proof_system::plonk {
+namespace bb::plonk {
 
 struct verification_key_data {
     uint32_t circuit_type;
@@ -113,7 +113,7 @@ struct verification_key {
         *this = verification_key{ std::move(data), bb::srs::get_crs_factory()->get_verifier_crs() };
     }
     // Alias verification_key as verification_key_data in the schema
-    void msgpack_schema(auto& packer) const { packer.pack_schema(proof_system::plonk::verification_key_data{}); }
+    void msgpack_schema(auto& packer) const { packer.pack_schema(bb::plonk::verification_key_data{}); }
 };
 
 template <typename B> inline void read(B& buf, verification_key& key)
@@ -143,4 +143,4 @@ inline std::ostream& operator<<(std::ostream& os, verification_key const& key)
     return os << key.as_data();
 };
 
-} // namespace proof_system::plonk
+} // namespace bb::plonk
diff --git a/barretenberg/cpp/src/barretenberg/plonk/proof_system/verification_key/verification_key.test.cpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/verification_key/verification_key.test.cpp
index 4c181ca9506d..088d5142f56c 100644
--- a/barretenberg/cpp/src/barretenberg/plonk/proof_system/verification_key/verification_key.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/plonk/proof_system/verification_key/verification_key.test.cpp
@@ -8,9 +8,9 @@ auto& engine = numeric::random::get_debug_engine();
 } // namespace
 
 using namespace bb;
-using namespace proof_system::plonk;
+using namespace bb::plonk;
 
-namespace proof_system::plonk::test_verification_key {
+namespace bb::plonk::test_verification_key {
 
 /**
  * @brief generate a random vk data for use in tests
@@ -154,4 +154,4 @@ TEST(VerificationKey, HashEqualityDifferentRecursiveProofPublicInputIndices)
     vk1_data.recursive_proof_public_input_indices.push_back(42);
     expect_hashes_eq(vk0_data, vk1_data);
 }
-} // namespace proof_system::plonk::test_verification_key
+} // namespace bb::plonk::test_verification_key
diff --git a/barretenberg/cpp/src/barretenberg/plonk/proof_system/verifier/verifier.cpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/verifier/verifier.cpp
index 5e91f1be8a9e..e9d076f7077f 100644
--- a/barretenberg/cpp/src/barretenberg/plonk/proof_system/verifier/verifier.cpp
+++ b/barretenberg/cpp/src/barretenberg/plonk/proof_system/verifier/verifier.cpp
@@ -10,7 +10,7 @@
 
 using namespace bb;
 
-namespace proof_system::plonk {
+namespace bb::plonk {
 template <typename program_settings>
 VerifierBase<program_settings>::VerifierBase(std::shared_ptr<verification_key> verifier_key,
                                              const transcript::Manifest& input_manifest)
@@ -242,4 +242,4 @@ template class VerifierBase<ultra_verifier_settings>;
 template class VerifierBase<ultra_to_standard_verifier_settings>;
 template class VerifierBase<ultra_with_keccak_verifier_settings>;
 
-} // namespace proof_system::plonk
+} // namespace bb::plonk
diff --git a/barretenberg/cpp/src/barretenberg/plonk/proof_system/verifier/verifier.hpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/verifier/verifier.hpp
index 9a8a0294c528..ae2a7f14f808 100644
--- a/barretenberg/cpp/src/barretenberg/plonk/proof_system/verifier/verifier.hpp
+++ b/barretenberg/cpp/src/barretenberg/plonk/proof_system/verifier/verifier.hpp
@@ -5,7 +5,7 @@
 #include "barretenberg/plonk/proof_system/commitment_scheme/commitment_scheme.hpp"
 #include "barretenberg/plonk/transcript/manifest.hpp"
 
-namespace proof_system::plonk {
+namespace bb::plonk {
 template <typename program_settings> class VerifierBase {
 
   public:
@@ -32,4 +32,4 @@ typedef VerifierBase<standard_verifier_settings> Verifier;
 typedef VerifierBase<ultra_verifier_settings> UltraVerifier;
 typedef VerifierBase<ultra_to_standard_verifier_settings> UltraToStandardVerifier;
 typedef VerifierBase<ultra_with_keccak_verifier_settings> UltraWithKeccakVerifier;
-} // namespace proof_system::plonk
+} // namespace bb::plonk
diff --git a/barretenberg/cpp/src/barretenberg/plonk/proof_system/verifier/verifier.test.cpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/verifier/verifier.test.cpp
index c0596b86351e..13e997110c0d 100644
--- a/barretenberg/cpp/src/barretenberg/plonk/proof_system/verifier/verifier.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/plonk/proof_system/verifier/verifier.test.cpp
@@ -14,7 +14,7 @@
 namespace verifier_helpers {
 
 using namespace bb;
-using namespace proof_system::plonk;
+using namespace bb::plonk;
 
 plonk::Verifier generate_verifier(std::shared_ptr<proving_key> circuit_proving_key)
 {
diff --git a/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/random_widgets/permutation_widget.hpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/random_widgets/permutation_widget.hpp
index 56bd11e83f5e..a08483561175 100644
--- a/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/random_widgets/permutation_widget.hpp
+++ b/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/random_widgets/permutation_widget.hpp
@@ -1,7 +1,7 @@
 #pragma once
 #include "random_widget.hpp"
 
-namespace proof_system::plonk {
+namespace bb::plonk {
 template <typename Field,
           typename Group,
           typename Transcript,
@@ -38,6 +38,6 @@ class ProverPermutationWidget : public ProverRandomWidget {
                                          const transcript::StandardTranscript& transcript) override;
 };
 
-} // namespace proof_system::plonk
+} // namespace bb::plonk
 
 #include "./permutation_widget_impl.hpp"
diff --git a/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/random_widgets/permutation_widget_impl.hpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/random_widgets/permutation_widget_impl.hpp
index d9d2e7625791..50ae2dccefab 100644
--- a/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/random_widgets/permutation_widget_impl.hpp
+++ b/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/random_widgets/permutation_widget_impl.hpp
@@ -8,7 +8,7 @@
 #include "barretenberg/polynomials/polynomial_arithmetic.hpp"
 #include "barretenberg/transcript/transcript.hpp"
 
-namespace proof_system::plonk {
+namespace bb::plonk {
 
 template <size_t program_width, bool idpolys, const size_t num_roots_cut_out_of_vanishing_polynomial>
 ProverPermutationWidget<program_width, idpolys, num_roots_cut_out_of_vanishing_polynomial>::ProverPermutationWidget(
@@ -786,4 +786,4 @@ Field VerifierPermutationWidget<Field, Group, Transcript, num_roots_cut_out_of_v
 
 template class VerifierPermutationWidget<bb::fr, bb::g1::affine_element, transcript::StandardTranscript>;
 
-} // namespace proof_system::plonk
+} // namespace bb::plonk
diff --git a/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/random_widgets/plookup_widget.hpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/random_widgets/plookup_widget.hpp
index a54907ed17f7..9978f06f50fe 100644
--- a/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/random_widgets/plookup_widget.hpp
+++ b/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/random_widgets/plookup_widget.hpp
@@ -1,7 +1,7 @@
 #pragma once
 #include "random_widget.hpp"
 
-namespace proof_system::plonk {
+namespace bb::plonk {
 template <typename Field,
           typename Group,
           typename Transcript,
@@ -42,6 +42,6 @@ class ProverPlookupWidget : public ProverRandomWidget {
                                                 const transcript::StandardTranscript& transcript) override;
 };
 
-} // namespace proof_system::plonk
+} // namespace bb::plonk
 
 #include "./plookup_widget_impl.hpp"
diff --git a/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/random_widgets/plookup_widget_impl.hpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/random_widgets/plookup_widget_impl.hpp
index 66a59de7c55d..3913120ee60d 100644
--- a/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/random_widgets/plookup_widget_impl.hpp
+++ b/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/random_widgets/plookup_widget_impl.hpp
@@ -8,7 +8,7 @@
 #include "barretenberg/transcript/transcript.hpp"
 #include <cstddef>
 
-namespace proof_system::plonk {
+namespace bb::plonk {
 
 template <const size_t num_roots_cut_out_of_vanishing_polynomial>
 ProverPlookupWidget<num_roots_cut_out_of_vanishing_polynomial>::ProverPlookupWidget(proving_key* input_key)
@@ -733,7 +733,7 @@ Field VerifierPlookupWidget<Field, Group, Transcript, num_roots_cut_out_of_vanis
     T0 = numerator - denominator;
     quotient_numerator_eval += T0 * alpha_base;
     return alpha_base * alpha.sqr() * alpha;
-} // namespace proof_system::plonk
+} // namespace bb::plonk
 
 template <typename Field, typename Group, typename Transcript, const size_t num_roots_cut_out_of_vanishing_polynomial>
 Field VerifierPlookupWidget<Field, Group, Transcript, num_roots_cut_out_of_vanishing_polynomial>::
@@ -748,4 +748,4 @@ Field VerifierPlookupWidget<Field, Group, Transcript, num_roots_cut_out_of_vanis
 
 template class VerifierPlookupWidget<bb::fr, bb::g1::affine_element, transcript::StandardTranscript>;
 
-} // namespace proof_system::plonk
+} // namespace bb::plonk
diff --git a/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/random_widgets/random_widget.hpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/random_widgets/random_widget.hpp
index 9d4f764e4e2c..ffef68eb6907 100644
--- a/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/random_widgets/random_widget.hpp
+++ b/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/random_widgets/random_widget.hpp
@@ -7,7 +7,7 @@
 namespace transcript {
 class Transcript;
 }
-namespace proof_system::plonk {
+namespace bb::plonk {
 
 struct proving_key;
 
@@ -51,4 +51,4 @@ class ProverRandomWidget {
     proving_key* key;
 };
 
-} // namespace proof_system::plonk
+} // namespace bb::plonk
diff --git a/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/arithmetic_widget.hpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/arithmetic_widget.hpp
index fae8785cdc62..22afe28178f3 100644
--- a/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/arithmetic_widget.hpp
+++ b/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/arithmetic_widget.hpp
@@ -2,7 +2,7 @@
 
 #include "./transition_widget.hpp"
 
-namespace proof_system::plonk {
+namespace bb::plonk {
 namespace widget {
 
 /**
@@ -105,4 +105,4 @@ using ProverArithmeticWidget = widget::TransitionWidget<bb::fr, Settings, widget
 template <typename Field, typename Group, typename Transcript, typename Settings>
 using VerifierArithmeticWidget = widget::GenericVerifierWidget<Field, Transcript, Settings, widget::ArithmeticKernel>;
 
-} // namespace proof_system::plonk
\ No newline at end of file
+} // namespace bb::plonk
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/elliptic_widget.hpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/elliptic_widget.hpp
index a03f1a3772a9..ae37662559d4 100644
--- a/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/elliptic_widget.hpp
+++ b/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/elliptic_widget.hpp
@@ -2,7 +2,7 @@
 
 #include "./transition_widget.hpp"
 
-namespace proof_system::plonk {
+namespace bb::plonk {
 namespace widget {
 
 /**
@@ -154,4 +154,4 @@ using ProverEllipticWidget = widget::TransitionWidget<bb::fr, Settings, widget::
 template <typename Field, typename Group, typename Transcript, typename Settings>
 using VerifierEllipticWidget = widget::GenericVerifierWidget<Field, Transcript, Settings, widget::EllipticKernel>;
 
-} // namespace proof_system::plonk
\ No newline at end of file
+} // namespace bb::plonk
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/genperm_sort_widget.hpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/genperm_sort_widget.hpp
index 24cba31b6898..227e601003e1 100644
--- a/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/genperm_sort_widget.hpp
+++ b/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/genperm_sort_widget.hpp
@@ -2,7 +2,7 @@
 
 #include "./transition_widget.hpp"
 
-namespace proof_system::plonk {
+namespace bb::plonk {
 namespace widget {
 
 template <class Field, class Getters, typename PolyContainer> class GenPermSortKernel {
@@ -107,4 +107,4 @@ using ProverGenPermSortWidget = widget::TransitionWidget<bb::fr, Settings, widge
 template <typename Field, typename Group, typename Transcript, typename Settings>
 using VerifierGenPermSortWidget = widget::GenericVerifierWidget<Field, Transcript, Settings, widget::GenPermSortKernel>;
 
-} // namespace proof_system::plonk
\ No newline at end of file
+} // namespace bb::plonk
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/plookup_arithmetic_widget.hpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/plookup_arithmetic_widget.hpp
index 9ee609bb5d05..6a97ca7a1396 100644
--- a/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/plookup_arithmetic_widget.hpp
+++ b/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/plookup_arithmetic_widget.hpp
@@ -2,7 +2,7 @@
 
 #include "./transition_widget.hpp"
 
-namespace proof_system::plonk {
+namespace bb::plonk {
 namespace widget {
 
 /**
@@ -179,4 +179,4 @@ template <typename Field, typename Group, typename Transcript, typename Settings
 using VerifierPlookupArithmeticWidget =
     widget::GenericVerifierWidget<Field, Transcript, Settings, widget::PlookupArithmeticKernel>;
 
-} // namespace proof_system::plonk
\ No newline at end of file
+} // namespace bb::plonk
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/plookup_auxiliary_widget.hpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/plookup_auxiliary_widget.hpp
index 636f61a6364a..b599e2663ca3 100644
--- a/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/plookup_auxiliary_widget.hpp
+++ b/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/plookup_auxiliary_widget.hpp
@@ -2,7 +2,7 @@
 
 #include "./transition_widget.hpp"
 
-namespace proof_system::plonk {
+namespace bb::plonk {
 namespace widget {
 
 /**
@@ -330,4 +330,4 @@ template <typename Field, typename Group, typename Transcript, typename Settings
 using VerifierPlookupAuxiliaryWidget =
     widget::GenericVerifierWidget<Field, Transcript, Settings, widget::PlookupAuxiliaryKernel>;
 
-} // namespace proof_system::plonk
\ No newline at end of file
+} // namespace bb::plonk
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/transition_widget.hpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/transition_widget.hpp
index b00dccfc249b..283af00dd6bd 100644
--- a/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/transition_widget.hpp
+++ b/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/transition_widget.hpp
@@ -11,8 +11,8 @@
 #include "barretenberg/plonk/work_queue/work_queue.hpp"
 #include "barretenberg/polynomials/iterate_over_domain.hpp"
 
-using namespace proof_system;
-namespace proof_system::plonk {
+using namespace bb;
+namespace bb::plonk {
 
 namespace widget {
 enum ChallengeIndex {
@@ -378,4 +378,4 @@ class GenericVerifierWidget {
     }
 };
 } // namespace widget
-} // namespace proof_system::plonk
+} // namespace bb::plonk
diff --git a/barretenberg/cpp/src/barretenberg/plonk/transcript/transcript.hpp b/barretenberg/cpp/src/barretenberg/plonk/transcript/transcript.hpp
index 6a892ad411bc..e32c4591d875 100644
--- a/barretenberg/cpp/src/barretenberg/plonk/transcript/transcript.hpp
+++ b/barretenberg/cpp/src/barretenberg/plonk/transcript/transcript.hpp
@@ -38,7 +38,7 @@ class Transcript {
     };
 
   public:
-    typedef proof_system::plonk::verification_key Key;
+    typedef bb::plonk::verification_key Key;
 
     /**
      * Create a new transcript for Prover based on the manifest.
diff --git a/barretenberg/cpp/src/barretenberg/plonk/work_queue/work_queue.cpp b/barretenberg/cpp/src/barretenberg/plonk/work_queue/work_queue.cpp
index 421ec273614a..9128f5424578 100644
--- a/barretenberg/cpp/src/barretenberg/plonk/work_queue/work_queue.cpp
+++ b/barretenberg/cpp/src/barretenberg/plonk/work_queue/work_queue.cpp
@@ -3,7 +3,7 @@
 #include "barretenberg/polynomials/polynomial.hpp"
 #include "barretenberg/polynomials/polynomial_arithmetic.hpp"
 
-namespace proof_system::plonk {
+namespace bb::plonk {
 
 using namespace bb;
 
@@ -286,4 +286,4 @@ std::vector<work_queue::work_item> work_queue::get_queue() const
     return work_item_queue;
 }
 
-} // namespace proof_system::plonk
+} // namespace bb::plonk
diff --git a/barretenberg/cpp/src/barretenberg/plonk/work_queue/work_queue.hpp b/barretenberg/cpp/src/barretenberg/plonk/work_queue/work_queue.hpp
index 4a92dc598b7b..5cf849e4be01 100644
--- a/barretenberg/cpp/src/barretenberg/plonk/work_queue/work_queue.hpp
+++ b/barretenberg/cpp/src/barretenberg/plonk/work_queue/work_queue.hpp
@@ -3,7 +3,7 @@
 #include "barretenberg/plonk/proof_system/proving_key/proving_key.hpp"
 #include "barretenberg/plonk/transcript/transcript_wrappers.hpp"
 
-namespace proof_system::plonk {
+namespace bb::plonk {
 
 using namespace bb;
 
@@ -68,4 +68,4 @@ class work_queue {
     transcript::StandardTranscript* transcript;
     std::vector<work_item> work_item_queue;
 };
-} // namespace proof_system::plonk
\ No newline at end of file
+} // namespace bb::plonk
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/polynomials/evaluation_domain.cpp b/barretenberg/cpp/src/barretenberg/polynomials/evaluation_domain.cpp
index 0a838af2caf5..6af376c70d6c 100644
--- a/barretenberg/cpp/src/barretenberg/polynomials/evaluation_domain.cpp
+++ b/barretenberg/cpp/src/barretenberg/polynomials/evaluation_domain.cpp
@@ -66,7 +66,7 @@ EvaluationDomain<Fr>::EvaluationDomain(const size_t domain_size, const size_t ta
     , roots(nullptr)
 {
     // Grumpkin does not have many roots of unity and, given these are not used for Honk, we set it to one.
-    if (proof_system::IsAnyOf<Fr, grumpkin::fr>) {
+    if (bb::IsAnyOf<Fr, grumpkin::fr>) {
         root = Fr::one();
     } else {
         root = Fr::get_root_of_unity(log2_size);
diff --git a/barretenberg/cpp/src/barretenberg/proof_system/arithmetization/gate_data.hpp b/barretenberg/cpp/src/barretenberg/proof_system/arithmetization/gate_data.hpp
index d13bee687bb5..af0f1b0f48eb 100644
--- a/barretenberg/cpp/src/barretenberg/proof_system/arithmetization/gate_data.hpp
+++ b/barretenberg/cpp/src/barretenberg/proof_system/arithmetization/gate_data.hpp
@@ -6,7 +6,7 @@
 // TODO(#557): The field-specific aliases for gates should be removed and the type could be explicit when this
 // structures are used to avoid having foo_gate and foo_gate_grumpkin (i.e. use foo_gate<field> instead). Moreover, we
 // need to ensure the read/write functions handle grumpkin gates as well.
-namespace proof_system {
+namespace bb {
 template <typename FF> struct add_triple_ {
     uint32_t a;
     uint32_t b;
@@ -163,4 +163,4 @@ template <typename FF> struct poseidon2_end_gate_ {
     uint32_t c;
     uint32_t d;
 };
-} // namespace proof_system
+} // namespace bb
diff --git a/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/circuit_builder_base.cpp b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/circuit_builder_base.cpp
index 11b6193d2e57..6facba2b16b5 100644
--- a/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/circuit_builder_base.cpp
+++ b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/circuit_builder_base.cpp
@@ -2,7 +2,7 @@
 #include "barretenberg/ecc/curves/bn254/bn254.hpp"
 #include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp"
 
-namespace proof_system {
+namespace bb {
 
 /**
  * Join variable class b to variable class a.
@@ -45,4 +45,4 @@ void CircuitBuilderBase<FF>::assert_equal(const uint32_t a_variable_idx,
 // Standard honk/ plonk instantiation
 template class CircuitBuilderBase<bb::fr>;
 template class CircuitBuilderBase<grumpkin::fr>;
-} // namespace proof_system
+} // namespace bb
diff --git a/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/circuit_builder_base.hpp b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/circuit_builder_base.hpp
index f93ae3806df1..ffc8e1dce5d3 100644
--- a/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/circuit_builder_base.hpp
+++ b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/circuit_builder_base.hpp
@@ -8,7 +8,7 @@
 
 #include <unordered_map>
 
-namespace proof_system {
+namespace bb {
 static constexpr uint32_t DUMMY_TAG = 0;
 
 template <typename FF_> class CircuitBuilderBase {
@@ -382,7 +382,7 @@ template <typename FF_> class CircuitBuilderBase {
     }
 };
 
-} // namespace proof_system
+} // namespace bb
 
 // TODO(#217)(Cody): This will need updating based on the approach we take to ensure no multivariate is zero.
 /**
diff --git a/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/eccvm/eccvm_builder_types.hpp b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/eccvm/eccvm_builder_types.hpp
index 3c9a39fd80a3..d01d92ce5d60 100644
--- a/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/eccvm/eccvm_builder_types.hpp
+++ b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/eccvm/eccvm_builder_types.hpp
@@ -2,7 +2,7 @@
 
 #include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp"
 
-namespace proof_system_eccvm {
+namespace bb_eccvm {
 
 static constexpr size_t NUM_SCALAR_BITS = 128;
 static constexpr size_t WNAF_SLICE_BITS = 4;
@@ -44,4 +44,4 @@ template <typename CycleGroup> struct ScalarMul {
 
 template <typename CycleGroup> using MSM = std::vector<ScalarMul<CycleGroup>>;
 
-} // namespace proof_system_eccvm
\ No newline at end of file
+} // namespace bb_eccvm
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/eccvm/eccvm_circuit_builder.hpp b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/eccvm/eccvm_circuit_builder.hpp
index a15dd61ea353..b73b18897102 100644
--- a/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/eccvm/eccvm_circuit_builder.hpp
+++ b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/eccvm/eccvm_circuit_builder.hpp
@@ -12,7 +12,7 @@
 #include "barretenberg/proof_system/op_queue/ecc_op_queue.hpp"
 #include "barretenberg/relations/relation_parameters.hpp"
 
-namespace proof_system {
+namespace bb {
 
 template <typename Flavor> class ECCVMCircuitBuilder {
   public:
@@ -24,21 +24,21 @@ template <typename Flavor> class ECCVMCircuitBuilder {
     using Element = typename CycleGroup::element;
     using AffineElement = typename CycleGroup::affine_element;
 
-    static constexpr size_t NUM_SCALAR_BITS = proof_system_eccvm::NUM_SCALAR_BITS;
-    static constexpr size_t WNAF_SLICE_BITS = proof_system_eccvm::WNAF_SLICE_BITS;
-    static constexpr size_t NUM_WNAF_SLICES = proof_system_eccvm::NUM_WNAF_SLICES;
-    static constexpr uint64_t WNAF_MASK = proof_system_eccvm::WNAF_MASK;
-    static constexpr size_t POINT_TABLE_SIZE = proof_system_eccvm::POINT_TABLE_SIZE;
-    static constexpr size_t WNAF_SLICES_PER_ROW = proof_system_eccvm::WNAF_SLICES_PER_ROW;
-    static constexpr size_t ADDITIONS_PER_ROW = proof_system_eccvm::ADDITIONS_PER_ROW;
+    static constexpr size_t NUM_SCALAR_BITS = bb_eccvm::NUM_SCALAR_BITS;
+    static constexpr size_t WNAF_SLICE_BITS = bb_eccvm::WNAF_SLICE_BITS;
+    static constexpr size_t NUM_WNAF_SLICES = bb_eccvm::NUM_WNAF_SLICES;
+    static constexpr uint64_t WNAF_MASK = bb_eccvm::WNAF_MASK;
+    static constexpr size_t POINT_TABLE_SIZE = bb_eccvm::POINT_TABLE_SIZE;
+    static constexpr size_t WNAF_SLICES_PER_ROW = bb_eccvm::WNAF_SLICES_PER_ROW;
+    static constexpr size_t ADDITIONS_PER_ROW = bb_eccvm::ADDITIONS_PER_ROW;
 
     static constexpr size_t NUM_POLYNOMIALS = Flavor::NUM_ALL_ENTITIES;
     static constexpr size_t NUM_WIRES = Flavor::NUM_WIRES;
 
-    using MSM = proof_system_eccvm::MSM<CycleGroup>;
-    using VMOperation = proof_system_eccvm::VMOperation<CycleGroup>;
+    using MSM = bb_eccvm::MSM<CycleGroup>;
+    using VMOperation = bb_eccvm::VMOperation<CycleGroup>;
     std::shared_ptr<ECCOpQueue> op_queue;
-    using ScalarMul = proof_system_eccvm::ScalarMul<CycleGroup>;
+    using ScalarMul = bb_eccvm::ScalarMul<CycleGroup>;
     using ProverPolynomials = typename Flavor::ProverPolynomials;
 
     ECCVMCircuitBuilder()
@@ -492,7 +492,7 @@ template <typename Flavor> class ECCVMCircuitBuilder {
         auto eccvm_set_permutation_delta =
             gamma * (gamma + beta_sqr) * (gamma + beta_sqr + beta_sqr) * (gamma + beta_sqr + beta_sqr + beta_sqr);
         eccvm_set_permutation_delta = eccvm_set_permutation_delta.invert();
-        proof_system::RelationParameters<typename Flavor::FF> params{
+        bb::RelationParameters<typename Flavor::FF> params{
             .eta = 0,
             .beta = beta,
             .gamma = gamma,
@@ -505,9 +505,8 @@ template <typename Flavor> class ECCVMCircuitBuilder {
 
         auto polynomials = compute_polynomials();
         const size_t num_rows = polynomials.get_polynomial_size();
-        proof_system::honk::logderivative_library::
-            compute_logderivative_inverse<Flavor, honk::sumcheck::ECCVMLookupRelation<FF>>(
-                polynomials, params, num_rows);
+        bb::honk::logderivative_library::compute_logderivative_inverse<Flavor, honk::sumcheck::ECCVMLookupRelation<FF>>(
+            polynomials, params, num_rows);
 
         honk::permutation_library::compute_permutation_grand_product<Flavor, honk::sumcheck::ECCVMSetRelation<FF>>(
             num_rows, polynomials, params);
@@ -599,4 +598,4 @@ template <typename Flavor> class ECCVMCircuitBuilder {
         return num_rows_pow2;
     }
 };
-} // namespace proof_system
+} // namespace bb
diff --git a/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/eccvm/eccvm_circuit_builder.test.cpp b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/eccvm/eccvm_circuit_builder.test.cpp
index b7619c733330..013e9a3c0864 100644
--- a/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/eccvm/eccvm_circuit_builder.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/eccvm/eccvm_circuit_builder.test.cpp
@@ -13,7 +13,7 @@ namespace eccvm_circuit_builder_tests {
 
 template <typename Flavor> class ECCVMCircuitBuilderTests : public ::testing::Test {};
 
-using FlavorTypes = ::testing::Types<proof_system::honk::flavor::ECCVM>;
+using FlavorTypes = ::testing::Types<bb::honk::flavor::ECCVM>;
 TYPED_TEST_SUITE(ECCVMCircuitBuilderTests, FlavorTypes);
 
 TYPED_TEST(ECCVMCircuitBuilderTests, BaseCase)
@@ -21,7 +21,7 @@ TYPED_TEST(ECCVMCircuitBuilderTests, BaseCase)
     using Flavor = TypeParam;
     using G1 = typename Flavor::CycleGroup;
     using Fr = typename G1::Fr;
-    proof_system::ECCVMCircuitBuilder<Flavor> circuit;
+    bb::ECCVMCircuitBuilder<Flavor> circuit;
     auto generators = G1::derive_generators("test generators", 3);
     typename G1::element a = generators[0];
     typename G1::element b = generators[1];
@@ -55,7 +55,7 @@ TYPED_TEST(ECCVMCircuitBuilderTests, Add)
 {
     using Flavor = TypeParam;
     using G1 = typename Flavor::CycleGroup;
-    proof_system::ECCVMCircuitBuilder<Flavor> circuit;
+    bb::ECCVMCircuitBuilder<Flavor> circuit;
 
     auto generators = G1::derive_generators("test generators", 3);
     typename G1::element a = generators[0];
@@ -71,7 +71,7 @@ TYPED_TEST(ECCVMCircuitBuilderTests, Mul)
     using Flavor = TypeParam;
     using G1 = typename Flavor::CycleGroup;
     using Fr = typename G1::Fr;
-    proof_system::ECCVMCircuitBuilder<Flavor> circuit;
+    bb::ECCVMCircuitBuilder<Flavor> circuit;
     auto generators = G1::derive_generators("test generators", 3);
     typename G1::element a = generators[0];
     Fr x = Fr::random_element(&engine);
@@ -87,7 +87,7 @@ TYPED_TEST(ECCVMCircuitBuilderTests, ShortMul)
     using Flavor = TypeParam;
     using G1 = typename Flavor::CycleGroup;
     using Fr = typename G1::Fr;
-    proof_system::ECCVMCircuitBuilder<Flavor> circuit;
+    bb::ECCVMCircuitBuilder<Flavor> circuit;
     auto generators = G1::derive_generators("test generators", 3);
 
     typename G1::element a = generators[0];
@@ -109,7 +109,7 @@ TYPED_TEST(ECCVMCircuitBuilderTests, EqFails)
     using Flavor = TypeParam;
     using G1 = typename Flavor::CycleGroup;
     using Fr = typename G1::Fr;
-    proof_system::ECCVMCircuitBuilder<Flavor> circuit;
+    bb::ECCVMCircuitBuilder<Flavor> circuit;
 
     auto generators = G1::derive_generators("test generators", 3);
     typename G1::element a = generators[0];
@@ -124,7 +124,7 @@ TYPED_TEST(ECCVMCircuitBuilderTests, EqFails)
 TYPED_TEST(ECCVMCircuitBuilderTests, EmptyRow)
 {
     using Flavor = TypeParam;
-    proof_system::ECCVMCircuitBuilder<Flavor> circuit;
+    bb::ECCVMCircuitBuilder<Flavor> circuit;
 
     circuit.empty_row();
 
@@ -137,7 +137,7 @@ TYPED_TEST(ECCVMCircuitBuilderTests, EmptyRowBetweenOps)
     using Flavor = TypeParam;
     using G1 = typename Flavor::CycleGroup;
     using Fr = typename G1::Fr;
-    proof_system::ECCVMCircuitBuilder<Flavor> circuit;
+    bb::ECCVMCircuitBuilder<Flavor> circuit;
 
     auto generators = G1::derive_generators("test generators", 3);
     typename G1::element a = generators[0];
@@ -158,7 +158,7 @@ TYPED_TEST(ECCVMCircuitBuilderTests, EndWithEq)
     using Flavor = TypeParam;
     using G1 = typename Flavor::CycleGroup;
     using Fr = typename G1::Fr;
-    proof_system::ECCVMCircuitBuilder<Flavor> circuit;
+    bb::ECCVMCircuitBuilder<Flavor> circuit;
 
     auto generators = G1::derive_generators("test generators", 3);
     typename G1::element a = generators[0];
@@ -178,7 +178,7 @@ TYPED_TEST(ECCVMCircuitBuilderTests, EndWithAdd)
     using Flavor = TypeParam;
     using G1 = typename Flavor::CycleGroup;
     using Fr = typename G1::Fr;
-    proof_system::ECCVMCircuitBuilder<Flavor> circuit;
+    bb::ECCVMCircuitBuilder<Flavor> circuit;
 
     auto generators = G1::derive_generators("test generators", 3);
     typename G1::element a = generators[0];
@@ -199,7 +199,7 @@ TYPED_TEST(ECCVMCircuitBuilderTests, EndWithMul)
     using Flavor = TypeParam;
     using G1 = typename Flavor::CycleGroup;
     using Fr = typename G1::Fr;
-    proof_system::ECCVMCircuitBuilder<Flavor> circuit;
+    bb::ECCVMCircuitBuilder<Flavor> circuit;
 
     auto generators = G1::derive_generators("test generators", 3);
     typename G1::element a = generators[0];
@@ -218,7 +218,7 @@ TYPED_TEST(ECCVMCircuitBuilderTests, EndWithNoop)
     using Flavor = TypeParam;
     using G1 = typename Flavor::CycleGroup;
     using Fr = typename G1::Fr;
-    proof_system::ECCVMCircuitBuilder<Flavor> circuit;
+    bb::ECCVMCircuitBuilder<Flavor> circuit;
 
     auto generators = G1::derive_generators("test generators", 3);
     typename G1::element a = generators[0];
@@ -257,13 +257,13 @@ TYPED_TEST(ECCVMCircuitBuilderTests, MSM)
     // single msms
     for (size_t j = 1; j < max_num_msms; ++j) {
         using Flavor = TypeParam;
-        proof_system::ECCVMCircuitBuilder<Flavor> circuit;
+        bb::ECCVMCircuitBuilder<Flavor> circuit;
         try_msms(j, circuit);
         bool result = circuit.check_circuit();
         EXPECT_EQ(result, true);
     }
     // chain msms
-    proof_system::ECCVMCircuitBuilder<Flavor> circuit;
+    bb::ECCVMCircuitBuilder<Flavor> circuit;
     for (size_t j = 1; j < 9; ++j) {
         try_msms(j, circuit);
     }
diff --git a/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/eccvm/msm_builder.hpp b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/eccvm/msm_builder.hpp
index c2efae944f60..c47f818ff304 100644
--- a/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/eccvm/msm_builder.hpp
+++ b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/eccvm/msm_builder.hpp
@@ -4,7 +4,7 @@
 
 #include "./eccvm_builder_types.hpp"
 
-namespace proof_system {
+namespace bb {
 
 template <typename Flavor> class ECCVMMSMMBuilder {
   public:
@@ -13,9 +13,9 @@ template <typename Flavor> class ECCVMMSMMBuilder {
     using Element = typename CycleGroup::element;
     using AffineElement = typename CycleGroup::affine_element;
 
-    static constexpr size_t ADDITIONS_PER_ROW = proof_system_eccvm::ADDITIONS_PER_ROW;
-    static constexpr size_t NUM_SCALAR_BITS = proof_system_eccvm::NUM_SCALAR_BITS;
-    static constexpr size_t WNAF_SLICE_BITS = proof_system_eccvm::WNAF_SLICE_BITS;
+    static constexpr size_t ADDITIONS_PER_ROW = bb_eccvm::ADDITIONS_PER_ROW;
+    static constexpr size_t NUM_SCALAR_BITS = bb_eccvm::NUM_SCALAR_BITS;
+    static constexpr size_t WNAF_SLICE_BITS = bb_eccvm::WNAF_SLICE_BITS;
 
     struct MSMState {
         uint32_t pc = 0;
@@ -53,7 +53,7 @@ template <typename Flavor> class ECCVMMSMMBuilder {
      * @param total_number_of_muls
      * @return std::vector<MSMState>
      */
-    static std::vector<MSMState> compute_msm_state(const std::vector<proof_system_eccvm::MSM<CycleGroup>>& msms,
+    static std::vector<MSMState> compute_msm_state(const std::vector<bb_eccvm::MSM<CycleGroup>>& msms,
                                                    std::array<std::vector<size_t>, 2>& point_table_read_counts,
                                                    const uint32_t total_number_of_muls)
     {
@@ -279,4 +279,4 @@ template <typename Flavor> class ECCVMMSMMBuilder {
         return msm_state;
     }
 };
-} // namespace proof_system
+} // namespace bb
diff --git a/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/eccvm/precomputed_tables_builder.hpp b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/eccvm/precomputed_tables_builder.hpp
index 9c04bf333793..ca583c8de412 100644
--- a/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/eccvm/precomputed_tables_builder.hpp
+++ b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/eccvm/precomputed_tables_builder.hpp
@@ -2,7 +2,7 @@
 
 #include "./eccvm_builder_types.hpp"
 
-namespace proof_system {
+namespace bb {
 
 template <typename Flavor> class ECCVMPrecomputedTablesBuilder {
   public:
@@ -11,9 +11,9 @@ template <typename Flavor> class ECCVMPrecomputedTablesBuilder {
     using Element = typename CycleGroup::element;
     using AffineElement = typename CycleGroup::affine_element;
 
-    static constexpr size_t NUM_WNAF_SLICES = proof_system_eccvm::NUM_WNAF_SLICES;
-    static constexpr size_t WNAF_SLICES_PER_ROW = proof_system_eccvm::WNAF_SLICES_PER_ROW;
-    static constexpr size_t WNAF_SLICE_BITS = proof_system_eccvm::WNAF_SLICE_BITS;
+    static constexpr size_t NUM_WNAF_SLICES = bb_eccvm::NUM_WNAF_SLICES;
+    static constexpr size_t WNAF_SLICES_PER_ROW = bb_eccvm::WNAF_SLICES_PER_ROW;
+    static constexpr size_t WNAF_SLICE_BITS = bb_eccvm::WNAF_SLICE_BITS;
 
     struct PrecomputeState {
         int s1 = 0;
@@ -34,7 +34,7 @@ template <typename Flavor> class ECCVMPrecomputedTablesBuilder {
     };
 
     static std::vector<PrecomputeState> compute_precompute_state(
-        const std::vector<proof_system_eccvm::ScalarMul<CycleGroup>>& ecc_muls)
+        const std::vector<bb_eccvm::ScalarMul<CycleGroup>>& ecc_muls)
     {
         std::vector<PrecomputeState> precompute_state;
 
@@ -101,11 +101,11 @@ template <typename Flavor> class ECCVMPrecomputedTablesBuilder {
 
                 row.precompute_double = d2;
                 // fill accumulator in reverse order i.e. first row = 15[P], then 13[P], ..., 1[P]
-                row.precompute_accumulator = entry.precomputed_table[proof_system_eccvm::POINT_TABLE_SIZE - 1 - i];
+                row.precompute_accumulator = entry.precomputed_table[bb_eccvm::POINT_TABLE_SIZE - 1 - i];
                 precompute_state.emplace_back(row);
             }
         }
         return precompute_state;
     }
 };
-} // namespace proof_system
\ No newline at end of file
+} // namespace bb
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/eccvm/transcript_builder.hpp b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/eccvm/transcript_builder.hpp
index 07c43d47d637..5d0c693eac69 100644
--- a/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/eccvm/transcript_builder.hpp
+++ b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/eccvm/transcript_builder.hpp
@@ -2,7 +2,7 @@
 
 #include "./eccvm_builder_types.hpp"
 
-namespace proof_system {
+namespace bb {
 
 template <typename Flavor> class ECCVMTranscriptBuilder {
   public:
@@ -58,8 +58,7 @@ template <typename Flavor> class ECCVMTranscriptBuilder {
         }
     };
     static std::vector<TranscriptState> compute_transcript_state(
-        const std::vector<proof_system_eccvm::VMOperation<CycleGroup>>& vm_operations,
-        const uint32_t total_number_of_muls)
+        const std::vector<bb_eccvm::VMOperation<CycleGroup>>& vm_operations, const uint32_t total_number_of_muls)
     {
         std::vector<TranscriptState> transcript_state;
         VMState state{
@@ -75,7 +74,7 @@ template <typename Flavor> class ECCVMTranscriptBuilder {
         transcript_state.emplace_back(TranscriptState{});
         for (size_t i = 0; i < vm_operations.size(); ++i) {
             TranscriptState row;
-            const proof_system_eccvm::VMOperation<CycleGroup>& entry = vm_operations[i];
+            const bb_eccvm::VMOperation<CycleGroup>& entry = vm_operations[i];
 
             const bool is_mul = entry.mul;
             const bool z1_zero = (entry.mul) ? entry.z1 == 0 : true;
@@ -184,4 +183,4 @@ template <typename Flavor> class ECCVMTranscriptBuilder {
         return transcript_state;
     }
 };
-} // namespace proof_system
+} // namespace bb
diff --git a/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/generated/AvmMini_circuit_builder.hpp b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/generated/AvmMini_circuit_builder.hpp
index a071695d1e9e..de70d2c08579 100644
--- a/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/generated/AvmMini_circuit_builder.hpp
+++ b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/generated/AvmMini_circuit_builder.hpp
@@ -17,7 +17,7 @@
 
 using namespace bb;
 
-namespace proof_system {
+namespace bb {
 
 template <typename FF> struct AvmMiniFullRow {
     FF avmMini_clk{};
@@ -70,7 +70,7 @@ template <typename FF> struct AvmMiniFullRow {
 
 class AvmMiniCircuitBuilder {
   public:
-    using Flavor = proof_system::honk::flavor::AvmMiniFlavor;
+    using Flavor = bb::honk::flavor::AvmMiniFlavor;
     using FF = Flavor::FF;
     using Row = AvmMiniFullRow<FF>;
 
@@ -202,4 +202,4 @@ class AvmMiniCircuitBuilder {
         return num_rows_pow2;
     }
 };
-} // namespace proof_system
+} // namespace bb
diff --git a/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/generated/Toy_circuit_builder.hpp b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/generated/Toy_circuit_builder.hpp
index def07fd86c75..3491f983291d 100644
--- a/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/generated/Toy_circuit_builder.hpp
+++ b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/generated/Toy_circuit_builder.hpp
@@ -18,7 +18,7 @@
 
 using namespace bb;
 
-namespace proof_system {
+namespace bb {
 
 template <typename FF> struct ToyFullRow {
     FF toy_first{};
@@ -42,7 +42,7 @@ template <typename FF> struct ToyFullRow {
 
 class ToyCircuitBuilder {
   public:
-    using Flavor = proof_system::honk::flavor::ToyFlavor;
+    using Flavor = bb::honk::flavor::ToyFlavor;
     using FF = Flavor::FF;
     using Row = ToyFullRow<FF>;
 
@@ -94,7 +94,7 @@ class ToyCircuitBuilder {
 
         const FF gamma = FF::random_element();
         const FF beta = FF::random_element();
-        proof_system::RelationParameters<typename Flavor::FF> params{
+        bb::RelationParameters<typename Flavor::FF> params{
             .eta = 0,
             .beta = beta,
             .gamma = gamma,
@@ -137,7 +137,7 @@ class ToyCircuitBuilder {
 
         const auto evaluate_logderivative = [&]<typename LogDerivativeSettings>(const std::string& lookup_name) {
             // Check the logderivative relation
-            proof_system::honk::logderivative_library::compute_logderivative_inverse<Flavor, LogDerivativeSettings>(
+            bb::honk::logderivative_library::compute_logderivative_inverse<Flavor, LogDerivativeSettings>(
                 polys, params, num_rows);
 
             typename LogDerivativeSettings::SumcheckArrayOfValuesOverSubrelations lookup_result;
@@ -183,4 +183,4 @@ class ToyCircuitBuilder {
         return num_rows_pow2;
     }
 };
-} // namespace proof_system
+} // namespace bb
diff --git a/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_translator_circuit_builder.cpp b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_translator_circuit_builder.cpp
index 70e3398e6150..30c62aad83a3 100644
--- a/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_translator_circuit_builder.cpp
+++ b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_translator_circuit_builder.cpp
@@ -13,7 +13,7 @@
 #include "barretenberg/plonk/proof_system/constants.hpp"
 #include "barretenberg/proof_system/op_queue/ecc_op_queue.hpp"
 #include <cstddef>
-namespace proof_system {
+namespace bb {
 using ECCVMOperation = ECCOpQueue::ECCVMOperation;
 
 /**
@@ -1067,4 +1067,4 @@ bool GoblinTranslatorCircuitBuilder::check_circuit()
 };
 template GoblinTranslatorCircuitBuilder::AccumulationInput generate_witness_values(
     bb::fr, bb::fr, bb::fr, bb::fr, bb::fr, bb::fr, bb::fr, bb::fq, bb::fq, bb::fq);
-} // namespace proof_system
\ No newline at end of file
+} // namespace bb
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_translator_circuit_builder.hpp b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_translator_circuit_builder.hpp
index 6fd3c9be5bc0..79cbd878335b 100644
--- a/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_translator_circuit_builder.hpp
+++ b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_translator_circuit_builder.hpp
@@ -19,7 +19,7 @@
 #include <cstdlib>
 #include <iterator>
 #include <tuple>
-namespace proof_system {
+namespace bb {
 /**
  * @brief GoblinTranslatorCircuitBuilder creates a circuit that evaluates the correctness of the evaluation of
  * EccOpQueue in Fq while operating in the Fr scalar field (r is the modulus of Fr and p is the modulus of Fp)
@@ -472,4 +472,4 @@ GoblinTranslatorCircuitBuilder::AccumulationInput generate_witness_values(Fr op_
                                                                           Fq previous_accumulator,
                                                                           Fq batching_challenge_v,
                                                                           Fq evaluation_input_x);
-} // namespace proof_system
+} // namespace bb
diff --git a/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_translator_circuit_builder.test.cpp b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_translator_circuit_builder.test.cpp
index eedc47e69bda..acfdad1c165f 100644
--- a/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_translator_circuit_builder.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_translator_circuit_builder.test.cpp
@@ -9,7 +9,7 @@ using namespace bb;
 namespace {
 auto& engine = numeric::random::get_debug_engine();
 }
-namespace proof_system {
+namespace bb {
 
 /**
  * @brief Check that a single accumulation gate is created correctly
@@ -129,4 +129,4 @@ TEST(GoblinTranslatorCircuitBuilder, SeveralOperationCorrectness)
     // Check the computation result is in line with what we've computed
     EXPECT_EQ(result, circuit_builder.get_computation_result());
 }
-} // namespace proof_system
\ No newline at end of file
+} // namespace bb
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_translator_mini.fuzzer.cpp b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_translator_mini.fuzzer.cpp
index c5366ab47a36..ee34d21262b0 100644
--- a/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_translator_mini.fuzzer.cpp
+++ b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_translator_mini.fuzzer.cpp
@@ -5,7 +5,7 @@ using Fq = ::curve::BN254::BaseField;
 
 extern "C" int LLVMFuzzerTestOneInput(const unsigned char* data, size_t size)
 {
-    constexpr size_t NUM_LIMB_BITS = proof_system::GoblinTranslatorCircuitBuilder::NUM_LIMB_BITS;
+    constexpr size_t NUM_LIMB_BITS = bb::GoblinTranslatorCircuitBuilder::NUM_LIMB_BITS;
     constexpr size_t WIDE_LIMB_BYTES = 2 * NUM_LIMB_BITS / 8;
     constexpr size_t TOTAL_SIZE = 1 + 5 * sizeof(numeric::uint256_t) + 2 * WIDE_LIMB_BYTES;
     char buffer[32] = { 0 };
@@ -32,10 +32,10 @@ extern "C" int LLVMFuzzerTestOneInput(const unsigned char* data, size_t size)
     memcpy(buffer, data + 1 + 5 * sizeof(uint256_t) + WIDE_LIMB_BYTES, WIDE_LIMB_BYTES);
     Fr z_2 = Fr(*(uint256_t*)(buffer));
 
-    proof_system::GoblinTranslatorCircuitBuilder::AccumulationInput single_accumulation_step =
-        proof_system::generate_witness_values(op, p_x_lo, p_x_hi, p_y_lo, p_y_hi, z_1, z_2, previous_accumulator, v, x);
+    bb::GoblinTranslatorCircuitBuilder::AccumulationInput single_accumulation_step =
+        bb::generate_witness_values(op, p_x_lo, p_x_hi, p_y_lo, p_y_hi, z_1, z_2, previous_accumulator, v, x);
 
-    auto circuit_builder = proof_system::GoblinTranslatorCircuitBuilder(v, x);
+    auto circuit_builder = bb::GoblinTranslatorCircuitBuilder(v, x);
     circuit_builder.create_accumulation_gate(single_accumulation_step);
     if (!circuit_builder.check_circuit()) {
         return 1;
diff --git a/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.cpp b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.cpp
index 089521b36fbe..84a6b0b5105c 100644
--- a/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.cpp
+++ b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.cpp
@@ -8,7 +8,7 @@
 using namespace bb;
 using namespace crypto;
 
-namespace proof_system {
+namespace bb {
 
 template <typename FF> void GoblinUltraCircuitBuilder_<FF>::finalize_circuit()
 {
@@ -540,4 +540,4 @@ template <typename FF> bool GoblinUltraCircuitBuilder_<FF>::check_circuit()
 }
 
 template class GoblinUltraCircuitBuilder_<bb::fr>;
-} // namespace proof_system
\ No newline at end of file
+} // namespace bb
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.hpp b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.hpp
index 75813993f5a9..072a7d10357d 100644
--- a/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.hpp
+++ b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.hpp
@@ -3,7 +3,7 @@
 #include "barretenberg/proof_system/op_queue/ecc_op_queue.hpp"
 #include "ultra_circuit_builder.hpp"
 
-namespace proof_system {
+namespace bb {
 
 using namespace bb;
 
@@ -195,4 +195,4 @@ template <typename FF> class GoblinUltraCircuitBuilder_ : public UltraCircuitBui
     bool check_circuit();
 };
 using GoblinUltraCircuitBuilder = GoblinUltraCircuitBuilder_<bb::fr>;
-} // namespace proof_system
+} // namespace bb
diff --git a/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.test.cpp b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.test.cpp
index 2225fe5e9edd..927f563626cf 100644
--- a/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.test.cpp
@@ -6,7 +6,7 @@ using namespace bb;
 namespace {
 auto& engine = numeric::random::get_debug_engine();
 }
-namespace proof_system {
+namespace bb {
 
 TEST(GoblinUltraCircuitBuilder, CopyConstructor)
 {
@@ -157,4 +157,4 @@ TEST(GoblinUltraCircuitBuilder, GoblinEccOpQueueUltraOps)
     }
 }
 
-} // namespace proof_system
\ No newline at end of file
+} // namespace bb
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/standard_circuit_builder.cpp b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/standard_circuit_builder.cpp
index 78766044dc65..fd8500a0a711 100644
--- a/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/standard_circuit_builder.cpp
+++ b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/standard_circuit_builder.cpp
@@ -9,7 +9,7 @@
 
 using namespace bb;
 
-namespace proof_system {
+namespace bb {
 
 /**
  * Create an addition gate.
@@ -561,4 +561,4 @@ template <typename FF> msgpack::sbuffer StandardCircuitBuilder_<FF>::export_circ
 template class StandardCircuitBuilder_<bb::fr>;
 template class StandardCircuitBuilder_<grumpkin::fr>;
 
-} // namespace proof_system
\ No newline at end of file
+} // namespace bb
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/standard_circuit_builder.hpp b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/standard_circuit_builder.hpp
index 27676ace4788..9f0bdc141de5 100644
--- a/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/standard_circuit_builder.hpp
+++ b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/standard_circuit_builder.hpp
@@ -7,7 +7,7 @@
 #include "circuit_builder_base.hpp"
 #include <array>
 
-namespace proof_system {
+namespace bb {
 
 template <typename FF> class StandardCircuitBuilder_ : public CircuitBuilderBase<FF> {
   public:
@@ -148,4 +148,4 @@ template <typename FF> class StandardCircuitBuilder_ : public CircuitBuilderBase
 
 using StandardCircuitBuilder = StandardCircuitBuilder_<bb::fr>;
 using StandardGrumpkinCircuitBuilder = StandardCircuitBuilder_<grumpkin::fr>;
-} // namespace proof_system
+} // namespace bb
diff --git a/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/standard_circuit_builder.test.cpp b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/standard_circuit_builder.test.cpp
index ac14ff7a5545..9a05d8fea16a 100644
--- a/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/standard_circuit_builder.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/standard_circuit_builder.test.cpp
@@ -4,7 +4,7 @@
 #include <gtest/gtest.h>
 
 using namespace bb;
-using namespace proof_system;
+using namespace bb;
 
 namespace {
 auto& engine = numeric::random::get_debug_engine();
diff --git a/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/toy_avm/toy_avm_circuit_builder.test.cpp b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/toy_avm/toy_avm_circuit_builder.test.cpp
index bb34be27fd5d..2049cf001a3c 100644
--- a/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/toy_avm/toy_avm_circuit_builder.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/toy_avm/toy_avm_circuit_builder.test.cpp
@@ -20,8 +20,8 @@ namespace toy_avm_circuit_builder_tests {
 TEST(ToyAVMCircuitBuilder, BaseCase)
 {
 
-    using FF = proof_system::honk::flavor::ToyFlavor::FF;
-    using Builder = proof_system::ToyCircuitBuilder;
+    using FF = bb::honk::flavor::ToyFlavor::FF;
+    using Builder = bb::ToyCircuitBuilder;
     using Row = Builder::Row;
     Builder circuit_builder;
 
diff --git a/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.cpp b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.cpp
index cb764ccd454a..0865a71323c7 100644
--- a/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.cpp
+++ b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.cpp
@@ -12,7 +12,7 @@
 
 using namespace bb;
 
-namespace proof_system {
+namespace bb {
 
 template <typename Arithmetization> void UltraCircuitBuilder_<Arithmetization>::finalize_circuit()
 {
@@ -1514,7 +1514,7 @@ std::array<uint32_t, 2> UltraCircuitBuilder_<Arithmetization>::decompose_non_nat
  * @details The data queued represents a non-native field multiplication identity a * b = q * p + r,
  * where a, b, q, r are all emulated non-native field elements that are each split across 4 distinct witness variables.
  *
- * Without this queue some functions, such as proof_system::plonk::stdlib::element::multiple_montgomery_ladder, would
+ * Without this queue some functions, such as bb::plonk::stdlib::element::multiple_montgomery_ladder, would
  * duplicate non-native field operations, which can be quite expensive. We queue up these operations, and remove
  * duplicates in the circuit finishing stage of the proving key computation.
  *
@@ -3489,4 +3489,4 @@ template class UltraCircuitBuilder_<arithmetization::UltraHonk<bb::fr>>;
 // To enable this we need to template plookup
 // template class UltraCircuitBuilder_<grumpkin::fr>;
 
-} // namespace proof_system
+} // namespace bb
diff --git a/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp
index 50d2defb1378..b6e285c984b5 100644
--- a/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp
+++ b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp
@@ -12,7 +12,7 @@
 #include "circuit_builder_base.hpp"
 #include <optional>
 
-namespace proof_system {
+namespace bb {
 
 template <typename FF> struct non_native_field_witnesses {
     // first 4 array elements = limbs
@@ -1167,4 +1167,4 @@ class UltraCircuitBuilder_ : public CircuitBuilderBase<typename Arithmetization:
     bool check_circuit();
 };
 using UltraCircuitBuilder = UltraCircuitBuilder_<arithmetization::Ultra<bb::fr>>;
-} // namespace proof_system
+} // namespace bb
diff --git a/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.test.cpp b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.test.cpp
index b1c3bae14f5c..8605db48b4ab 100644
--- a/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.test.cpp
@@ -7,7 +7,7 @@ using namespace bb;
 namespace {
 auto& engine = numeric::random::get_debug_engine();
 }
-namespace proof_system {
+namespace bb {
 using plookup::ColumnIdx;
 using plookup::MultiTableId;
 
@@ -648,7 +648,7 @@ TEST(ultra_circuit_constructor, non_native_field_multiplication)
     const auto q_indices = get_limb_witness_indices(split_into_limbs(uint256_t(q)));
     const auto r_indices = get_limb_witness_indices(split_into_limbs(uint256_t(r)));
 
-    proof_system::non_native_field_witnesses<fr> inputs{
+    bb::non_native_field_witnesses<fr> inputs{
         a_indices, b_indices, q_indices, r_indices, modulus_limbs, fr(uint256_t(modulus)),
     };
     const auto [lo_1_idx, hi_1_idx] = circuit_constructor.evaluate_non_native_field_multiplication(inputs);
@@ -849,4 +849,4 @@ TEST(ultra_circuit_constructor, check_circuit_showcase)
     EXPECT_EQ(circuit_constructor.check_circuit(), true);
 }
 
-} // namespace proof_system
\ No newline at end of file
+} // namespace bb
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/proof_system/composer/composer_lib.hpp b/barretenberg/cpp/src/barretenberg/proof_system/composer/composer_lib.hpp
index dbfaf5888219..2312f3983a8f 100644
--- a/barretenberg/cpp/src/barretenberg/proof_system/composer/composer_lib.hpp
+++ b/barretenberg/cpp/src/barretenberg/proof_system/composer/composer_lib.hpp
@@ -4,7 +4,7 @@
 
 #include <memory>
 
-namespace proof_system {
+namespace bb {
 
 /**
  * @brief Construct selector polynomials from circuit selector information and put into polynomial cache
@@ -145,4 +145,4 @@ std::vector<typename Flavor::Polynomial> construct_wire_polynomials_base(
     }
     return wire_polynomials;
 }
-} // namespace proof_system
+} // namespace bb
diff --git a/barretenberg/cpp/src/barretenberg/proof_system/composer/composer_lib.test.cpp b/barretenberg/cpp/src/barretenberg/proof_system/composer/composer_lib.test.cpp
index be9d251a123d..1f2aac2b46f0 100644
--- a/barretenberg/cpp/src/barretenberg/proof_system/composer/composer_lib.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/proof_system/composer/composer_lib.test.cpp
@@ -6,7 +6,7 @@
 #include <array>
 #include <gtest/gtest.h>
 
-namespace proof_system::test_composer_lib {
+namespace bb::test_composer_lib {
 
 class ComposerLibTests : public ::testing::Test {
   protected:
@@ -60,4 +60,4 @@ TEST_F(ComposerLibTests, ConstructSelectors)
     EXPECT_EQ(proving_key.q_c[3 + offset], 20);
 }
 
-} // namespace proof_system::test_composer_lib
+} // namespace bb::test_composer_lib
diff --git a/barretenberg/cpp/src/barretenberg/proof_system/composer/permutation_lib.hpp b/barretenberg/cpp/src/barretenberg/proof_system/composer/permutation_lib.hpp
index 3e89a8cd20b5..1748c0faf755 100644
--- a/barretenberg/cpp/src/barretenberg/proof_system/composer/permutation_lib.hpp
+++ b/barretenberg/cpp/src/barretenberg/proof_system/composer/permutation_lib.hpp
@@ -24,7 +24,7 @@
 
 // TODO(Cody): very little code is shared; should split this up into plonk/honk files.
 
-namespace proof_system {
+namespace bb {
 
 /**
  * @brief cycle_node represents the index of a value of the circuit.
@@ -527,4 +527,4 @@ void compute_honk_generalized_sigma_permutations(const typename Flavor::CircuitB
         proving_key->get_id_polynomials(), mapping.ids, proving_key);
 }
 
-} // namespace proof_system
+} // namespace bb
diff --git a/barretenberg/cpp/src/barretenberg/proof_system/composer/permutation_lib.test.cpp b/barretenberg/cpp/src/barretenberg/proof_system/composer/permutation_lib.test.cpp
index b03fd49ee062..0ebd08ea3821 100644
--- a/barretenberg/cpp/src/barretenberg/proof_system/composer/permutation_lib.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/proof_system/composer/permutation_lib.test.cpp
@@ -6,7 +6,7 @@
 #include <array>
 #include <gtest/gtest.h>
 
-namespace proof_system::test_composer_lib {
+namespace bb::test_composer_lib {
 
 class PermutationHelperTests : public ::testing::Test {
   protected:
@@ -90,4 +90,4 @@ TEST_F(PermutationHelperTests, ComputeStandardAuxPolynomials)
     compute_first_and_last_lagrange_polynomials<Flavor>(proving_key);
 }
 
-} // namespace proof_system::test_composer_lib
+} // namespace bb::test_composer_lib
diff --git a/barretenberg/cpp/src/barretenberg/proof_system/library/grand_product_delta.hpp b/barretenberg/cpp/src/barretenberg/proof_system/library/grand_product_delta.hpp
index 9ce1b29a3a48..c49d5e278d3f 100644
--- a/barretenberg/cpp/src/barretenberg/proof_system/library/grand_product_delta.hpp
+++ b/barretenberg/cpp/src/barretenberg/proof_system/library/grand_product_delta.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <span>
-namespace proof_system::honk {
+namespace bb::honk {
 
 /**
  * @brief Compute the correction term for the permutation argument.
@@ -83,4 +83,4 @@ Field compute_lookup_grand_product_delta(const Field& beta, const Field& gamma,
     return gamma_by_one_plus_beta.pow(domain_size);           // (γ(1 + β))^n
 }
 
-} // namespace proof_system::honk
\ No newline at end of file
+} // namespace bb::honk
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/proof_system/library/grand_product_library.hpp b/barretenberg/cpp/src/barretenberg/proof_system/library/grand_product_library.hpp
index 93f0cf5b9cf4..b131c0c2e7bb 100644
--- a/barretenberg/cpp/src/barretenberg/proof_system/library/grand_product_library.hpp
+++ b/barretenberg/cpp/src/barretenberg/proof_system/library/grand_product_library.hpp
@@ -7,7 +7,7 @@
 #include "barretenberg/relations/relation_parameters.hpp"
 #include <typeinfo>
 
-namespace proof_system::honk::grand_product_library {
+namespace bb::honk::grand_product_library {
 
 // TODO(luke): This contains utilities for grand product computation and is not specific to the permutation grand
 // product. Update comments accordingly.
@@ -50,7 +50,7 @@ namespace proof_system::honk::grand_product_library {
 template <typename Flavor, typename GrandProdRelation>
 void compute_grand_product(const size_t circuit_size,
                            typename Flavor::ProverPolynomials& full_polynomials,
-                           proof_system::RelationParameters<typename Flavor::FF>& relation_parameters)
+                           bb::RelationParameters<typename Flavor::FF>& relation_parameters)
 {
     using FF = typename Flavor::FF;
     using Polynomial = typename Flavor::Polynomial;
@@ -144,7 +144,7 @@ void compute_grand_product(const size_t circuit_size,
 template <typename Flavor>
 void compute_grand_products(std::shared_ptr<typename Flavor::ProvingKey>& key,
                             typename Flavor::ProverPolynomials& full_polynomials,
-                            proof_system::RelationParameters<typename Flavor::FF>& relation_parameters)
+                            bb::RelationParameters<typename Flavor::FF>& relation_parameters)
 {
     using GrandProductRelations = typename Flavor::GrandProductRelations;
     using FF = typename Flavor::FF;
@@ -167,4 +167,4 @@ void compute_grand_products(std::shared_ptr<typename Flavor::ProvingKey>& key,
     });
 }
 
-} // namespace proof_system::honk::grand_product_library
\ No newline at end of file
+} // namespace bb::honk::grand_product_library
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/proof_system/library/grand_product_library.test.cpp b/barretenberg/cpp/src/barretenberg/proof_system/library/grand_product_library.test.cpp
index 8b40faff394e..e78684c82c7c 100644
--- a/barretenberg/cpp/src/barretenberg/proof_system/library/grand_product_library.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/proof_system/library/grand_product_library.test.cpp
@@ -7,7 +7,7 @@
 #include "barretenberg/srs/factories/file_crs_factory.hpp"
 #include <gtest/gtest.h>
 
-using namespace proof_system::honk;
+using namespace bb::honk;
 namespace grand_product_library_tests {
 
 template <class FF> class GrandProductTests : public testing::Test {
@@ -81,7 +81,7 @@ template <class FF> class GrandProductTests : public testing::Test {
         auto beta = FF::random_element();
         auto gamma = FF::random_element();
 
-        proof_system::RelationParameters<FF> params{
+        bb::RelationParameters<FF> params{
             .eta = 0,
             .beta = beta,
             .gamma = gamma,
@@ -91,8 +91,8 @@ template <class FF> class GrandProductTests : public testing::Test {
 
         typename Flavor::ProverPolynomials prover_polynomials;
         for (auto [prover_poly, key_poly] : zip_view(prover_polynomials.get_unshifted(), proving_key->get_all())) {
-            ASSERT(proof_system::flavor_get_label(prover_polynomials, prover_poly) ==
-                   proof_system::flavor_get_label(*proving_key, key_poly));
+            ASSERT(bb::flavor_get_label(prover_polynomials, prover_poly) ==
+                   bb::flavor_get_label(*proving_key, key_poly));
             prover_poly = key_poly.share();
         }
 
@@ -101,7 +101,7 @@ template <class FF> class GrandProductTests : public testing::Test {
         using LHS =
             typename std::tuple_element<PERMUTATION_RELATION_INDEX, typename Flavor::GrandProductRelations>::type;
         ASSERT(Flavor::NUM_WIRES == 4);
-        using RHS = typename proof_system::UltraPermutationRelation<FF>;
+        using RHS = typename bb::UltraPermutationRelation<FF>;
         static_assert(std::same_as<LHS, RHS>);
         grand_product_library::compute_grand_product<Flavor, RHS>(
             proving_key->circuit_size, prover_polynomials, params);
@@ -232,7 +232,7 @@ template <class FF> class GrandProductTests : public testing::Test {
         auto gamma = FF::random_element();
         auto eta = FF::random_element();
 
-        proof_system::RelationParameters<FF> params{
+        bb::RelationParameters<FF> params{
             .eta = eta,
             .beta = beta,
             .gamma = gamma,
@@ -242,14 +242,14 @@ template <class FF> class GrandProductTests : public testing::Test {
 
         typename Flavor::ProverPolynomials prover_polynomials;
         for (auto [prover_poly, key_poly] : zip_view(prover_polynomials.get_unshifted(), proving_key->get_all())) {
-            ASSERT(proof_system::flavor_get_label(prover_polynomials, prover_poly) ==
-                   proof_system::flavor_get_label(*proving_key, key_poly));
+            ASSERT(bb::flavor_get_label(prover_polynomials, prover_poly) ==
+                   bb::flavor_get_label(*proving_key, key_poly));
             prover_poly = key_poly.share();
         }
         for (auto [prover_poly, key_poly] :
              zip_view(prover_polynomials.get_shifted(), proving_key->get_to_be_shifted())) {
-            ASSERT(proof_system::flavor_get_label(prover_polynomials, prover_poly) ==
-                   proof_system::flavor_get_label(*proving_key, key_poly) + "_shift");
+            ASSERT(bb::flavor_get_label(prover_polynomials, prover_poly) ==
+                   bb::flavor_get_label(*proving_key, key_poly) + "_shift");
             prover_poly = key_poly.shifted();
         }
         // Test a few assignments
@@ -260,7 +260,7 @@ template <class FF> class GrandProductTests : public testing::Test {
         // Method 1: Compute z_lookup using the prover library method
         constexpr size_t LOOKUP_RELATION_INDEX = 1;
         using LHS = typename std::tuple_element<LOOKUP_RELATION_INDEX, typename Flavor::GrandProductRelations>::type;
-        using RHS = proof_system::LookupRelation<FF>;
+        using RHS = bb::LookupRelation<FF>;
         static_assert(std::same_as<LHS, RHS>);
         grand_product_library::compute_grand_product<Flavor, RHS>(
             proving_key->circuit_size, prover_polynomials, params);
diff --git a/barretenberg/cpp/src/barretenberg/proof_system/op_queue/ecc_op_queue.hpp b/barretenberg/cpp/src/barretenberg/proof_system/op_queue/ecc_op_queue.hpp
index 5e905d2f7692..1caa057f8584 100644
--- a/barretenberg/cpp/src/barretenberg/proof_system/op_queue/ecc_op_queue.hpp
+++ b/barretenberg/cpp/src/barretenberg/proof_system/op_queue/ecc_op_queue.hpp
@@ -3,7 +3,7 @@
 #include "barretenberg/ecc/curves/bn254/bn254.hpp"
 #include "barretenberg/proof_system/circuit_builder/eccvm/eccvm_builder_types.hpp"
 
-namespace proof_system {
+namespace bb {
 
 enum EccOpCode { NULL_OP, ADD_ACCUM, MUL_ACCUM, EQUALITY };
 
@@ -26,7 +26,7 @@ class ECCOpQueue {
     Point accumulator = point_at_infinity;
 
   public:
-    using ECCVMOperation = proof_system_eccvm::VMOperation<Curve::Group>;
+    using ECCVMOperation = bb_eccvm::VMOperation<Curve::Group>;
     std::vector<ECCVMOperation> raw_ops;
     std::array<std::vector<Fr>, 4> ultra_ops; // ops encoded in the width-4 Ultra format
 
@@ -209,4 +209,4 @@ class ECCOpQueue {
     }
 };
 
-} // namespace proof_system
+} // namespace bb
diff --git a/barretenberg/cpp/src/barretenberg/proof_system/op_queue/ecc_op_queue.test.cpp b/barretenberg/cpp/src/barretenberg/proof_system/op_queue/ecc_op_queue.test.cpp
index 89f70c937117..2df97e0e8100 100644
--- a/barretenberg/cpp/src/barretenberg/proof_system/op_queue/ecc_op_queue.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/proof_system/op_queue/ecc_op_queue.test.cpp
@@ -1,7 +1,7 @@
 #include "barretenberg/proof_system/op_queue/ecc_op_queue.hpp"
 #include <gtest/gtest.h>
 
-namespace proof_system::test_flavor {
+namespace bb::test_flavor {
 TEST(ECCOpQueueTest, Basic)
 {
     ECCOpQueue op_queue;
@@ -37,4 +37,4 @@ TEST(ECCOpQueueTest, InternalAccumulatorCorrectness)
     EXPECT_TRUE(op_queue.get_accumulator().is_point_at_infinity());
 }
 
-} // namespace proof_system::test_flavor
+} // namespace bb::test_flavor
diff --git a/barretenberg/cpp/src/barretenberg/proof_system/polynomial_store/polynomial_store.cpp b/barretenberg/cpp/src/barretenberg/proof_system/polynomial_store/polynomial_store.cpp
index bc45811207e0..d23a6106444e 100644
--- a/barretenberg/cpp/src/barretenberg/proof_system/polynomial_store/polynomial_store.cpp
+++ b/barretenberg/cpp/src/barretenberg/proof_system/polynomial_store/polynomial_store.cpp
@@ -6,7 +6,7 @@
 #include <string>
 #include <unordered_map>
 
-namespace proof_system {
+namespace bb {
 
 template <typename Fr> void PolynomialStore<Fr>::put(std::string const& key, Polynomial&& value)
 {
@@ -73,4 +73,4 @@ template <typename Fr> void PolynomialStore<Fr>::print()
 
 template class PolynomialStore<bb::fr>;
 
-} // namespace proof_system
\ No newline at end of file
+} // namespace bb
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/proof_system/polynomial_store/polynomial_store.hpp b/barretenberg/cpp/src/barretenberg/proof_system/polynomial_store/polynomial_store.hpp
index 8ed842f56fdc..c18103fefc97 100644
--- a/barretenberg/cpp/src/barretenberg/proof_system/polynomial_store/polynomial_store.hpp
+++ b/barretenberg/cpp/src/barretenberg/proof_system/polynomial_store/polynomial_store.hpp
@@ -7,7 +7,7 @@
 #include <string>
 #include <unordered_map>
 
-namespace proof_system {
+namespace bb {
 
 template <typename Fr> class PolynomialStore {
   private:
@@ -44,4 +44,4 @@ template <typename Fr> class PolynomialStore {
     typename std::unordered_map<std::string, Polynomial>::const_iterator end() const { return polynomial_map.end(); }
 };
 
-} // namespace proof_system
+} // namespace bb
diff --git a/barretenberg/cpp/src/barretenberg/proof_system/polynomial_store/polynomial_store.test.cpp b/barretenberg/cpp/src/barretenberg/proof_system/polynomial_store/polynomial_store.test.cpp
index 125be65ec3e3..649dd60191ae 100644
--- a/barretenberg/cpp/src/barretenberg/proof_system/polynomial_store/polynomial_store.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/proof_system/polynomial_store/polynomial_store.test.cpp
@@ -4,25 +4,21 @@
 #include "barretenberg/polynomials/polynomial.hpp"
 #include "polynomial_store.hpp"
 
-namespace proof_system {
-
 using namespace bb;
-using Fr = bb::fr;
-using Polynomial = bb::Polynomial<Fr>;
 
 // Test basic put and get functionality
 TEST(PolynomialStore, PutThenGet)
 {
-    PolynomialStore<Fr> polynomial_store;
+    PolynomialStore<fr> polynomial_store;
 
     // Instantiate a polynomial with random coefficients
-    Polynomial poly(1024);
+    Polynomial<fr> poly(1024);
     for (auto& coeff : poly) {
-        coeff = Fr::random_element();
+        coeff = fr::random_element();
     }
 
     // Make a copy for comparison after original is moved into container
-    Polynomial poly_copy(poly);
+    Polynomial<fr> poly_copy(poly);
 
     // Move the poly into the container
     polynomial_store.put("id", std::move(poly));
@@ -34,9 +30,9 @@ TEST(PolynomialStore, PutThenGet)
 // Ensure that attempt to access non-existent key throws out_of_range exception
 TEST(PolynomialStore, NonexistentKey)
 {
-    PolynomialStore<Fr> polynomial_store;
+    PolynomialStore<fr> polynomial_store;
 
-    polynomial_store.put("id_1", Polynomial(100));
+    polynomial_store.put("id_1", Polynomial<fr>(100));
 
     polynomial_store.get("id_1"); // no problem!
 
@@ -46,14 +42,14 @@ TEST(PolynomialStore, NonexistentKey)
 // Ensure correct calculation of volume in bytes
 TEST(PolynomialStore, Volume)
 {
-    PolynomialStore<Fr> polynomial_store;
+    PolynomialStore<fr> polynomial_store;
     size_t size1 = 100;
     size_t size2 = 10;
     size_t size3 = 5000;
 
-    Polynomial poly1(size1);
-    Polynomial poly2(size2);
-    Polynomial poly3(size3);
+    Polynomial<fr> poly1(size1);
+    Polynomial<fr> poly2(size2);
+    Polynomial<fr> poly3(size3);
 
     polynomial_store.put("id_1", std::move(poly1));
     polynomial_store.put("id_2", std::move(poly2));
@@ -61,7 +57,7 @@ TEST(PolynomialStore, Volume)
 
     // polynomial_store.print();
 
-    size_t bytes_expected = sizeof(Fr) * (size1 + size2 + size3);
+    size_t bytes_expected = sizeof(fr) * (size1 + size2 + size3);
 
     EXPECT_EQ(polynomial_store.get_size_in_bytes(), bytes_expected);
 }
@@ -69,25 +65,23 @@ TEST(PolynomialStore, Volume)
 // Ensure that the remove method erases entry and reduces memory
 TEST(PolynomialStore, Remove)
 {
-    PolynomialStore<Fr> polynomial_store;
+    PolynomialStore<fr> polynomial_store;
     size_t size1 = 100;
     size_t size2 = 500;
-    Polynomial poly1(size1);
-    Polynomial poly2(size2);
+    Polynomial<fr> poly1(size1);
+    Polynomial<fr> poly2(size2);
 
     polynomial_store.put("id_1", std::move(poly1));
     polynomial_store.put("id_2", std::move(poly2));
 
-    size_t bytes_expected = sizeof(Fr) * (size1 + size2);
+    size_t bytes_expected = sizeof(fr) * (size1 + size2);
 
     EXPECT_EQ(polynomial_store.get_size_in_bytes(), bytes_expected);
 
     polynomial_store.remove("id_1");
 
-    bytes_expected -= sizeof(Fr) * size1;
+    bytes_expected -= sizeof(fr) * size1;
 
     EXPECT_THROW(polynomial_store.get("id_1"), std::out_of_range);
     EXPECT_EQ(polynomial_store.get_size_in_bytes(), bytes_expected);
 }
-
-} // namespace proof_system
diff --git a/barretenberg/cpp/src/barretenberg/proof_system/polynomial_store/polynomial_store_cache.cpp b/barretenberg/cpp/src/barretenberg/proof_system/polynomial_store/polynomial_store_cache.cpp
index 7bf6912c651d..176a64aafc27 100644
--- a/barretenberg/cpp/src/barretenberg/proof_system/polynomial_store/polynomial_store_cache.cpp
+++ b/barretenberg/cpp/src/barretenberg/proof_system/polynomial_store/polynomial_store_cache.cpp
@@ -1,6 +1,6 @@
 #include "./polynomial_store_cache.hpp"
 
-namespace proof_system {
+namespace bb {
 
 PolynomialStoreCache::PolynomialStoreCache()
     : max_cache_size_(40)
@@ -52,4 +52,4 @@ void PolynomialStoreCache::purge_until_free()
     }
 }
 
-} // namespace proof_system
\ No newline at end of file
+} // namespace bb
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/proof_system/polynomial_store/polynomial_store_cache.hpp b/barretenberg/cpp/src/barretenberg/proof_system/polynomial_store/polynomial_store_cache.hpp
index 82869745cdb0..78b1c7a3e142 100644
--- a/barretenberg/cpp/src/barretenberg/proof_system/polynomial_store/polynomial_store_cache.hpp
+++ b/barretenberg/cpp/src/barretenberg/proof_system/polynomial_store/polynomial_store_cache.hpp
@@ -4,7 +4,7 @@
 #include <map>
 #include <string>
 
-namespace proof_system {
+namespace bb {
 
 /**
  * A cache that wraps an underlying external store. It favours holding the largest polynomials in it's cache up
@@ -35,4 +35,4 @@ class PolynomialStoreCache {
     void purge_until_free();
 };
 
-} // namespace proof_system
\ No newline at end of file
+} // namespace bb
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/proof_system/polynomial_store/polynomial_store_wasm.cpp b/barretenberg/cpp/src/barretenberg/proof_system/polynomial_store/polynomial_store_wasm.cpp
index 663ab8389655..058770a1dceb 100644
--- a/barretenberg/cpp/src/barretenberg/proof_system/polynomial_store/polynomial_store_wasm.cpp
+++ b/barretenberg/cpp/src/barretenberg/proof_system/polynomial_store/polynomial_store_wasm.cpp
@@ -2,7 +2,7 @@
 #include "barretenberg/env/data_store.hpp"
 #include "barretenberg/polynomials/polynomial.hpp"
 
-namespace proof_system {
+namespace bb {
 
 template <typename Fr> void PolynomialStoreWasm<Fr>::put(std::string const& key, Polynomial&& value)
 {
@@ -21,4 +21,4 @@ template <typename Fr> bb::Polynomial<Fr> PolynomialStoreWasm<Fr>::get(std::stri
 
 template class PolynomialStoreWasm<bb::fr>;
 
-} // namespace proof_system
\ No newline at end of file
+} // namespace bb
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/proof_system/polynomial_store/polynomial_store_wasm.hpp b/barretenberg/cpp/src/barretenberg/proof_system/polynomial_store/polynomial_store_wasm.hpp
index fc428a0e032f..ce33260821b9 100644
--- a/barretenberg/cpp/src/barretenberg/proof_system/polynomial_store/polynomial_store_wasm.hpp
+++ b/barretenberg/cpp/src/barretenberg/proof_system/polynomial_store/polynomial_store_wasm.hpp
@@ -3,7 +3,7 @@
 #include <string>
 #include <unordered_map>
 
-namespace proof_system {
+namespace bb {
 
 template <typename Fr> class PolynomialStoreWasm {
   private:
@@ -16,4 +16,4 @@ template <typename Fr> class PolynomialStoreWasm {
     Polynomial get(std::string const& key);
 };
 
-} // namespace proof_system
+} // namespace bb
diff --git a/barretenberg/cpp/src/barretenberg/proof_system/types/circuit_type.hpp b/barretenberg/cpp/src/barretenberg/proof_system/types/circuit_type.hpp
index f1fb50c36274..aaab7a8809f4 100644
--- a/barretenberg/cpp/src/barretenberg/proof_system/types/circuit_type.hpp
+++ b/barretenberg/cpp/src/barretenberg/proof_system/types/circuit_type.hpp
@@ -2,10 +2,10 @@
 #include <concepts>
 #include <cstdint>
 
-namespace proof_system {
+namespace bb {
 // TODO(#731): Changing the explicit value of these enum elements breaks brittle and outdated tests in circuits/cpp.
 enum class CircuitType : uint32_t { STANDARD = 0, ULTRA = 2, UNDEFINED = 3 };
 
 template <typename T, typename... U>
 concept IsAnyOf = (std::same_as<T, U> || ...);
-} // namespace proof_system
\ No newline at end of file
+} // namespace bb
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/proof_system/types/merkle_hash_type.hpp b/barretenberg/cpp/src/barretenberg/proof_system/types/merkle_hash_type.hpp
index a04446a185af..33adbd44e66a 100644
--- a/barretenberg/cpp/src/barretenberg/proof_system/types/merkle_hash_type.hpp
+++ b/barretenberg/cpp/src/barretenberg/proof_system/types/merkle_hash_type.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-namespace proof_system::merkle {
+namespace bb::merkle {
 // TODO(Cody) Get rid of this?
 enum HashType { FIXED_BASE_PEDERSEN, LOOKUP_PEDERSEN };
-} // namespace proof_system::merkle
\ No newline at end of file
+} // namespace bb::merkle
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/proof_system/types/pedersen_commitment_type.hpp b/barretenberg/cpp/src/barretenberg/proof_system/types/pedersen_commitment_type.hpp
index aa62edc5a670..0976ebee71f2 100644
--- a/barretenberg/cpp/src/barretenberg/proof_system/types/pedersen_commitment_type.hpp
+++ b/barretenberg/cpp/src/barretenberg/proof_system/types/pedersen_commitment_type.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-namespace proof_system::pedersen {
+namespace bb::pedersen {
 // TODO(Cody) Get rid of this?
 enum CommitmentType { FIXED_BASE_PEDERSEN, LOOKUP_PEDERSEN };
-} // namespace proof_system::pedersen
\ No newline at end of file
+} // namespace bb::pedersen
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/protogalaxy/combiner.test.cpp b/barretenberg/cpp/src/barretenberg/protogalaxy/combiner.test.cpp
index 25d25c7808a0..c1367e624141 100644
--- a/barretenberg/cpp/src/barretenberg/protogalaxy/combiner.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/protogalaxy/combiner.test.cpp
@@ -6,12 +6,12 @@
 #include "barretenberg/sumcheck/instance/instances.hpp"
 #include <gtest/gtest.h>
 
-using namespace proof_system::honk;
+using namespace bb::honk;
 namespace bb::test_protogalaxy_prover {
-using Flavor = proof_system::honk::flavor::Ultra;
+using Flavor = bb::honk::flavor::Ultra;
 using Polynomial = typename Flavor::Polynomial;
 using FF = typename Flavor::FF;
-using RelationParameters = proof_system::RelationParameters<FF>;
+using RelationParameters = bb::RelationParameters<FF>;
 using PowPolynomial = bb::PowPolynomial<FF>;
 
 // TODO(https://github.com/AztecProtocol/barretenberg/issues/780): Improve combiner tests to check more than the
@@ -43,7 +43,7 @@ TEST(Protogalaxy, CombinerOn2Instances)
 
             for (size_t idx = 0; idx < NUM_INSTANCES; idx++) {
                 auto instance = std::make_shared<ProverInstance>();
-                auto prover_polynomials = proof_system::honk::get_sequential_prover_polynomials<Flavor>(
+                auto prover_polynomials = bb::honk::get_sequential_prover_polynomials<Flavor>(
                     /*log_circuit_size=*/1, idx * 128);
                 restrict_to_standard_arithmetic_relation(prover_polynomials);
                 instance->prover_polynomials = std::move(prover_polynomials);
@@ -75,7 +75,7 @@ TEST(Protogalaxy, CombinerOn2Instances)
 
             for (size_t idx = 0; idx < NUM_INSTANCES; idx++) {
                 auto instance = std::make_shared<ProverInstance>();
-                auto prover_polynomials = proof_system::honk::get_zero_prover_polynomials<Flavor>(
+                auto prover_polynomials = bb::honk::get_zero_prover_polynomials<Flavor>(
                     /*log_circuit_size=*/1);
                 restrict_to_standard_arithmetic_relation(prover_polynomials);
                 instance->prover_polynomials = std::move(prover_polynomials);
@@ -166,7 +166,7 @@ TEST(Protogalaxy, CombinerOn4Instances)
 
         for (size_t idx = 0; idx < NUM_INSTANCES; idx++) {
             auto instance = std::make_shared<ProverInstance>();
-            auto prover_polynomials = proof_system::honk::get_zero_prover_polynomials<Flavor>(
+            auto prover_polynomials = bb::honk::get_zero_prover_polynomials<Flavor>(
                 /*log_circuit_size=*/1);
             instance->prover_polynomials = std::move(prover_polynomials);
             instance->instance_size = 2;
diff --git a/barretenberg/cpp/src/barretenberg/protogalaxy/decider_prover.cpp b/barretenberg/cpp/src/barretenberg/protogalaxy/decider_prover.cpp
index eea53966aa67..d1e835e2a29e 100644
--- a/barretenberg/cpp/src/barretenberg/protogalaxy/decider_prover.cpp
+++ b/barretenberg/cpp/src/barretenberg/protogalaxy/decider_prover.cpp
@@ -1,7 +1,7 @@
 #include "decider_prover.hpp"
 #include "barretenberg/sumcheck/sumcheck.hpp"
 
-namespace proof_system::honk {
+namespace bb::honk {
 
 /**
  * Create DeciderProver_ from an accumulator.
@@ -118,4 +118,4 @@ template <UltraFlavor Flavor> plonk::proof& DeciderProver_<Flavor>::construct_pr
 template class DeciderProver_<honk::flavor::Ultra>;
 template class DeciderProver_<honk::flavor::GoblinUltra>;
 
-} // namespace proof_system::honk
+} // namespace bb::honk
diff --git a/barretenberg/cpp/src/barretenberg/protogalaxy/decider_prover.hpp b/barretenberg/cpp/src/barretenberg/protogalaxy/decider_prover.hpp
index b550c37bebf4..5d962a6b71ca 100644
--- a/barretenberg/cpp/src/barretenberg/protogalaxy/decider_prover.hpp
+++ b/barretenberg/cpp/src/barretenberg/protogalaxy/decider_prover.hpp
@@ -8,7 +8,7 @@
 #include "barretenberg/sumcheck/sumcheck_output.hpp"
 #include "barretenberg/transcript/transcript.hpp"
 
-namespace proof_system::honk {
+namespace bb::honk {
 
 template <UltraFlavor Flavor> class DeciderProver_ {
     using FF = typename Flavor::FF;
@@ -39,7 +39,7 @@ template <UltraFlavor Flavor> class DeciderProver_ {
 
     std::shared_ptr<Transcript> transcript;
 
-    proof_system::RelationParameters<FF> relation_parameters;
+    bb::RelationParameters<FF> relation_parameters;
 
     CommitmentLabels commitment_labels;
 
@@ -57,4 +57,4 @@ template <UltraFlavor Flavor> class DeciderProver_ {
 
 using DeciderProver = DeciderProver_<honk::flavor::Ultra>;
 
-} // namespace proof_system::honk
+} // namespace bb::honk
diff --git a/barretenberg/cpp/src/barretenberg/protogalaxy/decider_verifier.cpp b/barretenberg/cpp/src/barretenberg/protogalaxy/decider_verifier.cpp
index dd7c313322a7..8ab1eb8c06ea 100644
--- a/barretenberg/cpp/src/barretenberg/protogalaxy/decider_verifier.cpp
+++ b/barretenberg/cpp/src/barretenberg/protogalaxy/decider_verifier.cpp
@@ -5,9 +5,9 @@
 #include "barretenberg/transcript/transcript.hpp"
 
 using namespace bb;
-using namespace proof_system::honk::sumcheck;
+using namespace bb::honk::sumcheck;
 
-namespace proof_system::honk {
+namespace bb::honk {
 
 template <typename Flavor>
 DeciderVerifier_<Flavor>::DeciderVerifier_(const std::shared_ptr<Transcript>& transcript,
@@ -110,4 +110,4 @@ template <typename Flavor> bool DeciderVerifier_<Flavor>::verify_proof(const plo
 template class DeciderVerifier_<honk::flavor::Ultra>;
 template class DeciderVerifier_<honk::flavor::GoblinUltra>;
 
-} // namespace proof_system::honk
+} // namespace bb::honk
diff --git a/barretenberg/cpp/src/barretenberg/protogalaxy/decider_verifier.hpp b/barretenberg/cpp/src/barretenberg/protogalaxy/decider_verifier.hpp
index 06a5eb6a1b8d..d3637372d3d6 100644
--- a/barretenberg/cpp/src/barretenberg/protogalaxy/decider_verifier.hpp
+++ b/barretenberg/cpp/src/barretenberg/protogalaxy/decider_verifier.hpp
@@ -5,7 +5,7 @@
 #include "barretenberg/srs/global_crs.hpp"
 #include "barretenberg/sumcheck/sumcheck.hpp"
 
-namespace proof_system::honk {
+namespace bb::honk {
 template <typename Flavor> class DeciderVerifier_ {
     using FF = typename Flavor::FF;
     using Commitment = typename Flavor::Commitment;
@@ -28,4 +28,4 @@ template <typename Flavor> class DeciderVerifier_ {
 
 using DeciderVerifier = DeciderVerifier_<honk::flavor::Ultra>;
 
-} // namespace proof_system::honk
+} // namespace bb::honk
diff --git a/barretenberg/cpp/src/barretenberg/protogalaxy/folding_result.hpp b/barretenberg/cpp/src/barretenberg/protogalaxy/folding_result.hpp
index 171f9b38a781..d3a4dbf8e65c 100644
--- a/barretenberg/cpp/src/barretenberg/protogalaxy/folding_result.hpp
+++ b/barretenberg/cpp/src/barretenberg/protogalaxy/folding_result.hpp
@@ -2,7 +2,7 @@
 #include "barretenberg/flavor/flavor.hpp"
 #include "barretenberg/relations/relation_parameters.hpp"
 #include "barretenberg/sumcheck/instance/prover_instance.hpp"
-namespace proof_system::honk {
+namespace bb::honk {
 /**
  * @brief The result of running the Protogalaxy prover containing a new accumulator (relaxed instance) as well as the
  * proof data to instantiate the verifier transcript.
@@ -15,4 +15,4 @@ template <class Flavor> struct FoldingResult {
     // TODO(https://github.com/AztecProtocol/barretenberg/issues/656): turn folding data into a struct
     std::vector<uint8_t> folding_data;
 };
-} // namespace proof_system::honk
\ No newline at end of file
+} // namespace bb::honk
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/protogalaxy/protogalaxy_prover.cpp b/barretenberg/cpp/src/barretenberg/protogalaxy/protogalaxy_prover.cpp
index afd3b70396fc..6a138c51a516 100644
--- a/barretenberg/cpp/src/barretenberg/protogalaxy/protogalaxy_prover.cpp
+++ b/barretenberg/cpp/src/barretenberg/protogalaxy/protogalaxy_prover.cpp
@@ -1,6 +1,6 @@
 #include "protogalaxy_prover.hpp"
 #include "barretenberg/flavor/flavor.hpp"
-namespace proof_system::honk {
+namespace bb::honk {
 template <class ProverInstances>
 void ProtoGalaxyProver_<ProverInstances>::finalise_and_send_instance(std::shared_ptr<Instance> instance,
                                                                      const std::string& domain_separator)
@@ -233,7 +233,7 @@ std::shared_ptr<typename ProverInstances::Instance> ProtoGalaxyProver_<ProverIns
     // Evaluate each relation parameter univariate at challenge to obtain the folded relation parameters and send to
     // the verifier
     auto& combined_relation_parameters = instances.relation_parameters;
-    auto folded_relation_parameters = proof_system::RelationParameters<FF>{
+    auto folded_relation_parameters = bb::RelationParameters<FF>{
         combined_relation_parameters.eta.evaluate(challenge),
         combined_relation_parameters.beta.evaluate(challenge),
         combined_relation_parameters.gamma.evaluate(challenge),
@@ -309,4 +309,4 @@ FoldingResult<typename ProverInstances::Flavor> ProtoGalaxyProver_<ProverInstanc
 
 template class ProtoGalaxyProver_<ProverInstances_<honk::flavor::Ultra, 2>>;
 template class ProtoGalaxyProver_<ProverInstances_<honk::flavor::GoblinUltra, 2>>;
-} // namespace proof_system::honk
\ No newline at end of file
+} // namespace bb::honk
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/protogalaxy/protogalaxy_prover.hpp b/barretenberg/cpp/src/barretenberg/protogalaxy/protogalaxy_prover.hpp
index 3d689561d413..5a0794c3dd78 100644
--- a/barretenberg/cpp/src/barretenberg/protogalaxy/protogalaxy_prover.hpp
+++ b/barretenberg/cpp/src/barretenberg/protogalaxy/protogalaxy_prover.hpp
@@ -11,7 +11,7 @@
 #include "barretenberg/relations/utils.hpp"
 #include "barretenberg/sumcheck/instance/instances.hpp"
 
-namespace proof_system::honk {
+namespace bb::honk {
 template <class ProverInstances_> class ProtoGalaxyProver_ {
   public:
     using ProverInstances = ProverInstances_;
@@ -434,4 +434,4 @@ template <class ProverInstances_> class ProtoGalaxyProver_ {
         const FF& compressed_perturbator);
 };
 
-} // namespace proof_system::honk
+} // namespace bb::honk
diff --git a/barretenberg/cpp/src/barretenberg/protogalaxy/protogalaxy_verifier.cpp b/barretenberg/cpp/src/barretenberg/protogalaxy/protogalaxy_verifier.cpp
index 871d4ad23b8b..0e33b27cd77d 100644
--- a/barretenberg/cpp/src/barretenberg/protogalaxy/protogalaxy_verifier.cpp
+++ b/barretenberg/cpp/src/barretenberg/protogalaxy/protogalaxy_verifier.cpp
@@ -1,6 +1,6 @@
 #include "protogalaxy_verifier.hpp"
 #include "barretenberg/proof_system/library/grand_product_delta.hpp"
-namespace proof_system::honk {
+namespace bb::honk {
 
 template <class VerifierInstances>
 void ProtoGalaxyVerifier_<VerifierInstances>::receive_accumulator(const std::shared_ptr<Instance>& inst,
@@ -227,7 +227,7 @@ bool ProtoGalaxyVerifier_<VerifierInstances>::verify_folding_proof(std::vector<u
         auto next_alpha = transcript->template receive_from_prover<FF>("next_alpha_" + std::to_string(alpha_idx));
         verified = verified & (alpha == next_alpha);
     }
-    auto expected_parameters = proof_system::RelationParameters<FF>{};
+    auto expected_parameters = bb::RelationParameters<FF>{};
     for (size_t inst_idx = 0; inst_idx < VerifierInstances::NUM; inst_idx++) {
         auto instance = instances[inst_idx];
         expected_parameters.eta += instance->relation_parameters.eta * lagranges[inst_idx];
@@ -275,4 +275,4 @@ bool ProtoGalaxyVerifier_<VerifierInstances>::verify_folding_proof(std::vector<u
 
 template class ProtoGalaxyVerifier_<VerifierInstances_<honk::flavor::Ultra, 2>>;
 template class ProtoGalaxyVerifier_<VerifierInstances_<honk::flavor::GoblinUltra, 2>>;
-} // namespace proof_system::honk
\ No newline at end of file
+} // namespace bb::honk
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/protogalaxy/protogalaxy_verifier.hpp b/barretenberg/cpp/src/barretenberg/protogalaxy/protogalaxy_verifier.hpp
index f1caf1dfb342..6a3f62889c82 100644
--- a/barretenberg/cpp/src/barretenberg/protogalaxy/protogalaxy_verifier.hpp
+++ b/barretenberg/cpp/src/barretenberg/protogalaxy/protogalaxy_verifier.hpp
@@ -6,7 +6,7 @@
 #include "barretenberg/sumcheck/instance/instances.hpp"
 #include "barretenberg/transcript/transcript.hpp"
 
-namespace proof_system::honk {
+namespace bb::honk {
 template <class VerifierInstances> class ProtoGalaxyVerifier_ {
   public:
     using Flavor = typename VerifierInstances::Flavor;
@@ -86,4 +86,4 @@ template <class VerifierInstances> class ProtoGalaxyVerifier_ {
     bool verify_folding_proof(std::vector<uint8_t>);
 };
 
-} // namespace proof_system::honk
+} // namespace bb::honk
diff --git a/barretenberg/cpp/src/barretenberg/relations/auxiliary_relation.hpp b/barretenberg/cpp/src/barretenberg/relations/auxiliary_relation.hpp
index ab01091632cb..0e97cb1ded28 100644
--- a/barretenberg/cpp/src/barretenberg/relations/auxiliary_relation.hpp
+++ b/barretenberg/cpp/src/barretenberg/relations/auxiliary_relation.hpp
@@ -2,7 +2,7 @@
 #include "barretenberg/numeric/uint256/uint256.hpp"
 #include "barretenberg/relations/relation_types.hpp"
 
-namespace proof_system {
+namespace bb {
 
 template <typename FF_> class AuxiliaryRelationImpl {
   public:
@@ -337,4 +337,4 @@ template <typename FF_> class AuxiliaryRelationImpl {
 };
 
 template <typename FF> using AuxiliaryRelation = Relation<AuxiliaryRelationImpl<FF>>;
-} // namespace proof_system
+} // namespace bb
diff --git a/barretenberg/cpp/src/barretenberg/relations/databus_lookup_relation.hpp b/barretenberg/cpp/src/barretenberg/relations/databus_lookup_relation.hpp
index 5508a72c292c..77a1f0b37441 100644
--- a/barretenberg/cpp/src/barretenberg/relations/databus_lookup_relation.hpp
+++ b/barretenberg/cpp/src/barretenberg/relations/databus_lookup_relation.hpp
@@ -8,7 +8,7 @@
 #include "barretenberg/polynomials/univariate.hpp"
 #include "barretenberg/relations/relation_types.hpp"
 
-namespace proof_system {
+namespace bb {
 
 template <typename FF_> class DatabusLookupRelationImpl {
   public:
@@ -183,4 +183,4 @@ template <typename FF_> class DatabusLookupRelationImpl {
 
 template <typename FF> using DatabusLookupRelation = Relation<DatabusLookupRelationImpl<FF>>;
 
-} // namespace proof_system
+} // namespace bb
diff --git a/barretenberg/cpp/src/barretenberg/relations/ecc_op_queue_relation.hpp b/barretenberg/cpp/src/barretenberg/relations/ecc_op_queue_relation.hpp
index b854769de9c1..c958296832f7 100644
--- a/barretenberg/cpp/src/barretenberg/relations/ecc_op_queue_relation.hpp
+++ b/barretenberg/cpp/src/barretenberg/relations/ecc_op_queue_relation.hpp
@@ -1,7 +1,7 @@
 #pragma once
 #include "barretenberg/relations/relation_types.hpp"
 
-namespace proof_system {
+namespace bb {
 
 template <typename FF_> class EccOpQueueRelationImpl {
   public:
@@ -107,4 +107,4 @@ template <typename FF_> class EccOpQueueRelationImpl {
 
 template <typename FF> using EccOpQueueRelation = Relation<EccOpQueueRelationImpl<FF>>;
 
-} // namespace proof_system
+} // namespace bb
diff --git a/barretenberg/cpp/src/barretenberg/relations/ecc_vm/ecc_lookup_relation.cpp b/barretenberg/cpp/src/barretenberg/relations/ecc_vm/ecc_lookup_relation.cpp
index 52c08f9c3d1c..72bb7b89bc16 100644
--- a/barretenberg/cpp/src/barretenberg/relations/ecc_vm/ecc_lookup_relation.cpp
+++ b/barretenberg/cpp/src/barretenberg/relations/ecc_vm/ecc_lookup_relation.cpp
@@ -3,7 +3,7 @@
 #include "barretenberg/honk/proof_system/logderivative_library.hpp"
 #include "ecc_msm_relation.hpp"
 
-namespace proof_system::honk::sumcheck {
+namespace bb::honk::sumcheck {
 
 /**
  * @brief Expression for ECCVM lookup tables.
@@ -32,4 +32,4 @@ void ECCVMLookupRelationImpl<FF>::accumulate(ContainerOverSubrelations& accumula
 template class ECCVMLookupRelationImpl<grumpkin::fr>;
 DEFINE_SUMCHECK_RELATION_CLASS(ECCVMLookupRelationImpl, flavor::ECCVM);
 
-} // namespace proof_system::honk::sumcheck
+} // namespace bb::honk::sumcheck
diff --git a/barretenberg/cpp/src/barretenberg/relations/ecc_vm/ecc_lookup_relation.hpp b/barretenberg/cpp/src/barretenberg/relations/ecc_vm/ecc_lookup_relation.hpp
index aa3afffc87f0..e41177bedd41 100644
--- a/barretenberg/cpp/src/barretenberg/relations/ecc_vm/ecc_lookup_relation.hpp
+++ b/barretenberg/cpp/src/barretenberg/relations/ecc_vm/ecc_lookup_relation.hpp
@@ -7,7 +7,7 @@
 #include "barretenberg/polynomials/univariate.hpp"
 #include "barretenberg/relations/relation_types.hpp"
 
-namespace proof_system::honk::sumcheck {
+namespace bb::honk::sumcheck {
 
 template <typename FF_> class ECCVMLookupRelationImpl {
   public:
@@ -247,4 +247,4 @@ template <typename FF_> class ECCVMLookupRelationImpl {
 
 template <typename FF> using ECCVMLookupRelation = Relation<ECCVMLookupRelationImpl<FF>>;
 
-} // namespace proof_system::honk::sumcheck
+} // namespace bb::honk::sumcheck
diff --git a/barretenberg/cpp/src/barretenberg/relations/ecc_vm/ecc_msm_relation.cpp b/barretenberg/cpp/src/barretenberg/relations/ecc_vm/ecc_msm_relation.cpp
index 3d2a28d80ac4..7cb0f9b088f7 100644
--- a/barretenberg/cpp/src/barretenberg/relations/ecc_vm/ecc_msm_relation.cpp
+++ b/barretenberg/cpp/src/barretenberg/relations/ecc_vm/ecc_msm_relation.cpp
@@ -2,7 +2,7 @@
 #include "barretenberg/flavor/ecc_vm.hpp"
 #include "barretenberg/flavor/relation_definitions.hpp"
 
-namespace proof_system::honk::sumcheck {
+namespace bb::honk::sumcheck {
 
 /**
  * @brief MSM relations that evaluate the Strauss multiscalar multiplication algorithm.
@@ -394,4 +394,4 @@ void ECCVMMSMRelationImpl<FF>::accumulate(ContainerOverSubrelations& accumulator
 template class ECCVMMSMRelationImpl<grumpkin::fr>;
 DEFINE_SUMCHECK_RELATION_CLASS(ECCVMMSMRelationImpl, flavor::ECCVM);
 
-} // namespace proof_system::honk::sumcheck
+} // namespace bb::honk::sumcheck
diff --git a/barretenberg/cpp/src/barretenberg/relations/ecc_vm/ecc_msm_relation.hpp b/barretenberg/cpp/src/barretenberg/relations/ecc_vm/ecc_msm_relation.hpp
index c611ea752f71..6011790fe5c5 100644
--- a/barretenberg/cpp/src/barretenberg/relations/ecc_vm/ecc_msm_relation.hpp
+++ b/barretenberg/cpp/src/barretenberg/relations/ecc_vm/ecc_msm_relation.hpp
@@ -1,7 +1,7 @@
 #pragma once
 #include "barretenberg/relations/relation_types.hpp"
 
-namespace proof_system::honk::sumcheck {
+namespace bb::honk::sumcheck {
 
 /**
  * @brief MSM relations that evaluate the Strauss multiscalar multiplication algorithm.
@@ -51,4 +51,4 @@ template <typename FF_> class ECCVMMSMRelationImpl {
 
 template <typename FF> using ECCVMMSMRelation = Relation<ECCVMMSMRelationImpl<FF>>;
 
-} // namespace proof_system::honk::sumcheck
+} // namespace bb::honk::sumcheck
diff --git a/barretenberg/cpp/src/barretenberg/relations/ecc_vm/ecc_point_table_relation.cpp b/barretenberg/cpp/src/barretenberg/relations/ecc_vm/ecc_point_table_relation.cpp
index 0b7a179fcbb6..57ca0bc7ea49 100644
--- a/barretenberg/cpp/src/barretenberg/relations/ecc_vm/ecc_point_table_relation.cpp
+++ b/barretenberg/cpp/src/barretenberg/relations/ecc_vm/ecc_point_table_relation.cpp
@@ -2,7 +2,7 @@
 #include "barretenberg/flavor/ecc_vm.hpp"
 #include "barretenberg/flavor/relation_definitions.hpp"
 
-namespace proof_system::honk::sumcheck {
+namespace bb::honk::sumcheck {
 
 /**
  * @brief ECCVMPointTableRelationImpl
@@ -175,4 +175,4 @@ void ECCVMPointTableRelationImpl<FF>::accumulate(ContainerOverSubrelations& accu
 template class ECCVMPointTableRelationImpl<grumpkin::fr>;
 DEFINE_SUMCHECK_RELATION_CLASS(ECCVMPointTableRelationImpl, flavor::ECCVM);
 
-} // namespace proof_system::honk::sumcheck
+} // namespace bb::honk::sumcheck
diff --git a/barretenberg/cpp/src/barretenberg/relations/ecc_vm/ecc_point_table_relation.hpp b/barretenberg/cpp/src/barretenberg/relations/ecc_vm/ecc_point_table_relation.hpp
index 4d78a80f0fb4..2d850420a94f 100644
--- a/barretenberg/cpp/src/barretenberg/relations/ecc_vm/ecc_point_table_relation.hpp
+++ b/barretenberg/cpp/src/barretenberg/relations/ecc_vm/ecc_point_table_relation.hpp
@@ -1,7 +1,7 @@
 #pragma once
 #include "barretenberg/relations/relation_types.hpp"
 
-namespace proof_system::honk::sumcheck {
+namespace bb::honk::sumcheck {
 
 /**
  * @brief ECCVMPointTableRelationImpl
@@ -30,4 +30,4 @@ template <typename FF_> class ECCVMPointTableRelationImpl {
 
 template <typename FF> using ECCVMPointTableRelation = Relation<ECCVMPointTableRelationImpl<FF>>;
 
-} // namespace proof_system::honk::sumcheck
+} // namespace bb::honk::sumcheck
diff --git a/barretenberg/cpp/src/barretenberg/relations/ecc_vm/ecc_set_relation.cpp b/barretenberg/cpp/src/barretenberg/relations/ecc_vm/ecc_set_relation.cpp
index 44fa81a26f82..7dea0fe450ee 100644
--- a/barretenberg/cpp/src/barretenberg/relations/ecc_vm/ecc_set_relation.cpp
+++ b/barretenberg/cpp/src/barretenberg/relations/ecc_vm/ecc_set_relation.cpp
@@ -2,7 +2,7 @@
 #include "barretenberg/flavor/relation_definitions.hpp"
 #include "ecc_msm_relation.hpp"
 
-namespace proof_system::honk::sumcheck {
+namespace bb::honk::sumcheck {
 
 /**
  * @brief Performs list-equivalence checks for the ECCVM
@@ -397,4 +397,4 @@ template class ECCVMSetRelationImpl<grumpkin::fr>;
 DEFINE_SUMCHECK_RELATION_CLASS(ECCVMSetRelationImpl, flavor::ECCVM);
 DEFINE_SUMCHECK_PERMUTATION_CLASS(ECCVMSetRelationImpl, flavor::ECCVM);
 
-} // namespace proof_system::honk::sumcheck
+} // namespace bb::honk::sumcheck
diff --git a/barretenberg/cpp/src/barretenberg/relations/ecc_vm/ecc_set_relation.hpp b/barretenberg/cpp/src/barretenberg/relations/ecc_vm/ecc_set_relation.hpp
index ca5a920eed4a..6d4add0f7f2e 100644
--- a/barretenberg/cpp/src/barretenberg/relations/ecc_vm/ecc_set_relation.hpp
+++ b/barretenberg/cpp/src/barretenberg/relations/ecc_vm/ecc_set_relation.hpp
@@ -7,7 +7,7 @@
 #include "barretenberg/polynomials/univariate.hpp"
 #include "barretenberg/relations/relation_types.hpp"
 
-namespace proof_system::honk::sumcheck {
+namespace bb::honk::sumcheck {
 
 template <typename FF_> class ECCVMSetRelationImpl {
   public:
@@ -46,4 +46,4 @@ template <typename FF_> class ECCVMSetRelationImpl {
 
 template <typename FF> using ECCVMSetRelation = Relation<ECCVMSetRelationImpl<FF>>;
 
-} // namespace proof_system::honk::sumcheck
+} // namespace bb::honk::sumcheck
diff --git a/barretenberg/cpp/src/barretenberg/relations/ecc_vm/ecc_transcript_relation.cpp b/barretenberg/cpp/src/barretenberg/relations/ecc_vm/ecc_transcript_relation.cpp
index 2057e678b5ca..40fa62f7591f 100644
--- a/barretenberg/cpp/src/barretenberg/relations/ecc_vm/ecc_transcript_relation.cpp
+++ b/barretenberg/cpp/src/barretenberg/relations/ecc_vm/ecc_transcript_relation.cpp
@@ -5,7 +5,7 @@
 #include "barretenberg/flavor/ecc_vm.hpp"
 #include "barretenberg/flavor/relation_definitions.hpp"
 
-namespace proof_system::honk::sumcheck {
+namespace bb::honk::sumcheck {
 
 /**
  * @brief ECCVMTranscriptRelationImpl evaluates the correctness of the ECCVM transcript columns
@@ -258,4 +258,4 @@ void ECCVMTranscriptRelationImpl<FF>::accumulate(ContainerOverSubrelations& accu
 template class ECCVMTranscriptRelationImpl<grumpkin::fr>;
 DEFINE_SUMCHECK_RELATION_CLASS(ECCVMTranscriptRelationImpl, flavor::ECCVM);
 
-} // namespace proof_system::honk::sumcheck
+} // namespace bb::honk::sumcheck
diff --git a/barretenberg/cpp/src/barretenberg/relations/ecc_vm/ecc_transcript_relation.hpp b/barretenberg/cpp/src/barretenberg/relations/ecc_vm/ecc_transcript_relation.hpp
index eb6536d8fdfa..b690db33a8db 100644
--- a/barretenberg/cpp/src/barretenberg/relations/ecc_vm/ecc_transcript_relation.hpp
+++ b/barretenberg/cpp/src/barretenberg/relations/ecc_vm/ecc_transcript_relation.hpp
@@ -4,7 +4,7 @@
 #include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp"
 #include "barretenberg/relations/relation_types.hpp"
 
-namespace proof_system::honk::sumcheck {
+namespace bb::honk::sumcheck {
 
 /**
  * @brief ECCVMTranscriptRelationImpl evaluates the correctness of the ECCVM transcript columns
@@ -55,4 +55,4 @@ template <typename FF_> class ECCVMTranscriptRelationImpl {
 
 template <typename FF> using ECCVMTranscriptRelation = Relation<ECCVMTranscriptRelationImpl<FF>>;
 
-} // namespace proof_system::honk::sumcheck
+} // namespace bb::honk::sumcheck
diff --git a/barretenberg/cpp/src/barretenberg/relations/ecc_vm/ecc_wnaf_relation.cpp b/barretenberg/cpp/src/barretenberg/relations/ecc_vm/ecc_wnaf_relation.cpp
index cde198625f89..82e832deb0d5 100644
--- a/barretenberg/cpp/src/barretenberg/relations/ecc_vm/ecc_wnaf_relation.cpp
+++ b/barretenberg/cpp/src/barretenberg/relations/ecc_vm/ecc_wnaf_relation.cpp
@@ -2,7 +2,7 @@
 #include "barretenberg/flavor/ecc_vm.hpp"
 #include "barretenberg/flavor/relation_definitions.hpp"
 
-namespace proof_system::honk::sumcheck {
+namespace bb::honk::sumcheck {
 
 /**
  * @brief ECCVMWnafRelationImpl evaluates relations that convert scalar multipliers into 4-bit WNAF slices
@@ -219,4 +219,4 @@ void ECCVMWnafRelationImpl<FF>::accumulate(ContainerOverSubrelations& accumulato
 template class ECCVMWnafRelationImpl<grumpkin::fr>;
 DEFINE_SUMCHECK_RELATION_CLASS(ECCVMWnafRelationImpl, flavor::ECCVM);
 
-} // namespace proof_system::honk::sumcheck
+} // namespace bb::honk::sumcheck
diff --git a/barretenberg/cpp/src/barretenberg/relations/ecc_vm/ecc_wnaf_relation.hpp b/barretenberg/cpp/src/barretenberg/relations/ecc_vm/ecc_wnaf_relation.hpp
index 2c66f7d4bd8f..22faa56f6fc4 100644
--- a/barretenberg/cpp/src/barretenberg/relations/ecc_vm/ecc_wnaf_relation.hpp
+++ b/barretenberg/cpp/src/barretenberg/relations/ecc_vm/ecc_wnaf_relation.hpp
@@ -1,7 +1,7 @@
 #pragma once
 #include "barretenberg/relations/relation_types.hpp"
 
-namespace proof_system::honk::sumcheck {
+namespace bb::honk::sumcheck {
 /**
  * @brief ECCVMWnafRelationImpl evaluates relations that convert scalar multipliers into 4-bit WNAF slices
  * @details Each WNAF slice is a 4-bit slice representing one of 16 integers { -15, -13, ..., 15 }
@@ -48,4 +48,4 @@ template <typename FF_> class ECCVMWnafRelationImpl {
 
 template <typename FF> using ECCVMWnafRelation = Relation<ECCVMWnafRelationImpl<FF>>;
 
-} // namespace proof_system::honk::sumcheck
+} // namespace bb::honk::sumcheck
diff --git a/barretenberg/cpp/src/barretenberg/relations/elliptic_relation.hpp b/barretenberg/cpp/src/barretenberg/relations/elliptic_relation.hpp
index 544457edb710..646400b5fd1e 100644
--- a/barretenberg/cpp/src/barretenberg/relations/elliptic_relation.hpp
+++ b/barretenberg/cpp/src/barretenberg/relations/elliptic_relation.hpp
@@ -3,7 +3,7 @@
 #include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp"
 #include "barretenberg/relations/relation_types.hpp"
 
-namespace proof_system {
+namespace bb {
 
 template <typename FF_> class EllipticRelationImpl {
   public:
@@ -96,4 +96,4 @@ template <typename FF_> class EllipticRelationImpl {
 };
 
 template <typename FF> using EllipticRelation = Relation<EllipticRelationImpl<FF>>;
-} // namespace proof_system
+} // namespace bb
diff --git a/barretenberg/cpp/src/barretenberg/relations/gen_perm_sort_relation.hpp b/barretenberg/cpp/src/barretenberg/relations/gen_perm_sort_relation.hpp
index b65e9c96a7f9..2da286ee3e2e 100644
--- a/barretenberg/cpp/src/barretenberg/relations/gen_perm_sort_relation.hpp
+++ b/barretenberg/cpp/src/barretenberg/relations/gen_perm_sort_relation.hpp
@@ -1,7 +1,7 @@
 #pragma once
 #include "barretenberg/relations/relation_types.hpp"
 
-namespace proof_system {
+namespace bb {
 
 template <typename FF_> class GenPermSortRelationImpl {
   public:
@@ -94,4 +94,4 @@ template <typename FF_> class GenPermSortRelationImpl {
 
 template <typename FF> using GenPermSortRelation = Relation<GenPermSortRelationImpl<FF>>;
 
-} // namespace proof_system
+} // namespace bb
diff --git a/barretenberg/cpp/src/barretenberg/relations/generated/AvmMini/avm_mini.hpp b/barretenberg/cpp/src/barretenberg/relations/generated/AvmMini/avm_mini.hpp
index 9b8b57bfd898..d78c623933c9 100644
--- a/barretenberg/cpp/src/barretenberg/relations/generated/AvmMini/avm_mini.hpp
+++ b/barretenberg/cpp/src/barretenberg/relations/generated/AvmMini/avm_mini.hpp
@@ -4,7 +4,7 @@
 #include "../../relation_types.hpp"
 #include "./declare_views.hpp"
 
-namespace proof_system::AvmMini_vm {
+namespace bb::AvmMini_vm {
 
 template <typename FF> struct Avm_miniRow {
     FF avmMini_rwa{};
@@ -423,4 +423,4 @@ template <typename FF_> class avm_miniImpl {
 
 template <typename FF> using avm_mini = Relation<avm_miniImpl<FF>>;
 
-} // namespace proof_system::AvmMini_vm
\ No newline at end of file
+} // namespace bb::AvmMini_vm
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/relations/generated/AvmMini/mem_trace.hpp b/barretenberg/cpp/src/barretenberg/relations/generated/AvmMini/mem_trace.hpp
index 4139d4b8bc39..abb9e8539782 100644
--- a/barretenberg/cpp/src/barretenberg/relations/generated/AvmMini/mem_trace.hpp
+++ b/barretenberg/cpp/src/barretenberg/relations/generated/AvmMini/mem_trace.hpp
@@ -4,7 +4,7 @@
 #include "../../relation_types.hpp"
 #include "./declare_views.hpp"
 
-namespace proof_system::AvmMini_vm {
+namespace bb::AvmMini_vm {
 
 template <typename FF> struct Mem_traceRow {
     FF memTrace_m_val{};
@@ -149,4 +149,4 @@ template <typename FF_> class mem_traceImpl {
 
 template <typename FF> using mem_trace = Relation<mem_traceImpl<FF>>;
 
-} // namespace proof_system::AvmMini_vm
\ No newline at end of file
+} // namespace bb::AvmMini_vm
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/relations/generated/Toy/lookup_xor.hpp b/barretenberg/cpp/src/barretenberg/relations/generated/Toy/lookup_xor.hpp
index 6311d2a8a052..40f6e5481a89 100644
--- a/barretenberg/cpp/src/barretenberg/relations/generated/Toy/lookup_xor.hpp
+++ b/barretenberg/cpp/src/barretenberg/relations/generated/Toy/lookup_xor.hpp
@@ -7,7 +7,7 @@
 #include <cstddef>
 #include <tuple>
 
-namespace proof_system::honk::sumcheck {
+namespace bb::honk::sumcheck {
 
 /**
  * @brief This class contains an example of how to set LookupSettings classes used by the
@@ -171,4 +171,4 @@ class lookup_xor_lookup_settings {
 template <typename FF_> using lookup_xor_relation = GenericLookupRelation<lookup_xor_lookup_settings, FF_>;
 template <typename FF_> using lookup_xor = GenericLookup<lookup_xor_lookup_settings, FF_>;
 
-} // namespace proof_system::honk::sumcheck
+} // namespace bb::honk::sumcheck
diff --git a/barretenberg/cpp/src/barretenberg/relations/generated/Toy/toy_avm.hpp b/barretenberg/cpp/src/barretenberg/relations/generated/Toy/toy_avm.hpp
index 2c1d114413fa..02b736fc92c7 100644
--- a/barretenberg/cpp/src/barretenberg/relations/generated/Toy/toy_avm.hpp
+++ b/barretenberg/cpp/src/barretenberg/relations/generated/Toy/toy_avm.hpp
@@ -4,7 +4,7 @@
 #include "../../relation_types.hpp"
 #include "./declare_views.hpp"
 
-namespace proof_system::Toy_vm {
+namespace bb::Toy_vm {
 
 template <typename FF> struct Toy_avmRow {
     FF toy_q_xor_table{};
@@ -64,4 +64,4 @@ template <typename FF_> class toy_avmImpl {
 
 template <typename FF> using toy_avm = Relation<toy_avmImpl<FF>>;
 
-} // namespace proof_system::Toy_vm
\ No newline at end of file
+} // namespace bb::Toy_vm
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/relations/generated/Toy/two_column_perm.hpp b/barretenberg/cpp/src/barretenberg/relations/generated/Toy/two_column_perm.hpp
index 29d31482d9c4..77391e221b03 100644
--- a/barretenberg/cpp/src/barretenberg/relations/generated/Toy/two_column_perm.hpp
+++ b/barretenberg/cpp/src/barretenberg/relations/generated/Toy/two_column_perm.hpp
@@ -7,7 +7,7 @@
 #include <cstddef>
 #include <tuple>
 
-namespace proof_system::honk::sumcheck {
+namespace bb::honk::sumcheck {
 
 class two_column_perm_permutation_settings {
   public:
@@ -91,4 +91,4 @@ template <typename FF_>
 using two_column_perm_relation = GenericPermutationRelation<two_column_perm_permutation_settings, FF_>;
 template <typename FF_> using two_column_perm = GenericPermutation<two_column_perm_permutation_settings, FF_>;
 
-} // namespace proof_system::honk::sumcheck
+} // namespace bb::honk::sumcheck
diff --git a/barretenberg/cpp/src/barretenberg/relations/generic_lookup/generic_lookup_relation.hpp b/barretenberg/cpp/src/barretenberg/relations/generic_lookup/generic_lookup_relation.hpp
index 44f7c590d012..ce779b7c0eba 100644
--- a/barretenberg/cpp/src/barretenberg/relations/generic_lookup/generic_lookup_relation.hpp
+++ b/barretenberg/cpp/src/barretenberg/relations/generic_lookup/generic_lookup_relation.hpp
@@ -24,7 +24,7 @@
 #include "barretenberg/polynomials/univariate.hpp"
 #include "barretenberg/relations/relation_types.hpp"
 
-namespace proof_system::honk::sumcheck {
+namespace bb::honk::sumcheck {
 /**
  * @brief Specifies positions of elements in the tuple of entities received from methods in the Settings class
  *
@@ -479,4 +479,4 @@ using GenericLookupRelation = Relation<GenericLookupRelationImpl<Settings, FF>>;
 
 template <typename Settings, typename FF> using GenericLookup = GenericLookupRelationImpl<Settings, FF>;
 
-} // namespace proof_system::honk::sumcheck
\ No newline at end of file
+} // namespace bb::honk::sumcheck
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/relations/generic_permutation/generic_permutation_relation.hpp b/barretenberg/cpp/src/barretenberg/relations/generic_permutation/generic_permutation_relation.hpp
index 3439aea9abf2..89ff480a9c58 100644
--- a/barretenberg/cpp/src/barretenberg/relations/generic_permutation/generic_permutation_relation.hpp
+++ b/barretenberg/cpp/src/barretenberg/relations/generic_permutation/generic_permutation_relation.hpp
@@ -15,7 +15,7 @@
 #include "barretenberg/polynomials/univariate.hpp"
 #include "barretenberg/relations/relation_types.hpp"
 
-namespace proof_system::honk::sumcheck {
+namespace bb::honk::sumcheck {
 /**
  * @brief Specifies positions of elements in the tuple of entities received from methods in the Settings class
  *
@@ -213,4 +213,4 @@ using GenericPermutationRelation = Relation<GenericPermutationRelationImpl<Setti
 
 template <typename Settings, typename FF> using GenericPermutation = GenericPermutationRelationImpl<Settings, FF>;
 
-} // namespace proof_system::honk::sumcheck
+} // namespace bb::honk::sumcheck
diff --git a/barretenberg/cpp/src/barretenberg/relations/lookup_relation.hpp b/barretenberg/cpp/src/barretenberg/relations/lookup_relation.hpp
index efca32c9b681..c4d1e9342ad1 100644
--- a/barretenberg/cpp/src/barretenberg/relations/lookup_relation.hpp
+++ b/barretenberg/cpp/src/barretenberg/relations/lookup_relation.hpp
@@ -1,7 +1,7 @@
 #pragma once
 #include "barretenberg/relations/relation_types.hpp"
 
-namespace proof_system {
+namespace bb {
 
 /**
  * @brief LookupRelationImpl defines the algebra for the lookup polynomial:
@@ -209,4 +209,4 @@ template <typename FF_> class LookupRelationImpl {
 
 template <typename FF> using LookupRelation = Relation<LookupRelationImpl<FF>>;
 
-} // namespace proof_system
\ No newline at end of file
+} // namespace bb
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/relations/nested_containers.hpp b/barretenberg/cpp/src/barretenberg/relations/nested_containers.hpp
index 2f30a94b7767..46f2d2463035 100644
--- a/barretenberg/cpp/src/barretenberg/relations/nested_containers.hpp
+++ b/barretenberg/cpp/src/barretenberg/relations/nested_containers.hpp
@@ -2,7 +2,7 @@
 #include "barretenberg/polynomials/univariate.hpp"
 #include <tuple>
 
-namespace proof_system {
+namespace bb {
 
 /**
  * @brief Generic templates for constructing a container of containers of varying length, where the various lengths are
@@ -40,4 +40,4 @@ using TupleOfValues = typename TupleOfContainersOverArray<ExtractValueType, FF,
 
 template <typename FF, auto LENGTHS> using ArrayOfValues = HomogeneousTupleToArray<TupleOfValues<FF, LENGTHS>>;
 
-} // namespace proof_system
\ No newline at end of file
+} // namespace bb
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/relations/nested_containers.test.cpp b/barretenberg/cpp/src/barretenberg/relations/nested_containers.test.cpp
index 8f5c1bba63b0..6a6e08d0ddff 100644
--- a/barretenberg/cpp/src/barretenberg/relations/nested_containers.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/relations/nested_containers.test.cpp
@@ -3,9 +3,9 @@
 #include "barretenberg/polynomials/univariate.hpp"
 #include <gtest/gtest.h>
 
-using namespace proof_system;
+using namespace bb;
 
-namespace proof_system::nested_contianers_tests {
+namespace bb::nested_contianers_tests {
 
 using FF = bb::fr;
 
@@ -23,4 +23,4 @@ TEST_F(NestedContainers, Univariate)
     EXPECT_EQ(std::get<2>(tuple), result2);
 }
 
-} // namespace proof_system::nested_contianers_tests
+} // namespace bb::nested_contianers_tests
diff --git a/barretenberg/cpp/src/barretenberg/relations/permutation_relation.hpp b/barretenberg/cpp/src/barretenberg/relations/permutation_relation.hpp
index 56cf0c4a59fd..d52fe2951ebc 100644
--- a/barretenberg/cpp/src/barretenberg/relations/permutation_relation.hpp
+++ b/barretenberg/cpp/src/barretenberg/relations/permutation_relation.hpp
@@ -1,7 +1,7 @@
 #pragma once
 #include "barretenberg/relations/relation_types.hpp"
 
-namespace proof_system {
+namespace bb {
 
 template <typename FF_> class UltraPermutationRelationImpl {
   public:
@@ -118,4 +118,4 @@ template <typename FF_> class UltraPermutationRelationImpl {
 
 template <typename FF> using UltraPermutationRelation = Relation<UltraPermutationRelationImpl<FF>>;
 
-} // namespace proof_system
+} // namespace bb
diff --git a/barretenberg/cpp/src/barretenberg/relations/poseidon2_external_relation.hpp b/barretenberg/cpp/src/barretenberg/relations/poseidon2_external_relation.hpp
index dc150d545ea5..f19ac3e37f34 100644
--- a/barretenberg/cpp/src/barretenberg/relations/poseidon2_external_relation.hpp
+++ b/barretenberg/cpp/src/barretenberg/relations/poseidon2_external_relation.hpp
@@ -1,6 +1,6 @@
 #pragma once
 #include "barretenberg/relations/relation_types.hpp"
-namespace proof_system {
+namespace bb {
 
 template <typename FF_> class Poseidon2ExternalRelationImpl {
   public:
@@ -114,4 +114,4 @@ template <typename FF_> class Poseidon2ExternalRelationImpl {
 };
 
 template <typename FF> using Poseidon2ExternalRelation = Relation<Poseidon2ExternalRelationImpl<FF>>;
-} // namespace proof_system
+} // namespace bb
diff --git a/barretenberg/cpp/src/barretenberg/relations/poseidon2_internal_relation.hpp b/barretenberg/cpp/src/barretenberg/relations/poseidon2_internal_relation.hpp
index e67ee8519d9e..c1db21caea79 100644
--- a/barretenberg/cpp/src/barretenberg/relations/poseidon2_internal_relation.hpp
+++ b/barretenberg/cpp/src/barretenberg/relations/poseidon2_internal_relation.hpp
@@ -2,7 +2,7 @@
 #include "barretenberg/crypto/poseidon2/poseidon2_params.hpp"
 #include "relation_types.hpp"
 
-namespace proof_system {
+namespace bb {
 
 template <typename FF_> class Poseidon2InternalRelationImpl {
   public:
@@ -91,7 +91,7 @@ template <typename FF_> class Poseidon2InternalRelationImpl {
         tmp *= scaling_factor;
         std::get<3>(evals) += tmp;
     };
-}; // namespace proof_system
+}; // namespace bb
 
 template <typename FF> using Poseidon2InternalRelation = Relation<Poseidon2InternalRelationImpl<FF>>;
-} // namespace proof_system
+} // namespace bb
diff --git a/barretenberg/cpp/src/barretenberg/relations/relation_manual.test.cpp b/barretenberg/cpp/src/barretenberg/relations/relation_manual.test.cpp
index 8b245739e66c..efe920903b92 100644
--- a/barretenberg/cpp/src/barretenberg/relations/relation_manual.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/relations/relation_manual.test.cpp
@@ -4,7 +4,7 @@
 #include "barretenberg/relations/relation_parameters.hpp"
 #include <gtest/gtest.h>
 
-namespace proof_system::relation_manual_tests {
+namespace bb::relation_manual_tests {
 
 using FF = bb::fr;
 
@@ -165,4 +165,4 @@ TEST_F(RelationManual, Poseidon2InternalRelationRandom)
     EXPECT_EQ(acc[2], 0);
     EXPECT_EQ(acc[3], 0);
 }
-}; // namespace proof_system::relation_manual_tests
\ No newline at end of file
+}; // namespace bb::relation_manual_tests
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/relations/relation_parameters.hpp b/barretenberg/cpp/src/barretenberg/relations/relation_parameters.hpp
index 2057f37c1150..cc638006c2fa 100644
--- a/barretenberg/cpp/src/barretenberg/relations/relation_parameters.hpp
+++ b/barretenberg/cpp/src/barretenberg/relations/relation_parameters.hpp
@@ -3,7 +3,7 @@
 #include "barretenberg/ecc/curves/bn254/fr.hpp"
 #include <array>
 
-namespace proof_system {
+namespace bb {
 
 /**
  * @brief Container for parameters used by the grand product (permutation, lookup) Honk relations
@@ -75,4 +75,4 @@ template <typename T> struct RelationParameters {
         return result;
     }
 };
-} // namespace proof_system
+} // namespace bb
diff --git a/barretenberg/cpp/src/barretenberg/relations/relation_types.hpp b/barretenberg/cpp/src/barretenberg/relations/relation_types.hpp
index 252905c086bc..be4b87322548 100644
--- a/barretenberg/cpp/src/barretenberg/relations/relation_types.hpp
+++ b/barretenberg/cpp/src/barretenberg/relations/relation_types.hpp
@@ -6,7 +6,7 @@
 template <typename T>
 concept IsField = std::same_as<T, bb::fr> /* || std::same_as<T, grumpkin::fr> */;
 
-namespace proof_system {
+namespace bb {
 
 /**
  * @brief A type to optionally extract a view of a relation parameter in a relation.
@@ -143,4 +143,4 @@ template <typename RelationImpl> class Relation : public RelationImpl {
     using UnivariateAccumulator0 = std::tuple_element_t<0, SumcheckTupleOfUnivariatesOverSubrelations>;
     using ValueAccumulator0 = std::tuple_element_t<0, SumcheckArrayOfValuesOverSubrelations>;
 };
-} // namespace proof_system
+} // namespace bb
diff --git a/barretenberg/cpp/src/barretenberg/relations/translator_vm/goblin_translator_relation_consistency.test.cpp b/barretenberg/cpp/src/barretenberg/relations/translator_vm/goblin_translator_relation_consistency.test.cpp
index af65f0a8aa65..617a6b49e8c2 100644
--- a/barretenberg/cpp/src/barretenberg/relations/translator_vm/goblin_translator_relation_consistency.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/relations/translator_vm/goblin_translator_relation_consistency.test.cpp
@@ -14,9 +14,9 @@
 #include "barretenberg/flavor/goblin_translator.hpp"
 #include <gtest/gtest.h>
 
-using namespace proof_system;
+using namespace bb;
 
-namespace proof_system::ultra_relation_consistency_tests {
+namespace bb::ultra_relation_consistency_tests {
 
 using Flavor = honk::flavor::GoblinTranslator;
 using FF = typename Flavor::FF;
@@ -948,4 +948,4 @@ TEST_F(GoblinTranslatorRelationConsistency, NonNativeFieldRelation)
     run_test(/*random_inputs=*/true);
 };
 
-} // namespace proof_system::ultra_relation_consistency_tests
+} // namespace bb::ultra_relation_consistency_tests
diff --git a/barretenberg/cpp/src/barretenberg/relations/translator_vm/translator_decomposition_relation.cpp b/barretenberg/cpp/src/barretenberg/relations/translator_vm/translator_decomposition_relation.cpp
index 056e6e0fe3e8..d2822cd9a6c4 100644
--- a/barretenberg/cpp/src/barretenberg/relations/translator_vm/translator_decomposition_relation.cpp
+++ b/barretenberg/cpp/src/barretenberg/relations/translator_vm/translator_decomposition_relation.cpp
@@ -1,7 +1,7 @@
 #include "barretenberg/relations/translator_vm/translator_decomposition_relation.hpp"
 #include "barretenberg/flavor/goblin_translator.hpp"
 
-namespace proof_system {
+namespace bb {
 
 /**
  * @brief Expression for decomposition of various values into smaller limbs or microlimbs.
@@ -619,4 +619,4 @@ void GoblinTranslatorDecompositionRelationImpl<FF>::accumulate(ContainerOverSubr
 template class GoblinTranslatorDecompositionRelationImpl<bb::fr>;
 DEFINE_SUMCHECK_RELATION_CLASS(GoblinTranslatorDecompositionRelationImpl, honk::flavor::GoblinTranslator);
 
-} // namespace proof_system
+} // namespace bb
diff --git a/barretenberg/cpp/src/barretenberg/relations/translator_vm/translator_decomposition_relation.hpp b/barretenberg/cpp/src/barretenberg/relations/translator_vm/translator_decomposition_relation.hpp
index 5f12ead36131..e79c88500629 100644
--- a/barretenberg/cpp/src/barretenberg/relations/translator_vm/translator_decomposition_relation.hpp
+++ b/barretenberg/cpp/src/barretenberg/relations/translator_vm/translator_decomposition_relation.hpp
@@ -2,7 +2,7 @@
 #include "barretenberg/numeric/uint256/uint256.hpp"
 #include "barretenberg/relations/relation_types.hpp"
 
-namespace proof_system {
+namespace bb {
 
 template <typename FF_> class GoblinTranslatorDecompositionRelationImpl {
   public:
@@ -90,4 +90,4 @@ template <typename FF_> class GoblinTranslatorDecompositionRelationImpl {
 template <typename FF>
 using GoblinTranslatorDecompositionRelation = Relation<GoblinTranslatorDecompositionRelationImpl<FF>>;
 
-} // namespace proof_system
+} // namespace bb
diff --git a/barretenberg/cpp/src/barretenberg/relations/translator_vm/translator_extra_relations.cpp b/barretenberg/cpp/src/barretenberg/relations/translator_vm/translator_extra_relations.cpp
index 173e4c4214b3..eaf08ada3db7 100644
--- a/barretenberg/cpp/src/barretenberg/relations/translator_vm/translator_extra_relations.cpp
+++ b/barretenberg/cpp/src/barretenberg/relations/translator_vm/translator_extra_relations.cpp
@@ -1,7 +1,7 @@
 #include "barretenberg/relations/translator_vm/translator_extra_relations.hpp"
 #include "barretenberg/flavor/goblin_translator.hpp"
 
-namespace proof_system {
+namespace bb {
 
 /**
  * @brief Expression for enforcing the value of the Opcode to be {0,1,2,3,4,8}
@@ -152,4 +152,4 @@ template class GoblinTranslatorAccumulatorTransferRelationImpl<bb::fr>;
 DEFINE_SUMCHECK_RELATION_CLASS(GoblinTranslatorOpcodeConstraintRelationImpl, honk::flavor::GoblinTranslator);
 DEFINE_SUMCHECK_RELATION_CLASS(GoblinTranslatorAccumulatorTransferRelationImpl, honk::flavor::GoblinTranslator);
 
-} // namespace proof_system
+} // namespace bb
diff --git a/barretenberg/cpp/src/barretenberg/relations/translator_vm/translator_extra_relations.hpp b/barretenberg/cpp/src/barretenberg/relations/translator_vm/translator_extra_relations.hpp
index ef93e9fc0eaa..d4d927ab4ee6 100644
--- a/barretenberg/cpp/src/barretenberg/relations/translator_vm/translator_extra_relations.hpp
+++ b/barretenberg/cpp/src/barretenberg/relations/translator_vm/translator_extra_relations.hpp
@@ -1,7 +1,7 @@
 #pragma once
 #include "barretenberg/relations/relation_types.hpp"
 
-namespace proof_system {
+namespace bb {
 
 template <typename FF_> class GoblinTranslatorOpcodeConstraintRelationImpl {
   public:
@@ -79,4 +79,4 @@ using GoblinTranslatorOpcodeConstraintRelation = Relation<GoblinTranslatorOpcode
 template <typename FF>
 using GoblinTranslatorAccumulatorTransferRelation = Relation<GoblinTranslatorAccumulatorTransferRelationImpl<FF>>;
 
-} // namespace proof_system
+} // namespace bb
diff --git a/barretenberg/cpp/src/barretenberg/relations/translator_vm/translator_gen_perm_sort_relation.cpp b/barretenberg/cpp/src/barretenberg/relations/translator_vm/translator_gen_perm_sort_relation.cpp
index 628701ffa147..24db1101cc34 100644
--- a/barretenberg/cpp/src/barretenberg/relations/translator_vm/translator_gen_perm_sort_relation.cpp
+++ b/barretenberg/cpp/src/barretenberg/relations/translator_vm/translator_gen_perm_sort_relation.cpp
@@ -1,7 +1,7 @@
 #include "barretenberg/relations/translator_vm/translator_gen_perm_sort_relation.hpp"
 #include "barretenberg/flavor/goblin_translator.hpp"
 
-namespace proof_system {
+namespace bb {
 
 /**
  * @brief Expression for the generalized permutation sort relation
@@ -129,4 +129,4 @@ void GoblinTranslatorGenPermSortRelationImpl<FF>::accumulate(ContainerOverSubrel
 template class GoblinTranslatorGenPermSortRelationImpl<bb::fr>;
 DEFINE_SUMCHECK_RELATION_CLASS(GoblinTranslatorGenPermSortRelationImpl, honk::flavor::GoblinTranslator);
 
-} // namespace proof_system
+} // namespace bb
diff --git a/barretenberg/cpp/src/barretenberg/relations/translator_vm/translator_gen_perm_sort_relation.hpp b/barretenberg/cpp/src/barretenberg/relations/translator_vm/translator_gen_perm_sort_relation.hpp
index 7966dda83fba..3212cc3925d8 100644
--- a/barretenberg/cpp/src/barretenberg/relations/translator_vm/translator_gen_perm_sort_relation.hpp
+++ b/barretenberg/cpp/src/barretenberg/relations/translator_vm/translator_gen_perm_sort_relation.hpp
@@ -1,7 +1,7 @@
 #pragma once
 #include "barretenberg/relations/relation_types.hpp"
 
-namespace proof_system {
+namespace bb {
 
 template <typename FF_> class GoblinTranslatorGenPermSortRelationImpl {
   public:
@@ -46,4 +46,4 @@ template <typename FF_> class GoblinTranslatorGenPermSortRelationImpl {
 template <typename FF>
 using GoblinTranslatorGenPermSortRelation = Relation<GoblinTranslatorGenPermSortRelationImpl<FF>>;
 
-} // namespace proof_system
+} // namespace bb
diff --git a/barretenberg/cpp/src/barretenberg/relations/translator_vm/translator_non_native_field_relation.cpp b/barretenberg/cpp/src/barretenberg/relations/translator_vm/translator_non_native_field_relation.cpp
index 37bfc28fa029..71ce173b8f35 100644
--- a/barretenberg/cpp/src/barretenberg/relations/translator_vm/translator_non_native_field_relation.cpp
+++ b/barretenberg/cpp/src/barretenberg/relations/translator_vm/translator_non_native_field_relation.cpp
@@ -1,7 +1,7 @@
 #include "barretenberg/relations/translator_vm/translator_non_native_field_relation.hpp"
 #include "barretenberg/flavor/goblin_translator.hpp"
 
-namespace proof_system {
+namespace bb {
 /**
  * @brief Expression for the computation of Goblin Translator accumulator in integers through 68-bit limbs and
  * native field (prime) limb
@@ -280,4 +280,4 @@ void GoblinTranslatorNonNativeFieldRelationImpl<FF>::accumulate(ContainerOverSub
 template class GoblinTranslatorNonNativeFieldRelationImpl<bb::fr>;
 DEFINE_SUMCHECK_RELATION_CLASS(GoblinTranslatorNonNativeFieldRelationImpl, honk::flavor::GoblinTranslator);
 
-} // namespace proof_system
+} // namespace bb
diff --git a/barretenberg/cpp/src/barretenberg/relations/translator_vm/translator_non_native_field_relation.hpp b/barretenberg/cpp/src/barretenberg/relations/translator_vm/translator_non_native_field_relation.hpp
index 33bd9cf32b44..f2e988319d64 100644
--- a/barretenberg/cpp/src/barretenberg/relations/translator_vm/translator_non_native_field_relation.hpp
+++ b/barretenberg/cpp/src/barretenberg/relations/translator_vm/translator_non_native_field_relation.hpp
@@ -2,7 +2,7 @@
 #include "barretenberg/ecc/curves/bn254/bn254.hpp"
 #include "barretenberg/relations/relation_types.hpp"
 
-namespace proof_system {
+namespace bb {
 
 template <typename FF_> class GoblinTranslatorNonNativeFieldRelationImpl {
   public:
@@ -87,4 +87,4 @@ template <typename FF_> class GoblinTranslatorNonNativeFieldRelationImpl {
 template <typename FF>
 using GoblinTranslatorNonNativeFieldRelation = Relation<GoblinTranslatorNonNativeFieldRelationImpl<FF>>;
 
-} // namespace proof_system
+} // namespace bb
diff --git a/barretenberg/cpp/src/barretenberg/relations/translator_vm/translator_permutation_relation.cpp b/barretenberg/cpp/src/barretenberg/relations/translator_vm/translator_permutation_relation.cpp
index 8b6078fb6aec..74d4364b8e0b 100644
--- a/barretenberg/cpp/src/barretenberg/relations/translator_vm/translator_permutation_relation.cpp
+++ b/barretenberg/cpp/src/barretenberg/relations/translator_vm/translator_permutation_relation.cpp
@@ -1,7 +1,7 @@
 #include "barretenberg/relations/translator_vm/translator_permutation_relation.hpp"
 #include "barretenberg/flavor/goblin_translator.hpp"
 
-namespace proof_system {
+namespace bb {
 
 /**
  * @brief Compute contribution of the goblin translator permutation relation for a given edge (internal function)
@@ -62,4 +62,4 @@ void GoblinTranslatorPermutationRelationImpl<FF>::accumulate(ContainerOverSubrel
 template class GoblinTranslatorPermutationRelationImpl<bb::fr>;
 DEFINE_SUMCHECK_RELATION_CLASS(GoblinTranslatorPermutationRelationImpl, honk::flavor::GoblinTranslator);
 
-} // namespace proof_system
+} // namespace bb
diff --git a/barretenberg/cpp/src/barretenberg/relations/translator_vm/translator_permutation_relation.hpp b/barretenberg/cpp/src/barretenberg/relations/translator_vm/translator_permutation_relation.hpp
index ac53a2fca695..8b304145c3b1 100644
--- a/barretenberg/cpp/src/barretenberg/relations/translator_vm/translator_permutation_relation.hpp
+++ b/barretenberg/cpp/src/barretenberg/relations/translator_vm/translator_permutation_relation.hpp
@@ -1,7 +1,7 @@
 #pragma once
 #include "barretenberg/relations/relation_types.hpp"
 
-namespace proof_system {
+namespace bb {
 
 template <typename FF_> class GoblinTranslatorPermutationRelationImpl {
   public:
@@ -83,4 +83,4 @@ template <typename FF_> class GoblinTranslatorPermutationRelationImpl {
 template <typename FF>
 using GoblinTranslatorPermutationRelation = Relation<GoblinTranslatorPermutationRelationImpl<FF>>;
 
-} // namespace proof_system
+} // namespace bb
diff --git a/barretenberg/cpp/src/barretenberg/relations/ultra_arithmetic_relation.hpp b/barretenberg/cpp/src/barretenberg/relations/ultra_arithmetic_relation.hpp
index 81d0c58582a6..898e3a7d1444 100644
--- a/barretenberg/cpp/src/barretenberg/relations/ultra_arithmetic_relation.hpp
+++ b/barretenberg/cpp/src/barretenberg/relations/ultra_arithmetic_relation.hpp
@@ -1,7 +1,7 @@
 #pragma once
 #include "barretenberg/relations/relation_types.hpp"
 
-namespace proof_system {
+namespace bb {
 
 template <typename FF_> class UltraArithmeticRelationImpl {
   public:
@@ -114,4 +114,4 @@ template <typename FF_> class UltraArithmeticRelationImpl {
 };
 
 template <typename FF> using UltraArithmeticRelation = Relation<UltraArithmeticRelationImpl<FF>>;
-} // namespace proof_system
+} // namespace bb
diff --git a/barretenberg/cpp/src/barretenberg/relations/ultra_relation_consistency.test.cpp b/barretenberg/cpp/src/barretenberg/relations/ultra_relation_consistency.test.cpp
index 2b4964bec5b5..8af4e374f349 100644
--- a/barretenberg/cpp/src/barretenberg/relations/ultra_relation_consistency.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/relations/ultra_relation_consistency.test.cpp
@@ -24,9 +24,9 @@
 #include "barretenberg/relations/ultra_arithmetic_relation.hpp"
 #include <gtest/gtest.h>
 
-using namespace proof_system;
+using namespace bb;
 
-namespace proof_system::ultra_relation_consistency_tests {
+namespace bb::ultra_relation_consistency_tests {
 
 using FF = bb::fr;
 struct InputElements {
@@ -681,4 +681,4 @@ TEST_F(UltraRelationConsistency, Poseidon2InternalRelation)
     run_test(/*random_inputs=*/true);
 };
 
-} // namespace proof_system::ultra_relation_consistency_tests
+} // namespace bb::ultra_relation_consistency_tests
diff --git a/barretenberg/cpp/src/barretenberg/relations/utils.hpp b/barretenberg/cpp/src/barretenberg/relations/utils.hpp
index e13799998756..331967359f3e 100644
--- a/barretenberg/cpp/src/barretenberg/relations/utils.hpp
+++ b/barretenberg/cpp/src/barretenberg/relations/utils.hpp
@@ -72,7 +72,7 @@ template <typename Flavor> class RelationUtils {
      * @param current_scalar power of the challenge
      */
     static void scale_univariates(auto& tuple, const RelationSeparator& challenges, FF& current_scalar)
-        requires proof_system::IsFoldingFlavor<Flavor>
+        requires bb::IsFoldingFlavor<Flavor>
     {
         size_t idx = 0;
         std::array<FF, NUM_SUBRELATIONS> tmp{ current_scalar };
@@ -92,7 +92,7 @@ template <typename Flavor> class RelationUtils {
      * @param current_scalar power of the challenge
      */
     static void scale_univariates(auto& tuple, const RelationSeparator& challenge, FF& current_scalar)
-        requires(!proof_system::IsFoldingFlavor<Flavor>)
+        requires(!bb::IsFoldingFlavor<Flavor>)
     {
         auto scale_by_consecutive_powers_of_challenge = [&]<size_t, size_t>(auto& element) {
             element *= current_scalar;
@@ -193,7 +193,7 @@ template <typename Flavor> class RelationUtils {
                                          const RelationSeparator& challenges,
                                          FF current_scalar,
                                          FF& result)
-        requires proof_system::IsFoldingFlavor<Flavor>
+        requires bb::IsFoldingFlavor<Flavor>
     {
         size_t idx = 0;
         std::array<FF, NUM_SUBRELATIONS> tmp{ current_scalar };
@@ -212,7 +212,7 @@ template <typename Flavor> class RelationUtils {
      * @param result Batched result
      */
     static void scale_and_batch_elements(auto& tuple, const RelationSeparator& challenge, FF current_scalar, FF& result)
-        requires(!proof_system::IsFoldingFlavor<Flavor>)
+        requires(!bb::IsFoldingFlavor<Flavor>)
     {
         auto scale_by_challenge_and_accumulate = [&](auto& element) {
             for (auto& entry : element) {
diff --git a/barretenberg/cpp/src/barretenberg/smt_verification/smt_bigfield.test.cpp b/barretenberg/cpp/src/barretenberg/smt_verification/smt_bigfield.test.cpp
index 78b3f2d5aa1f..8a824645a5d8 100644
--- a/barretenberg/cpp/src/barretenberg/smt_verification/smt_bigfield.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/smt_verification/smt_bigfield.test.cpp
@@ -28,11 +28,11 @@
 
 using namespace smt_circuit;
 using namespace bb;
-using namespace proof_system::plonk;
+using namespace bb::plonk;
 
-using field_ct = proof_system::plonk::stdlib::field_t<StandardCircuitBuilder>;
-using witness_t = proof_system::plonk::stdlib::witness_t<StandardCircuitBuilder>;
-using pub_witness_t = proof_system::plonk::stdlib::public_witness_t<StandardCircuitBuilder>;
+using field_ct = bb::plonk::stdlib::field_t<StandardCircuitBuilder>;
+using witness_t = bb::plonk::stdlib::witness_t<StandardCircuitBuilder>;
+using pub_witness_t = bb::plonk::stdlib::public_witness_t<StandardCircuitBuilder>;
 
 using bn254 = stdlib::bn254<StandardCircuitBuilder>;
 
diff --git a/barretenberg/cpp/src/barretenberg/smt_verification/smt_examples.test.cpp b/barretenberg/cpp/src/barretenberg/smt_verification/smt_examples.test.cpp
index 6db36ab0eb81..c68ce0d52367 100644
--- a/barretenberg/cpp/src/barretenberg/smt_verification/smt_examples.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/smt_verification/smt_examples.test.cpp
@@ -9,15 +9,15 @@
 #include "barretenberg/smt_verification/circuit/circuit.hpp"
 
 using namespace bb;
-using namespace proof_system;
+using namespace bb;
 
 namespace {
 auto& engine = numeric::random::get_debug_engine();
 }
 
-using field_t = proof_system::plonk::stdlib::field_t<StandardCircuitBuilder>;
-using witness_t = proof_system::plonk::stdlib::witness_t<StandardCircuitBuilder>;
-using pub_witness_t = proof_system::plonk::stdlib::public_witness_t<StandardCircuitBuilder>;
+using field_t = bb::plonk::stdlib::field_t<StandardCircuitBuilder>;
+using witness_t = bb::plonk::stdlib::witness_t<StandardCircuitBuilder>;
+using pub_witness_t = bb::plonk::stdlib::public_witness_t<StandardCircuitBuilder>;
 
 TEST(circuit_verification, multiplication_true)
 {
diff --git a/barretenberg/cpp/src/barretenberg/smt_verification/smt_polynomials.test.cpp b/barretenberg/cpp/src/barretenberg/smt_verification/smt_polynomials.test.cpp
index 7e694347deb7..4c3b9d350226 100644
--- a/barretenberg/cpp/src/barretenberg/smt_verification/smt_polynomials.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/smt_verification/smt_polynomials.test.cpp
@@ -14,12 +14,12 @@
 #include "barretenberg/smt_verification/circuit/circuit.hpp"
 
 using namespace bb;
-using namespace proof_system;
+using namespace bb;
 using namespace smt_circuit;
 
-using field_ct = proof_system::plonk::stdlib::field_t<StandardCircuitBuilder>;
-using witness_t = proof_system::plonk::stdlib::witness_t<StandardCircuitBuilder>;
-using pub_witness_t = proof_system::plonk::stdlib::public_witness_t<StandardCircuitBuilder>;
+using field_ct = bb::plonk::stdlib::field_t<StandardCircuitBuilder>;
+using witness_t = bb::plonk::stdlib::witness_t<StandardCircuitBuilder>;
+using pub_witness_t = bb::plonk::stdlib::public_witness_t<StandardCircuitBuilder>;
 
 // TODO(alex): z1 = z2, s1=s2, but coefficients are not public
 namespace {
diff --git a/barretenberg/cpp/src/barretenberg/solidity_helpers/circuits/add_2_circuit.hpp b/barretenberg/cpp/src/barretenberg/solidity_helpers/circuits/add_2_circuit.hpp
index 89386da41688..fc02122247e3 100644
--- a/barretenberg/cpp/src/barretenberg/solidity_helpers/circuits/add_2_circuit.hpp
+++ b/barretenberg/cpp/src/barretenberg/solidity_helpers/circuits/add_2_circuit.hpp
@@ -4,8 +4,8 @@
 
 template <typename Builder> class Add2Circuit {
   public:
-    typedef proof_system::plonk::stdlib::public_witness_t<Builder> public_witness_ct;
-    typedef proof_system::plonk::stdlib::field_t<Builder> field_ct;
+    typedef bb::plonk::stdlib::public_witness_t<Builder> public_witness_ct;
+    typedef bb::plonk::stdlib::field_t<Builder> field_ct;
 
     // Three public inputs
     static Builder generate(uint256_t inputs[])
diff --git a/barretenberg/cpp/src/barretenberg/solidity_helpers/circuits/blake_circuit.hpp b/barretenberg/cpp/src/barretenberg/solidity_helpers/circuits/blake_circuit.hpp
index 59c6eb0e5af4..5e4faf6e4f7a 100644
--- a/barretenberg/cpp/src/barretenberg/solidity_helpers/circuits/blake_circuit.hpp
+++ b/barretenberg/cpp/src/barretenberg/solidity_helpers/circuits/blake_circuit.hpp
@@ -3,8 +3,8 @@
 #include "barretenberg/stdlib/primitives/field/field.hpp"
 #include "barretenberg/stdlib/primitives/witness/witness.hpp"
 
-using namespace proof_system::plonk;
-using namespace proof_system::plonk::stdlib;
+using namespace bb::plonk;
+using namespace bb::plonk::stdlib;
 
 using numeric::uint256_t;
 
diff --git a/barretenberg/cpp/src/barretenberg/solidity_helpers/circuits/ecdsa_circuit.hpp b/barretenberg/cpp/src/barretenberg/solidity_helpers/circuits/ecdsa_circuit.hpp
index 23e0a3a71838..3b069e4a8a78 100644
--- a/barretenberg/cpp/src/barretenberg/solidity_helpers/circuits/ecdsa_circuit.hpp
+++ b/barretenberg/cpp/src/barretenberg/solidity_helpers/circuits/ecdsa_circuit.hpp
@@ -12,7 +12,7 @@
 #include "barretenberg/stdlib/primitives/field/field.hpp"
 #include "barretenberg/stdlib/primitives/witness/witness.hpp"
 
-using namespace proof_system::plonk;
+using namespace bb::plonk;
 using namespace stdlib;
 using numeric::uint256_t;
 
diff --git a/barretenberg/cpp/src/barretenberg/solidity_helpers/circuits/recursive_circuit.hpp b/barretenberg/cpp/src/barretenberg/solidity_helpers/circuits/recursive_circuit.hpp
index 02ee6b17cf80..6372a06489d6 100644
--- a/barretenberg/cpp/src/barretenberg/solidity_helpers/circuits/recursive_circuit.hpp
+++ b/barretenberg/cpp/src/barretenberg/solidity_helpers/circuits/recursive_circuit.hpp
@@ -9,7 +9,7 @@
 #include "barretenberg/stdlib/recursion/verifier/verifier.hpp"
 #include "barretenberg/transcript/transcript.hpp"
 
-using namespace proof_system::plonk;
+using namespace bb::plonk;
 using namespace stdlib;
 using numeric::uint256_t;
 
@@ -33,7 +33,7 @@ template <typename OuterBuilder> class RecursiveCircuit {
     using inner_scalar_field = typename inner_curve::ScalarFieldNative;
     using outer_scalar_field = typename outer_curve::BaseFieldNative;
     using pairing_target_field = bb::fq12;
-    static constexpr bool is_ultra_to_ultra = std::is_same_v<OuterBuilder, proof_system::UltraCircuitBuilder>;
+    static constexpr bool is_ultra_to_ultra = std::is_same_v<OuterBuilder, bb::UltraCircuitBuilder>;
     using ProverOfInnerCircuit =
         std::conditional_t<is_ultra_to_ultra, plonk::UltraProver, plonk::UltraToStandardProver>;
     using VerifierOfInnerProof =
diff --git a/barretenberg/cpp/src/barretenberg/solidity_helpers/key_gen.cpp b/barretenberg/cpp/src/barretenberg/solidity_helpers/key_gen.cpp
index b9f750400dd7..bc78bda31d28 100644
--- a/barretenberg/cpp/src/barretenberg/solidity_helpers/key_gen.cpp
+++ b/barretenberg/cpp/src/barretenberg/solidity_helpers/key_gen.cpp
@@ -32,7 +32,7 @@ void generate_keys(std::string output_path, std::string flavour_prefix, std::str
     {
         auto vk_filename = output_path + "/keys/" + vk_class_name + ".sol";
         std::ofstream os(vk_filename);
-        proof_system::output_vk_sol(os, vkey, vk_class_name);
+        bb::output_vk_sol(os, vkey, vk_class_name);
         info("VK contract written to: ", vk_filename);
     }
 
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/commitment/pedersen/pedersen.cpp b/barretenberg/cpp/src/barretenberg/stdlib/commitment/pedersen/pedersen.cpp
index 3295d5ffd2a2..d5db212c5f48 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/commitment/pedersen/pedersen.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/commitment/pedersen/pedersen.cpp
@@ -4,7 +4,7 @@
 
 #include "../../primitives/packed_byte_array/packed_byte_array.hpp"
 
-namespace proof_system::plonk::stdlib {
+namespace bb::plonk::stdlib {
 
 template <typename C>
 cycle_group<C> pedersen_commitment<C>::commit(const std::vector<field_t>& inputs, const GeneratorContext context)
@@ -40,8 +40,8 @@ cycle_group<C> pedersen_commitment<C>::commit(const std::vector<std::pair<field_
     return cycle_group::batch_mul(scalars, points);
 }
 
-template class pedersen_commitment<proof_system::StandardCircuitBuilder>;
-template class pedersen_commitment<proof_system::UltraCircuitBuilder>;
-template class pedersen_commitment<proof_system::GoblinUltraCircuitBuilder>;
+template class pedersen_commitment<bb::StandardCircuitBuilder>;
+template class pedersen_commitment<bb::UltraCircuitBuilder>;
+template class pedersen_commitment<bb::GoblinUltraCircuitBuilder>;
 
-} // namespace proof_system::plonk::stdlib
+} // namespace bb::plonk::stdlib
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/commitment/pedersen/pedersen.hpp b/barretenberg/cpp/src/barretenberg/stdlib/commitment/pedersen/pedersen.hpp
index ad9593069b9e..178bec0029a5 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/commitment/pedersen/pedersen.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/commitment/pedersen/pedersen.hpp
@@ -4,7 +4,7 @@
 #include "barretenberg/crypto/pedersen_commitment/pedersen.hpp"
 #include "barretenberg/stdlib/primitives/group/cycle_group.hpp"
 
-namespace proof_system::plonk::stdlib {
+namespace bb::plonk::stdlib {
 
 template <typename CircuitBuilder> class pedersen_commitment {
   private:
@@ -20,4 +20,4 @@ template <typename CircuitBuilder> class pedersen_commitment {
     static cycle_group commit(const std::vector<std::pair<field_t, GeneratorContext>>& input_pairs);
 };
 
-} // namespace proof_system::plonk::stdlib
\ No newline at end of file
+} // namespace bb::plonk::stdlib
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/commitment/pedersen/pedersen.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/commitment/pedersen/pedersen.test.cpp
index 7e49097cd817..61ee10c688a2 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/commitment/pedersen/pedersen.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/commitment/pedersen/pedersen.test.cpp
@@ -8,7 +8,7 @@
 
 namespace test_StdlibPedersen {
 using namespace bb;
-using namespace proof_system::plonk;
+using namespace bb::plonk;
 namespace {
 auto& engine = numeric::random::get_debug_engine();
 }
@@ -82,7 +82,7 @@ template <typename Builder> class StdlibPedersen : public testing::Test {
     }
 };
 
-using CircuitTypes = testing::Types<proof_system::StandardCircuitBuilder, proof_system::UltraCircuitBuilder>;
+using CircuitTypes = testing::Types<bb::StandardCircuitBuilder, bb::UltraCircuitBuilder>;
 
 TYPED_TEST_SUITE(StdlibPedersen, CircuitTypes);
 
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/encryption/aes128/aes128.cpp b/barretenberg/cpp/src/barretenberg/stdlib/encryption/aes128/aes128.cpp
index 2bbaff733c60..a5aa4b894c55 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/encryption/aes128/aes128.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/encryption/aes128/aes128.cpp
@@ -10,7 +10,7 @@
 using namespace crypto::aes128;
 using namespace bb;
 
-namespace proof_system::plonk {
+namespace bb::plonk {
 namespace stdlib {
 namespace aes128 {
 template <typename Builder> using byte_pair = std::pair<field_t<Builder>, field_t<Builder>>;
@@ -302,8 +302,8 @@ std::vector<field_t<Builder>> encrypt_buffer_cbc(const std::vector<field_t<Build
     template std::vector<field_t<Builder>> encrypt_buffer_cbc<Builder>(                                                \
         const std::vector<field_t<Builder>>&, const field_t<Builder>&, const field_t<Builder>&)
 
-INSTANTIATE_ENCRYPT_BUFFER_CBC(proof_system::UltraCircuitBuilder);
-INSTANTIATE_ENCRYPT_BUFFER_CBC(proof_system::GoblinUltraCircuitBuilder);
+INSTANTIATE_ENCRYPT_BUFFER_CBC(bb::UltraCircuitBuilder);
+INSTANTIATE_ENCRYPT_BUFFER_CBC(bb::GoblinUltraCircuitBuilder);
 } // namespace aes128
 } // namespace stdlib
-} // namespace proof_system::plonk
+} // namespace bb::plonk
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/encryption/aes128/aes128.hpp b/barretenberg/cpp/src/barretenberg/stdlib/encryption/aes128/aes128.hpp
index 7e8d4332b4ac..5b621ecf9994 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/encryption/aes128/aes128.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/encryption/aes128/aes128.hpp
@@ -7,7 +7,7 @@
 #include "../../primitives/witness/witness.hpp"
 #include "barretenberg/stdlib/primitives/circuit_builders/circuit_builders_fwd.hpp"
 
-namespace proof_system::plonk {
+namespace bb::plonk {
 namespace stdlib {
 
 namespace aes128 {
@@ -19,4 +19,4 @@ std::vector<stdlib::field_t<Builder>> encrypt_buffer_cbc(const std::vector<stdli
 
 } // namespace aes128
 } // namespace stdlib
-} // namespace proof_system::plonk
+} // namespace bb::plonk
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/encryption/aes128/aes128.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/encryption/aes128/aes128.test.cpp
index 34393f393243..0d0bb3d18541 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/encryption/aes128/aes128.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/encryption/aes128/aes128.test.cpp
@@ -5,12 +5,12 @@
 #include <gtest/gtest.h>
 
 using namespace bb;
-using namespace proof_system::plonk;
+using namespace bb::plonk;
 
 TEST(stdlib_aes128, encrypt_64_bytes)
 {
-    typedef stdlib::field_t<proof_system::UltraCircuitBuilder> field_pt;
-    typedef stdlib::witness_t<proof_system::UltraCircuitBuilder> witness_pt;
+    typedef stdlib::field_t<bb::UltraCircuitBuilder> field_pt;
+    typedef stdlib::witness_t<bb::UltraCircuitBuilder> witness_pt;
 
     uint8_t key[16]{ 0x2b, 0x7e, 0x15, 0x16, 0x28, 0xae, 0xd2, 0xa6, 0xab, 0xf7, 0x15, 0x88, 0x09, 0xcf, 0x4f, 0x3c };
     uint8_t out[64]{ 0x76, 0x49, 0xab, 0xac, 0x81, 0x19, 0xb2, 0x46, 0xce, 0xe9, 0x8e, 0x9b, 0x12, 0xe9, 0x19, 0x7d,
@@ -32,7 +32,7 @@ TEST(stdlib_aes128, encrypt_64_bytes)
         return converted;
     };
 
-    auto builder = proof_system::UltraCircuitBuilder();
+    auto builder = bb::UltraCircuitBuilder();
 
     std::vector<field_pt> in_field{
         witness_pt(&builder, fr(convert_bytes(in))),
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/encryption/ecdsa/ecdsa.hpp b/barretenberg/cpp/src/barretenberg/stdlib/encryption/ecdsa/ecdsa.hpp
index c01b7d9d08ae..09b07c0bf772 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/encryption/ecdsa/ecdsa.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/encryption/ecdsa/ecdsa.hpp
@@ -4,7 +4,7 @@
 #include "../../primitives/circuit_builders/circuit_builders_fwd.hpp"
 #include "../../primitives/uint/uint.hpp"
 #include "barretenberg/crypto/ecdsa/ecdsa.hpp"
-namespace proof_system::plonk {
+namespace bb::plonk {
 namespace stdlib {
 namespace ecdsa {
 
@@ -44,6 +44,6 @@ template <typename Builder> static signature<Builder> from_witness(Builder* ctx,
 
 } // namespace ecdsa
 } // namespace stdlib
-} // namespace proof_system::plonk
+} // namespace bb::plonk
 
 #include "./ecdsa_impl.hpp"
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/encryption/ecdsa/ecdsa.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/encryption/ecdsa/ecdsa.test.cpp
index 78468e1ffdde..878259016776 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/encryption/ecdsa/ecdsa.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/encryption/ecdsa/ecdsa.test.cpp
@@ -7,10 +7,10 @@
 #include "ecdsa.hpp"
 
 using namespace bb;
-using namespace proof_system::plonk;
+using namespace bb::plonk;
 
 namespace test_stdlib_ecdsa {
-using Builder = proof_system::UltraCircuitBuilder;
+using Builder = bb::UltraCircuitBuilder;
 using curve = stdlib::secp256k1<Builder>;
 using curveR1 = stdlib::secp256r1<Builder>;
 
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/encryption/ecdsa/ecdsa_impl.hpp b/barretenberg/cpp/src/barretenberg/stdlib/encryption/ecdsa/ecdsa_impl.hpp
index ff0929711bd1..31ff19ed1747 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/encryption/ecdsa/ecdsa_impl.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/encryption/ecdsa/ecdsa_impl.hpp
@@ -4,7 +4,7 @@
 #include "barretenberg/stdlib/hash/sha256/sha256.hpp"
 #include "barretenberg/stdlib/primitives//bit_array/bit_array.hpp"
 
-namespace proof_system::plonk {
+namespace bb::plonk {
 namespace stdlib {
 namespace ecdsa {
 
@@ -88,7 +88,7 @@ bool_t<Builder> verify_signature(const stdlib::byte_array<Builder>& message,
     // TODO(Cody): Having Plookup should not determine which curve is used.
     // Use special plookup secp256k1 ECDSA mul if available (this relies on k1 endomorphism, and cannot be used for
     // other curves)
-    if constexpr (HasPlookup<Builder> && Curve::type == proof_system::CurveType::SECP256K1) {
+    if constexpr (HasPlookup<Builder> && Curve::type == bb::CurveType::SECP256K1) {
         result = G1::secp256k1_ecdsa_mul(public_key, u1, u2);
     } else {
         result = G1::batch_mul({ G1::one(ctx), public_key }, { u1, u2 });
@@ -163,7 +163,7 @@ bool_t<Builder> verify_signature_prehashed_message_noassert(const stdlib::byte_a
     G1 result;
     // Use special plookup secp256k1 ECDSA mul if available (this relies on k1 endomorphism, and cannot be used for
     // other curves)
-    if constexpr (HasPlookup<Builder> && Curve::type == proof_system::CurveType::SECP256K1) {
+    if constexpr (HasPlookup<Builder> && Curve::type == bb::CurveType::SECP256K1) {
         result = G1::secp256k1_ecdsa_mul(public_key, u1, u2);
     } else {
         result = G1::batch_mul({ G1::one(ctx), public_key }, { u1, u2 });
@@ -224,4 +224,4 @@ bool_t<Builder> verify_signature_noassert(const stdlib::byte_array<Builder>& mes
 
 } // namespace ecdsa
 } // namespace stdlib
-} // namespace proof_system::plonk
\ No newline at end of file
+} // namespace bb::plonk
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/encryption/schnorr/schnorr.cpp b/barretenberg/cpp/src/barretenberg/stdlib/encryption/schnorr/schnorr.cpp
index b242f9d4cfeb..f93ac5be1ae6 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/encryption/schnorr/schnorr.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/encryption/schnorr/schnorr.cpp
@@ -7,7 +7,7 @@
 #include "barretenberg/stdlib/primitives/group/cycle_group.hpp"
 #include <array>
 
-namespace proof_system::plonk::stdlib::schnorr {
+namespace bb::plonk::stdlib::schnorr {
 
 /**
  * @brief Instantiate a witness containing the signature (s, e) as a quadruple of
@@ -91,25 +91,25 @@ bool_t<C> signature_verification_result(const byte_array<C>& message,
 #define VERIFY_SIGNATURE_INTERNAL(circuit_type)                                                                        \
     template std::array<field_t<circuit_type>, 2> verify_signature_internal<circuit_type>(                             \
         const byte_array<circuit_type>&, const cycle_group<circuit_type>&, const signature_bits<circuit_type>&)
-VERIFY_SIGNATURE_INTERNAL(proof_system::StandardCircuitBuilder);
-VERIFY_SIGNATURE_INTERNAL(proof_system::UltraCircuitBuilder);
-VERIFY_SIGNATURE_INTERNAL(proof_system::GoblinUltraCircuitBuilder);
+VERIFY_SIGNATURE_INTERNAL(bb::StandardCircuitBuilder);
+VERIFY_SIGNATURE_INTERNAL(bb::UltraCircuitBuilder);
+VERIFY_SIGNATURE_INTERNAL(bb::GoblinUltraCircuitBuilder);
 #define VERIFY_SIGNATURE(circuit_type)                                                                                 \
     template void verify_signature<circuit_type>(                                                                      \
         const byte_array<circuit_type>&, const cycle_group<circuit_type>&, const signature_bits<circuit_type>&)
-VERIFY_SIGNATURE(proof_system::StandardCircuitBuilder);
-VERIFY_SIGNATURE(proof_system::UltraCircuitBuilder);
-VERIFY_SIGNATURE(proof_system::GoblinUltraCircuitBuilder);
+VERIFY_SIGNATURE(bb::StandardCircuitBuilder);
+VERIFY_SIGNATURE(bb::UltraCircuitBuilder);
+VERIFY_SIGNATURE(bb::GoblinUltraCircuitBuilder);
 #define SIGNATURE_VERIFICATION_RESULT(circuit_type)                                                                    \
     template bool_t<circuit_type> signature_verification_result<circuit_type>(                                         \
         const byte_array<circuit_type>&, const cycle_group<circuit_type>&, const signature_bits<circuit_type>&)
-SIGNATURE_VERIFICATION_RESULT(proof_system::StandardCircuitBuilder);
-SIGNATURE_VERIFICATION_RESULT(proof_system::UltraCircuitBuilder);
-SIGNATURE_VERIFICATION_RESULT(proof_system::GoblinUltraCircuitBuilder);
+SIGNATURE_VERIFICATION_RESULT(bb::StandardCircuitBuilder);
+SIGNATURE_VERIFICATION_RESULT(bb::UltraCircuitBuilder);
+SIGNATURE_VERIFICATION_RESULT(bb::GoblinUltraCircuitBuilder);
 #define CONVERT_SIGNATURE(circuit_type)                                                                                \
     template signature_bits<circuit_type> convert_signature<circuit_type>(circuit_type*,                               \
                                                                           const crypto::schnorr::signature&)
-CONVERT_SIGNATURE(proof_system::StandardCircuitBuilder);
-CONVERT_SIGNATURE(proof_system::UltraCircuitBuilder);
-CONVERT_SIGNATURE(proof_system::GoblinUltraCircuitBuilder);
-} // namespace proof_system::plonk::stdlib::schnorr
+CONVERT_SIGNATURE(bb::StandardCircuitBuilder);
+CONVERT_SIGNATURE(bb::UltraCircuitBuilder);
+CONVERT_SIGNATURE(bb::GoblinUltraCircuitBuilder);
+} // namespace bb::plonk::stdlib::schnorr
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/encryption/schnorr/schnorr.hpp b/barretenberg/cpp/src/barretenberg/stdlib/encryption/schnorr/schnorr.hpp
index ad1632a5977d..feba4ec138dd 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/encryption/schnorr/schnorr.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/encryption/schnorr/schnorr.hpp
@@ -6,7 +6,7 @@
 #include "../../primitives/witness/witness.hpp"
 #include "barretenberg/crypto/schnorr/schnorr.hpp"
 
-namespace proof_system::plonk::stdlib::schnorr {
+namespace bb::plonk::stdlib::schnorr {
 
 template <typename C> struct signature_bits {
     typename cycle_group<C>::cycle_scalar s;
@@ -28,4 +28,4 @@ bool_t<C> signature_verification_result(const byte_array<C>& message,
                                         const cycle_group<C>& pub_key,
                                         const signature_bits<C>& sig);
 
-} // namespace proof_system::plonk::stdlib::schnorr
+} // namespace bb::plonk::stdlib::schnorr
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/encryption/schnorr/schnorr.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/encryption/schnorr/schnorr.test.cpp
index b054e8141882..c0ed824a0700 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/encryption/schnorr/schnorr.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/encryption/schnorr/schnorr.test.cpp
@@ -5,13 +5,13 @@
 #include "barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp"
 #include "schnorr.hpp"
 
-namespace proof_system::test_stdlib_schnorr {
+namespace bb::test_stdlib_schnorr {
 
 using namespace bb;
-using namespace proof_system::plonk::stdlib;
-using namespace proof_system::plonk::stdlib::schnorr;
+using namespace bb::plonk::stdlib;
+using namespace bb::plonk::stdlib::schnorr;
 
-using Builder = proof_system::UltraCircuitBuilder;
+using Builder = bb::UltraCircuitBuilder;
 using bool_ct = bool_t<Builder>;
 using byte_array_ct = byte_array<Builder>;
 using field_ct = field_t<Builder>;
@@ -179,4 +179,4 @@ TEST(stdlib_schnorr, signature_verification_result_failure)
     EXPECT_EQ(verification_result, true);
 }
 
-} // namespace proof_system::test_stdlib_schnorr
+} // namespace bb::test_stdlib_schnorr
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/hash/benchmarks/celer/sha256.bench.cpp b/barretenberg/cpp/src/barretenberg/stdlib/hash/benchmarks/celer/sha256.bench.cpp
index d160c1b8d778..6fb3758786f3 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/hash/benchmarks/celer/sha256.bench.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/hash/benchmarks/celer/sha256.bench.cpp
@@ -13,10 +13,10 @@
 
 using namespace benchmark;
 
-using Builder = proof_system::UltraCircuitBuilder;
-using Composer = proof_system::plonk::UltraComposer;
-using Prover = proof_system::plonk::UltraProver;
-using Verifier = proof_system::plonk::UltraVerifier;
+using Builder = bb::UltraCircuitBuilder;
+using Composer = bb::plonk::UltraComposer;
+using Prover = bb::plonk::UltraProver;
+using Verifier = bb::plonk::UltraVerifier;
 
 constexpr size_t NUM_HASHES = 20;
 constexpr size_t CHUNK_SIZE = 64;
@@ -33,9 +33,9 @@ void generate_test_plonk_circuit(Builder& builder, size_t num_bytes)
 {
     std::string in;
     in.resize(num_bytes);
-    proof_system::plonk::stdlib::packed_byte_array<Builder> input(&builder, in);
+    bb::plonk::stdlib::packed_byte_array<Builder> input(&builder, in);
 
-    proof_system::plonk::stdlib::sha256<Builder>(input);
+    bb::plonk::stdlib::sha256<Builder>(input);
 }
 
 // Because of the way we do internal allocations in some of our more complex structures, we can't just globally allocate
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/hash/benchmarks/external/external.bench.cpp b/barretenberg/cpp/src/barretenberg/stdlib/hash/benchmarks/external/external.bench.cpp
index b68a87cbd02b..8db8c9e664d2 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/hash/benchmarks/external/external.bench.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/hash/benchmarks/external/external.bench.cpp
@@ -12,11 +12,11 @@
 
 using namespace benchmark;
 
-using Builder = proof_system::UltraCircuitBuilder;
-using Composer = proof_system::plonk::UltraComposer;
+using Builder = bb::UltraCircuitBuilder;
+using Composer = bb::plonk::UltraComposer;
 
-using Prover = proof_system::plonk::UltraProver;
-using Verifier = proof_system::plonk::UltraVerifier;
+using Prover = bb::plonk::UltraProver;
+using Verifier = bb::plonk::UltraVerifier;
 
 constexpr size_t PROOF_COUNT_LOG = 10;
 constexpr size_t NUM_PROOFS = 3;
@@ -36,9 +36,9 @@ void generate_test_sha256_plonk_circuit(Builder& builder, size_t num_iterations)
         in[i] = 0;
     }
 
-    proof_system::plonk::stdlib::packed_byte_array<Builder> input(&builder, in);
+    bb::plonk::stdlib::packed_byte_array<Builder> input(&builder, in);
     for (size_t i = 0; i < num_iterations; i++) {
-        input = proof_system::plonk::stdlib::sha256<Builder>(input);
+        input = bb::plonk::stdlib::sha256<Builder>(input);
     }
 }
 
@@ -117,9 +117,9 @@ void generate_test_blake3s_plonk_circuit(Builder& builder, size_t num_iterations
     for (size_t i = 0; i < 32; ++i) {
         in[i] = 0;
     }
-    proof_system::plonk::stdlib::packed_byte_array<Builder> input(&builder, in);
+    bb::plonk::stdlib::packed_byte_array<Builder> input(&builder, in);
     for (size_t i = 0; i < num_iterations; i++) {
-        input = proof_system::plonk::stdlib::blake3s<Builder>(input);
+        input = bb::plonk::stdlib::blake3s<Builder>(input);
     }
 }
 
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/hash/benchmarks/sha256/sha256.bench.cpp b/barretenberg/cpp/src/barretenberg/stdlib/hash/benchmarks/sha256/sha256.bench.cpp
index 6267595a99de..e7e2fe92689f 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/hash/benchmarks/sha256/sha256.bench.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/hash/benchmarks/sha256/sha256.bench.cpp
@@ -4,10 +4,10 @@
 
 using namespace benchmark;
 
-using Builder = proof_system::UltraCircuitBuilder;
-using Composer = proof_system::plonk::UltraComposer;
-using Prover = proof_system::plonk::UltraProver;
-using Verifier = proof_system::plonk::UltraVerifier;
+using Builder = bb::UltraCircuitBuilder;
+using Composer = bb::plonk::UltraComposer;
+using Prover = bb::plonk::UltraProver;
+using Verifier = bb::plonk::UltraVerifier;
 
 constexpr size_t NUM_HASHES = 8;
 constexpr size_t BYTES_PER_CHUNK = 512;
@@ -26,8 +26,8 @@ void generate_test_plonk_circuit(Builder& builder, size_t num_bytes)
     for (size_t i = 0; i < num_bytes; ++i) {
         in[i] = get_random_char();
     }
-    proof_system::plonk::stdlib::packed_byte_array<Builder> input(&builder, in);
-    proof_system::plonk::stdlib::sha256<Builder>(input);
+    bb::plonk::stdlib::packed_byte_array<Builder> input(&builder, in);
+    bb::plonk::stdlib::sha256<Builder>(input);
 }
 
 void* builders[NUM_HASHES];
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/hash/blake2s/blake2s.cpp b/barretenberg/cpp/src/barretenberg/stdlib/hash/blake2s/blake2s.cpp
index 4e0856765c81..7e9cb9017faf 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/hash/blake2s/blake2s.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/hash/blake2s/blake2s.cpp
@@ -3,7 +3,7 @@
 #include "blake2s_plookup.hpp"
 #include "blake_util.hpp"
 
-namespace proof_system::plonk {
+namespace bb::plonk {
 namespace stdlib {
 
 namespace {
@@ -136,12 +136,9 @@ template <typename Builder> byte_array<Builder> blake2s(const byte_array<Builder
     return result;
 }
 
-template byte_array<proof_system::StandardCircuitBuilder> blake2s(
-    const byte_array<proof_system::StandardCircuitBuilder>& input);
-template byte_array<proof_system::UltraCircuitBuilder> blake2s(
-    const byte_array<proof_system::UltraCircuitBuilder>& input);
-template byte_array<proof_system::GoblinUltraCircuitBuilder> blake2s(
-    const byte_array<proof_system::GoblinUltraCircuitBuilder>& input);
+template byte_array<bb::StandardCircuitBuilder> blake2s(const byte_array<bb::StandardCircuitBuilder>& input);
+template byte_array<bb::UltraCircuitBuilder> blake2s(const byte_array<bb::UltraCircuitBuilder>& input);
+template byte_array<bb::GoblinUltraCircuitBuilder> blake2s(const byte_array<bb::GoblinUltraCircuitBuilder>& input);
 
 } // namespace stdlib
-} // namespace proof_system::plonk
+} // namespace bb::plonk
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/hash/blake2s/blake2s.hpp b/barretenberg/cpp/src/barretenberg/stdlib/hash/blake2s/blake2s.hpp
index e6c4f4192fc6..c3ac50752c66 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/hash/blake2s/blake2s.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/hash/blake2s/blake2s.hpp
@@ -2,10 +2,10 @@
 #include "barretenberg/stdlib/primitives/byte_array/byte_array.hpp"
 #include "barretenberg/stdlib/primitives/circuit_builders/circuit_builders_fwd.hpp"
 
-namespace proof_system::plonk {
+namespace bb::plonk {
 namespace stdlib {
 
 template <typename Builder> byte_array<Builder> blake2s(const byte_array<Builder>& input);
 
 } // namespace stdlib
-} // namespace proof_system::plonk
+} // namespace bb::plonk
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/hash/blake2s/blake2s.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/hash/blake2s/blake2s.test.cpp
index 479e939c3106..1fae5fb8c636 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/hash/blake2s/blake2s.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/hash/blake2s/blake2s.test.cpp
@@ -5,9 +5,9 @@
 #include <gtest/gtest.h>
 
 using namespace bb;
-using namespace proof_system::plonk::stdlib;
+using namespace bb::plonk::stdlib;
 
-using Builder = proof_system::UltraCircuitBuilder;
+using Builder = bb::UltraCircuitBuilder;
 
 using field_ct = field_t<Builder>;
 using witness_ct = witness_t<Builder>;
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/hash/blake2s/blake2s_plookup.cpp b/barretenberg/cpp/src/barretenberg/stdlib/hash/blake2s/blake2s_plookup.cpp
index 6a66cfde2b3c..1cb3f9f63681 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/hash/blake2s/blake2s_plookup.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/hash/blake2s/blake2s_plookup.cpp
@@ -15,7 +15,7 @@
  * 2. replace use of uint32 with basic field_t type
  *
  **/
-namespace proof_system::plonk {
+namespace bb::plonk {
 namespace stdlib {
 
 namespace blake2s_plookup {
@@ -166,12 +166,10 @@ template <typename Builder> byte_array<Builder> blake2s(const byte_array<Builder
     return result;
 }
 
-template byte_array<proof_system::UltraCircuitBuilder> blake2s(
-    const byte_array<proof_system::UltraCircuitBuilder>& input);
-template byte_array<proof_system::GoblinUltraCircuitBuilder> blake2s(
-    const byte_array<proof_system::GoblinUltraCircuitBuilder>& input);
+template byte_array<bb::UltraCircuitBuilder> blake2s(const byte_array<bb::UltraCircuitBuilder>& input);
+template byte_array<bb::GoblinUltraCircuitBuilder> blake2s(const byte_array<bb::GoblinUltraCircuitBuilder>& input);
 
 } // namespace blake2s_plookup
 
 } // namespace stdlib
-} // namespace proof_system::plonk
+} // namespace bb::plonk
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/hash/blake2s/blake2s_plookup.hpp b/barretenberg/cpp/src/barretenberg/stdlib/hash/blake2s/blake2s_plookup.hpp
index 6c58fb1cf2a4..c6bbd5da1405 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/hash/blake2s/blake2s_plookup.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/hash/blake2s/blake2s_plookup.hpp
@@ -9,7 +9,7 @@
 #include "../../primitives/field/field.hpp"
 #include "../../primitives/packed_byte_array/packed_byte_array.hpp"
 
-namespace proof_system::plonk {
+namespace bb::plonk {
 namespace stdlib {
 
 namespace blake2s_plookup {
@@ -19,4 +19,4 @@ template <typename Builder> byte_array<Builder> blake2s(const byte_array<Builder
 } // namespace blake2s_plookup
 
 } // namespace stdlib
-} // namespace proof_system::plonk
+} // namespace bb::plonk
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/hash/blake2s/blake_util.hpp b/barretenberg/cpp/src/barretenberg/stdlib/hash/blake2s/blake_util.hpp
index 3eadd6ac1065..4cf7d6df90bf 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/hash/blake2s/blake_util.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/hash/blake2s/blake_util.hpp
@@ -4,7 +4,7 @@
 #include "barretenberg/stdlib/primitives/plookup/plookup.hpp"
 #include "barretenberg/stdlib/primitives/uint/uint.hpp"
 
-namespace proof_system::plonk {
+namespace bb::plonk {
 namespace stdlib {
 
 namespace blake_util {
@@ -255,4 +255,4 @@ void round_fn_lookup(field_t<Builder> state[BLAKE3_STATE_SIZE],
 } // namespace blake_util
 
 } // namespace stdlib
-} // namespace proof_system::plonk
+} // namespace bb::plonk
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/hash/blake3s/blake3s.cpp b/barretenberg/cpp/src/barretenberg/stdlib/hash/blake3s/blake3s.cpp
index 1b606a27b941..f00e65f7fd37 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/hash/blake3s/blake3s.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/hash/blake3s/blake3s.cpp
@@ -3,7 +3,7 @@
 #include "barretenberg/stdlib/primitives/uint/uint.hpp"
 #include "blake3s_plookup.hpp"
 
-namespace proof_system::plonk {
+namespace bb::plonk {
 namespace stdlib {
 
 namespace blake3_internal {
@@ -254,11 +254,8 @@ template <typename Builder> byte_array<Builder> blake3s(const byte_array<Builder
     return result;
 }
 
-template byte_array<proof_system::StandardCircuitBuilder> blake3s(
-    const byte_array<proof_system::StandardCircuitBuilder>& input);
-template byte_array<proof_system::UltraCircuitBuilder> blake3s(
-    const byte_array<proof_system::UltraCircuitBuilder>& input);
-template byte_array<proof_system::GoblinUltraCircuitBuilder> blake3s(
-    const byte_array<proof_system::GoblinUltraCircuitBuilder>& input);
+template byte_array<bb::StandardCircuitBuilder> blake3s(const byte_array<bb::StandardCircuitBuilder>& input);
+template byte_array<bb::UltraCircuitBuilder> blake3s(const byte_array<bb::UltraCircuitBuilder>& input);
+template byte_array<bb::GoblinUltraCircuitBuilder> blake3s(const byte_array<bb::GoblinUltraCircuitBuilder>& input);
 } // namespace stdlib
-} // namespace proof_system::plonk
+} // namespace bb::plonk
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/hash/blake3s/blake3s.hpp b/barretenberg/cpp/src/barretenberg/stdlib/hash/blake3s/blake3s.hpp
index 9d24322740f7..77e5b476a293 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/hash/blake3s/blake3s.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/hash/blake3s/blake3s.hpp
@@ -2,10 +2,10 @@
 #include "barretenberg/stdlib/primitives/byte_array/byte_array.hpp"
 #include "barretenberg/stdlib/primitives/circuit_builders/circuit_builders_fwd.hpp"
 
-namespace proof_system::plonk {
+namespace bb::plonk {
 namespace stdlib {
 
 template <typename Builder> byte_array<Builder> blake3s(const byte_array<Builder>& input);
 
 } // namespace stdlib
-} // namespace proof_system::plonk
+} // namespace bb::plonk
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/hash/blake3s/blake3s.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/hash/blake3s/blake3s.test.cpp
index 202ef12155f0..db04ed4e4c2e 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/hash/blake3s/blake3s.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/hash/blake3s/blake3s.test.cpp
@@ -5,14 +5,14 @@
 #include <gtest/gtest.h>
 
 using namespace bb;
-using namespace proof_system::plonk;
-
-using byte_array = stdlib::byte_array<proof_system::StandardCircuitBuilder>;
-using public_witness_t = stdlib::public_witness_t<proof_system::StandardCircuitBuilder>;
-using byte_array_plookup = stdlib::byte_array<proof_system::UltraCircuitBuilder>;
-using public_witness_t_plookup = stdlib::public_witness_t<proof_system::UltraCircuitBuilder>;
-using StandardBuilder = proof_system::StandardCircuitBuilder;
-using UltraBuilder = proof_system::UltraCircuitBuilder;
+using namespace bb::plonk;
+
+using byte_array = stdlib::byte_array<bb::StandardCircuitBuilder>;
+using public_witness_t = stdlib::public_witness_t<bb::StandardCircuitBuilder>;
+using byte_array_plookup = stdlib::byte_array<bb::UltraCircuitBuilder>;
+using public_witness_t_plookup = stdlib::public_witness_t<bb::UltraCircuitBuilder>;
+using StandardBuilder = bb::StandardCircuitBuilder;
+using UltraBuilder = bb::UltraCircuitBuilder;
 
 TEST(stdlib_blake3s, test_single_block)
 {
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/hash/blake3s/blake3s_plookup.cpp b/barretenberg/cpp/src/barretenberg/stdlib/hash/blake3s/blake3s_plookup.cpp
index 11ffa47fa7fe..85173d6c3312 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/hash/blake3s/blake3s_plookup.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/hash/blake3s/blake3s_plookup.cpp
@@ -7,7 +7,7 @@
 #include "barretenberg/stdlib/primitives/plookup/plookup.hpp"
 #include "barretenberg/stdlib/primitives/uint/uint.hpp"
 
-namespace proof_system::plonk {
+namespace bb::plonk {
 namespace stdlib {
 
 namespace blake3s_plookup {
@@ -260,11 +260,9 @@ template <typename Builder> byte_array<Builder> blake3s(const byte_array<Builder
     return result;
 }
 
-template byte_array<proof_system::UltraCircuitBuilder> blake3s(
-    const byte_array<proof_system::UltraCircuitBuilder>& input);
-template byte_array<proof_system::GoblinUltraCircuitBuilder> blake3s(
-    const byte_array<proof_system::GoblinUltraCircuitBuilder>& input);
+template byte_array<bb::UltraCircuitBuilder> blake3s(const byte_array<bb::UltraCircuitBuilder>& input);
+template byte_array<bb::GoblinUltraCircuitBuilder> blake3s(const byte_array<bb::GoblinUltraCircuitBuilder>& input);
 } // namespace blake3s_plookup
 
 } // namespace stdlib
-} // namespace proof_system::plonk
+} // namespace bb::plonk
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/hash/blake3s/blake3s_plookup.hpp b/barretenberg/cpp/src/barretenberg/stdlib/hash/blake3s/blake3s_plookup.hpp
index c97ff60ab54c..24393133f323 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/hash/blake3s/blake3s_plookup.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/hash/blake3s/blake3s_plookup.hpp
@@ -9,7 +9,7 @@
 #include "../../primitives/field/field.hpp"
 #include "../../primitives/packed_byte_array/packed_byte_array.hpp"
 
-namespace proof_system::plonk {
+namespace bb::plonk {
 namespace stdlib {
 
 namespace blake3s_plookup {
@@ -19,4 +19,4 @@ template <typename Builder> byte_array<Builder> blake3s(const byte_array<Builder
 } // namespace blake3s_plookup
 
 } // namespace stdlib
-} // namespace proof_system::plonk
+} // namespace bb::plonk
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/hash/keccak/keccak.cpp b/barretenberg/cpp/src/barretenberg/stdlib/hash/keccak/keccak.cpp
index f319e87be135..581e6ad6f282 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/hash/keccak/keccak.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/hash/keccak/keccak.cpp
@@ -3,7 +3,7 @@
 #include "barretenberg/numeric/bitop/sparse_form.hpp"
 #include "barretenberg/stdlib/primitives/logic/logic.hpp"
 #include "barretenberg/stdlib/primitives/uint/uint.hpp"
-namespace proof_system::plonk {
+namespace bb::plonk {
 namespace stdlib {
 
 using namespace plookup;
@@ -889,8 +889,8 @@ stdlib::byte_array<Builder> keccak<Builder>::sponge_squeeze_for_permutation_opco
     }
     return result;
 }
-template class keccak<proof_system::UltraCircuitBuilder>;
-template class keccak<proof_system::GoblinUltraCircuitBuilder>;
+template class keccak<bb::UltraCircuitBuilder>;
+template class keccak<bb::GoblinUltraCircuitBuilder>;
 
 } // namespace stdlib
-} // namespace proof_system::plonk
+} // namespace bb::plonk
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/hash/keccak/keccak.hpp b/barretenberg/cpp/src/barretenberg/stdlib/hash/keccak/keccak.hpp
index d8e00c42c802..f2b99171c64b 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/hash/keccak/keccak.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/hash/keccak/keccak.hpp
@@ -4,7 +4,7 @@
 #include "barretenberg/stdlib/primitives/uint/uint.hpp"
 #include <array>
 
-namespace proof_system::plonk {
+namespace bb::plonk {
 namespace stdlib {
 template <typename Builder> class bit_array;
 
@@ -203,4 +203,4 @@ template <typename Builder> class keccak {
 };
 
 } // namespace stdlib
-} // namespace proof_system::plonk
+} // namespace bb::plonk
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/hash/keccak/keccak.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/hash/keccak/keccak.test.cpp
index d34577022cda..9733ae533f4b 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/hash/keccak/keccak.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/hash/keccak/keccak.test.cpp
@@ -5,9 +5,9 @@
 #include <gtest/gtest.h>
 
 using namespace bb;
-using namespace proof_system::plonk;
+using namespace bb::plonk;
 
-typedef proof_system::UltraCircuitBuilder Builder;
+typedef bb::UltraCircuitBuilder Builder;
 typedef stdlib::byte_array<Builder> byte_array;
 typedef stdlib::public_witness_t<Builder> public_witness_t;
 typedef stdlib::field_t<Builder> field_ct;
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/hash/pedersen/pedersen.bench.cpp b/barretenberg/cpp/src/barretenberg/stdlib/hash/pedersen/pedersen.bench.cpp
index b495d7eefd33..d92654fe885d 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/hash/pedersen/pedersen.bench.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/hash/pedersen/pedersen.bench.cpp
@@ -10,10 +10,10 @@
 #define BARRETENBERG_SRS_PATH "../srs_db/ignition"
 
 using namespace benchmark;
-using namespace proof_system::plonk;
+using namespace bb::plonk;
 
-using Builder = proof_system::UltraCircuitBuilder;
-using Composer = proof_system::plonk::UltraComposer;
+using Builder = bb::UltraCircuitBuilder;
+using Composer = bb::plonk::UltraComposer;
 
 constexpr size_t NUM_CIRCUITS = 10;
 
@@ -45,7 +45,7 @@ void generate_test_pedersen_hash_circuit(Builder& builder, size_t num_repetition
     plonk::stdlib::field_t<Builder> out(plonk::stdlib::witness_t(&builder, bb::fr::random_element()));
 
     for (size_t i = 0; i < num_repetitions; ++i) {
-        out = proof_system::plonk::stdlib::pedersen_hash<Builder>::hash({ left, out });
+        out = bb::plonk::stdlib::pedersen_hash<Builder>::hash({ left, out });
     }
 }
 
@@ -56,7 +56,7 @@ void generate_test_pedersen_hash_buffer_circuit(Builder& builder, size_t num_rep
         stdlib::byte_array<Builder> tmp(plonk::stdlib::witness_t(&builder, bb::fr::random_element()));
         input.write(tmp);
     }
-    auto out = proof_system::plonk::stdlib::pedersen_hash<Builder>::hash_buffer(input);
+    auto out = bb::plonk::stdlib::pedersen_hash<Builder>::hash_buffer(input);
     (void)out;
 }
 
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/hash/pedersen/pedersen.cpp b/barretenberg/cpp/src/barretenberg/stdlib/hash/pedersen/pedersen.cpp
index 3c0237f39e61..799322feb265 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/hash/pedersen/pedersen.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/hash/pedersen/pedersen.cpp
@@ -1,9 +1,9 @@
 #include "pedersen.hpp"
 #include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp"
-namespace proof_system::plonk::stdlib {
+namespace bb::plonk::stdlib {
 
 using namespace bb;
-using namespace proof_system;
+using namespace bb;
 
 template <typename C>
 field_t<C> pedersen_hash<C>::hash(const std::vector<field_ct>& inputs, const GeneratorContext context)
@@ -86,8 +86,8 @@ field_t<C> pedersen_hash<C>::hash_buffer(const stdlib::byte_array<C>& input, Gen
     }
     return hashed;
 }
-template class pedersen_hash<proof_system::StandardCircuitBuilder>;
-template class pedersen_hash<proof_system::UltraCircuitBuilder>;
-template class pedersen_hash<proof_system::GoblinUltraCircuitBuilder>;
+template class pedersen_hash<bb::StandardCircuitBuilder>;
+template class pedersen_hash<bb::UltraCircuitBuilder>;
+template class pedersen_hash<bb::GoblinUltraCircuitBuilder>;
 
-} // namespace proof_system::plonk::stdlib
+} // namespace bb::plonk::stdlib
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/hash/pedersen/pedersen.hpp b/barretenberg/cpp/src/barretenberg/stdlib/hash/pedersen/pedersen.hpp
index 44bc2f8f874d..d58a5b4e19cb 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/hash/pedersen/pedersen.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/hash/pedersen/pedersen.hpp
@@ -6,7 +6,7 @@
 
 #include "../../primitives/circuit_builders/circuit_builders.hpp"
 
-namespace proof_system::plonk::stdlib {
+namespace bb::plonk::stdlib {
 
 using namespace bb;
 /**
@@ -31,4 +31,4 @@ template <typename Builder> class pedersen_hash {
     static field_ct hash_buffer(const stdlib::byte_array<Builder>& input, GeneratorContext context = {});
 };
 
-} // namespace proof_system::plonk::stdlib
+} // namespace bb::plonk::stdlib
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/hash/pedersen/pedersen.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/hash/pedersen/pedersen.test.cpp
index 8801ed0d5d48..920854842ad9 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/hash/pedersen/pedersen.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/hash/pedersen/pedersen.test.cpp
@@ -7,7 +7,7 @@
 
 namespace test_StdlibPedersen {
 using namespace bb;
-using namespace proof_system::plonk;
+using namespace bb::plonk;
 namespace {
 auto& engine = numeric::random::get_debug_engine();
 }
@@ -245,7 +245,7 @@ template <typename Builder> class StdlibPedersen : public testing::Test {
     }
 };
 
-using CircuitTypes = testing::Types<proof_system::StandardCircuitBuilder, proof_system::UltraCircuitBuilder>;
+using CircuitTypes = testing::Types<bb::StandardCircuitBuilder, bb::UltraCircuitBuilder>;
 
 TYPED_TEST_SUITE(StdlibPedersen, CircuitTypes);
 
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/hash/poseidon2/poseidon2.cpp b/barretenberg/cpp/src/barretenberg/stdlib/hash/poseidon2/poseidon2.cpp
index fd6a4f868e13..0adf82d77864 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/hash/poseidon2/poseidon2.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/hash/poseidon2/poseidon2.cpp
@@ -1,9 +1,9 @@
 #include "barretenberg/stdlib/hash/poseidon2/poseidon2.hpp"
 #include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp"
-namespace proof_system::plonk::stdlib {
+namespace bb::plonk::stdlib {
 
 using namespace bb;
-using namespace proof_system;
+using namespace bb;
 
 /**
  * @brief Hash a vector of field_ct.
@@ -41,6 +41,6 @@ template <typename C> field_t<C> poseidon2<C>::hash_buffer(C& builder, const std
     }
     return hash(builder, elements);
 }
-template class poseidon2<proof_system::GoblinUltraCircuitBuilder>;
+template class poseidon2<bb::GoblinUltraCircuitBuilder>;
 
-} // namespace proof_system::plonk::stdlib
+} // namespace bb::plonk::stdlib
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/hash/poseidon2/poseidon2.hpp b/barretenberg/cpp/src/barretenberg/stdlib/hash/poseidon2/poseidon2.hpp
index b367f4801063..031424627aed 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/hash/poseidon2/poseidon2.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/hash/poseidon2/poseidon2.hpp
@@ -6,7 +6,7 @@
 
 #include "../../primitives/circuit_builders/circuit_builders.hpp"
 
-namespace proof_system::plonk::stdlib {
+namespace bb::plonk::stdlib {
 
 using namespace bb;
 /**
@@ -30,6 +30,6 @@ template <typename Builder> class poseidon2 {
     static field_ct hash_buffer(Builder& builder, const stdlib::byte_array<Builder>& input);
 };
 
-extern template class poseidon2<proof_system::GoblinUltraCircuitBuilder>;
+extern template class poseidon2<bb::GoblinUltraCircuitBuilder>;
 
-} // namespace proof_system::plonk::stdlib
+} // namespace bb::plonk::stdlib
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/hash/poseidon2/poseidon2.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/hash/poseidon2/poseidon2.test.cpp
index d487533a59cd..b42c0ea396f0 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/hash/poseidon2/poseidon2.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/hash/poseidon2/poseidon2.test.cpp
@@ -6,7 +6,7 @@
 
 namespace test_StdlibPoseidon2 {
 using namespace bb;
-using namespace proof_system::plonk;
+using namespace bb::plonk;
 namespace {
 auto& engine = numeric::random::get_debug_engine();
 }
@@ -148,7 +148,7 @@ template <typename Builder> class StdlibPoseidon2 : public testing::Test {
     }
 };
 
-using CircuitTypes = testing::Types<proof_system::GoblinUltraCircuitBuilder>;
+using CircuitTypes = testing::Types<bb::GoblinUltraCircuitBuilder>;
 
 TYPED_TEST_SUITE(StdlibPoseidon2, CircuitTypes);
 
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/hash/poseidon2/poseidon2_permutation.cpp b/barretenberg/cpp/src/barretenberg/stdlib/hash/poseidon2/poseidon2_permutation.cpp
index fc8a8cd300d0..cbb8f7ae7642 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/hash/poseidon2/poseidon2_permutation.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/hash/poseidon2/poseidon2_permutation.cpp
@@ -3,7 +3,7 @@
 #include "barretenberg/proof_system/arithmetization/gate_data.hpp"
 #include "barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.hpp"
 
-namespace proof_system::plonk::stdlib {
+namespace bb::plonk::stdlib {
 
 /**
  * @brief Circuit form of Poseidon2 permutation from https://eprint.iacr.org/2023/323.
@@ -205,4 +205,4 @@ void Poseidon2Permutation<Params, Builder>::initial_external_matrix_multiplicati
 
 template class Poseidon2Permutation<crypto::Poseidon2Bn254ScalarFieldParams, GoblinUltraCircuitBuilder>;
 
-} // namespace proof_system::plonk::stdlib
\ No newline at end of file
+} // namespace bb::plonk::stdlib
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/hash/poseidon2/poseidon2_permutation.hpp b/barretenberg/cpp/src/barretenberg/stdlib/hash/poseidon2/poseidon2_permutation.hpp
index 08391b7dafe5..c8fc1d76db16 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/hash/poseidon2/poseidon2_permutation.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/hash/poseidon2/poseidon2_permutation.hpp
@@ -6,9 +6,9 @@
 #include "barretenberg/crypto/poseidon2/poseidon2_permutation.hpp"
 #include "barretenberg/stdlib/primitives/field/field.hpp"
 
-namespace proof_system::plonk::stdlib {
+namespace bb::plonk::stdlib {
 
-using namespace proof_system;
+using namespace bb;
 template <typename Params, typename Builder> class Poseidon2Permutation {
   public:
     using NativePermutation = crypto::Poseidon2Permutation<Params>;
@@ -64,4 +64,4 @@ template <typename Params, typename Builder> class Poseidon2Permutation {
 
 extern template class Poseidon2Permutation<crypto::Poseidon2Bn254ScalarFieldParams, GoblinUltraCircuitBuilder>;
 
-} // namespace proof_system::plonk::stdlib
\ No newline at end of file
+} // namespace bb::plonk::stdlib
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/hash/poseidon2/sponge/sponge.hpp b/barretenberg/cpp/src/barretenberg/stdlib/hash/poseidon2/sponge/sponge.hpp
index 359faf50f945..2c1f89d86dae 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/hash/poseidon2/sponge/sponge.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/hash/poseidon2/sponge/sponge.hpp
@@ -9,7 +9,7 @@
 #include "barretenberg/stdlib/hash/poseidon2/poseidon2_permutation.hpp"
 #include "barretenberg/stdlib/primitives/field/field.hpp"
 
-namespace proof_system::plonk::stdlib {
+namespace bb::plonk::stdlib {
 
 /**
  * @brief Implements the circuit form of a cryptographic sponge over prime fields.
@@ -179,4 +179,4 @@ template <size_t rate, size_t capacity, size_t t, typename Permutation, typename
         return hash_variable_length<1>(builder, input)[0];
     }
 };
-} // namespace proof_system::plonk::stdlib
\ No newline at end of file
+} // namespace bb::plonk::stdlib
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/hash/sha256/sha256.cpp b/barretenberg/cpp/src/barretenberg/stdlib/hash/sha256/sha256.cpp
index 6b51aac55197..f1bffd203182 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/hash/sha256/sha256.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/hash/sha256/sha256.cpp
@@ -3,7 +3,7 @@
 #include "barretenberg/stdlib/primitives/circuit_builders/circuit_builders.hpp"
 #include "sha256_plookup.hpp"
 
-namespace proof_system::plonk {
+namespace bb::plonk {
 namespace stdlib {
 namespace internal {
 constexpr uint32_t init_constants[8]{ 0x6a09e667, 0xbb67ae85, 0x3c6ef372, 0xa54ff53a,
@@ -179,17 +179,13 @@ template <typename Builder> packed_byte_array<Builder> sha256(const packed_byte_
     return packed_byte_array<Builder>(output, 4);
 }
 
-template byte_array<proof_system::StandardCircuitBuilder> sha256_block(
-    const byte_array<proof_system::StandardCircuitBuilder>& input);
-template byte_array<proof_system::UltraCircuitBuilder> sha256_block(
-    const byte_array<proof_system::UltraCircuitBuilder>& input);
-template byte_array<proof_system::GoblinUltraCircuitBuilder> sha256_block(
-    const byte_array<proof_system::GoblinUltraCircuitBuilder>& input);
-template packed_byte_array<proof_system::StandardCircuitBuilder> sha256(
-    const packed_byte_array<proof_system::StandardCircuitBuilder>& input);
-template packed_byte_array<proof_system::UltraCircuitBuilder> sha256(
-    const packed_byte_array<proof_system::UltraCircuitBuilder>& input);
-template packed_byte_array<proof_system::GoblinUltraCircuitBuilder> sha256(
-    const packed_byte_array<proof_system::GoblinUltraCircuitBuilder>& input);
+template byte_array<bb::StandardCircuitBuilder> sha256_block(const byte_array<bb::StandardCircuitBuilder>& input);
+template byte_array<bb::UltraCircuitBuilder> sha256_block(const byte_array<bb::UltraCircuitBuilder>& input);
+template byte_array<bb::GoblinUltraCircuitBuilder> sha256_block(const byte_array<bb::GoblinUltraCircuitBuilder>& input);
+template packed_byte_array<bb::StandardCircuitBuilder> sha256(
+    const packed_byte_array<bb::StandardCircuitBuilder>& input);
+template packed_byte_array<bb::UltraCircuitBuilder> sha256(const packed_byte_array<bb::UltraCircuitBuilder>& input);
+template packed_byte_array<bb::GoblinUltraCircuitBuilder> sha256(
+    const packed_byte_array<bb::GoblinUltraCircuitBuilder>& input);
 } // namespace stdlib
-} // namespace proof_system::plonk
+} // namespace bb::plonk
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/hash/sha256/sha256.hpp b/barretenberg/cpp/src/barretenberg/stdlib/hash/sha256/sha256.hpp
index c6b3216f688f..ba13e088b555 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/hash/sha256/sha256.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/hash/sha256/sha256.hpp
@@ -5,9 +5,9 @@
 #include "barretenberg/stdlib/primitives/uint/uint.hpp"
 #include "sha256_plookup.hpp"
 #include <array>
-// namespace proof_system::plonk
+// namespace bb::plonk
 
-namespace proof_system::plonk {
+namespace bb::plonk {
 namespace stdlib {
 template <typename Builder> class bit_array;
 
@@ -25,4 +25,4 @@ template <typename Builder> field_t<Builder> sha256_to_field(const packed_byte_a
 }
 
 } // namespace stdlib
-} // namespace proof_system::plonk
+} // namespace bb::plonk
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/hash/sha256/sha256.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/hash/sha256/sha256.test.cpp
index 6e2a1b2148e7..c9951da44a6a 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/hash/sha256/sha256.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/hash/sha256/sha256.test.cpp
@@ -13,12 +13,12 @@ namespace {
 auto& engine = numeric::random::get_debug_engine();
 }
 
-namespace proof_system::test_stdlib_sha256 {
+namespace bb::test_stdlib_sha256 {
 
 using namespace bb;
-using namespace proof_system::plonk::stdlib;
+using namespace bb::plonk::stdlib;
 
-using Builder = proof_system::UltraCircuitBuilder;
+using Builder = bb::UltraCircuitBuilder;
 
 using byte_array_ct = byte_array<Builder>;
 using packed_byte_array_ct = packed_byte_array<Builder>;
@@ -120,18 +120,18 @@ std::array<uint64_t, 8> inner_block(std::array<uint64_t, 64>& w)
 //     auto builder = UltraPlonkBuilder();
 
 //     std::array<uint64_t, 64> w_inputs;
-//     std::array<proof_system::plonk::stdlib::field_t<proof_system::UltraCircuitBuilder>, 64> w_elements;
+//     std::array<bb::plonk::stdlib::field_t<bb::UltraCircuitBuilder>, 64> w_elements;
 
 //     for (size_t i = 0; i < 64; ++i) {
 //         w_inputs[i] = engine.get_random_uint32();
-//         w_elements[i] = proof_system::plonk::stdlib::witness_t<proof_system::UltraCircuitBuilder>(&builder,
+//         w_elements[i] = bb::plonk::stdlib::witness_t<bb::UltraCircuitBuilder>(&builder,
 //         bb::fr(w_inputs[i]));
 //     }
 
 //     const auto expected = inner_block(w_inputs);
 
-//     const std::array<proof_system::plonk::stdlib::field_t<proof_system::UltraCircuitBuilder>, 8> result =
-//         proof_system::plonk::stdlib::sha256_inner_block(w_elements);
+//     const std::array<bb::plonk::stdlib::field_t<bb::UltraCircuitBuilder>, 8> result =
+//         bb::plonk::stdlib::sha256_inner_block(w_elements);
 //     for (size_t i = 0; i < 8; ++i) {
 //         EXPECT_EQ(uint256_t(result[i].get_value()).data[0] & 0xffffffffUL,
 //                   uint256_t(expected[i]).data[0] & 0xffffffffUL);
@@ -141,22 +141,22 @@ std::array<uint64_t, 8> inner_block(std::array<uint64_t, 64>& w)
 //     auto prover = composer.create_prover();
 
 //     auto verifier = composer.create_verifier();
-//     proof_system::plonk::proof proof = prover.construct_proof();
+//     bb::plonk::proof proof = prover.construct_proof();
 //     bool proof_result = builder.check_circuit();
 //     EXPECT_EQ(proof_result, true);
 // }
 
 TEST(stdlib_sha256, test_plookup_55_bytes)
 {
-    typedef proof_system::plonk::stdlib::field_t<proof_system::UltraCircuitBuilder> field_pt;
-    typedef proof_system::plonk::stdlib::packed_byte_array<proof_system::UltraCircuitBuilder> packed_byte_array_pt;
+    typedef bb::plonk::stdlib::field_t<bb::UltraCircuitBuilder> field_pt;
+    typedef bb::plonk::stdlib::packed_byte_array<bb::UltraCircuitBuilder> packed_byte_array_pt;
 
     // 55 bytes is the largest number of bytes that can be hashed in a single block,
     // accounting for the single padding bit, and the 64 size bits required by the SHA-256 standard.
-    auto builder = proof_system::UltraCircuitBuilder();
+    auto builder = bb::UltraCircuitBuilder();
     packed_byte_array_pt input(&builder, "An 8 character password? Snow White and the 7 Dwarves..");
 
-    packed_byte_array_pt output_bits = proof_system::plonk::stdlib::sha256(input);
+    packed_byte_array_pt output_bits = bb::plonk::stdlib::sha256(input);
 
     std::vector<field_pt> output = output_bits.to_unverified_byte_slices(4);
 
@@ -181,7 +181,7 @@ TEST(stdlib_sha256, test_55_bytes)
     auto builder = Builder();
     packed_byte_array_ct input(&builder, "An 8 character password? Snow White and the 7 Dwarves..");
 
-    packed_byte_array_ct output_bits = proof_system::plonk::stdlib::sha256(input);
+    packed_byte_array_ct output_bits = bb::plonk::stdlib::sha256(input);
 
     std::vector<field_ct> output = output_bits.to_unverified_byte_slices(4);
 
@@ -201,13 +201,13 @@ TEST(stdlib_sha256, test_55_bytes)
 
 TEST(stdlib_sha256, test_NIST_vector_one_packed_byte_array)
 {
-    typedef proof_system::plonk::stdlib::field_t<proof_system::UltraCircuitBuilder> field_pt;
-    typedef proof_system::plonk::stdlib::packed_byte_array<proof_system::UltraCircuitBuilder> packed_byte_array_pt;
+    typedef bb::plonk::stdlib::field_t<bb::UltraCircuitBuilder> field_pt;
+    typedef bb::plonk::stdlib::packed_byte_array<bb::UltraCircuitBuilder> packed_byte_array_pt;
 
-    auto builder = proof_system::UltraCircuitBuilder();
+    auto builder = bb::UltraCircuitBuilder();
 
     packed_byte_array_pt input(&builder, "abc");
-    packed_byte_array_pt output_bytes = proof_system::plonk::stdlib::sha256(input);
+    packed_byte_array_pt output_bytes = bb::plonk::stdlib::sha256(input);
     std::vector<field_pt> output = output_bytes.to_unverified_byte_slices(4);
     EXPECT_EQ(uint256_t(output[0].get_value()).data[0], (uint64_t)0xBA7816BFU);
     EXPECT_EQ(uint256_t(output[1].get_value()).data[0], (uint64_t)0x8F01CFEAU);
@@ -225,14 +225,14 @@ TEST(stdlib_sha256, test_NIST_vector_one_packed_byte_array)
 
 TEST(stdlib_sha256, test_NIST_vector_one)
 {
-    typedef proof_system::plonk::stdlib::field_t<proof_system::UltraCircuitBuilder> field_pt;
-    typedef proof_system::plonk::stdlib::packed_byte_array<proof_system::UltraCircuitBuilder> packed_byte_array_pt;
+    typedef bb::plonk::stdlib::field_t<bb::UltraCircuitBuilder> field_pt;
+    typedef bb::plonk::stdlib::packed_byte_array<bb::UltraCircuitBuilder> packed_byte_array_pt;
 
-    auto builder = proof_system::UltraCircuitBuilder();
+    auto builder = bb::UltraCircuitBuilder();
 
     packed_byte_array_pt input(&builder, "abc");
 
-    packed_byte_array_pt output_bits = proof_system::plonk::stdlib::sha256(input);
+    packed_byte_array_pt output_bits = bb::plonk::stdlib::sha256(input);
 
     std::vector<field_pt> output = output_bits.to_unverified_byte_slices(4);
 
@@ -256,7 +256,7 @@ TEST(stdlib_sha256, test_NIST_vector_two)
 
     byte_array_ct input(&builder, "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq");
 
-    byte_array_ct output_bits = proof_system::plonk::stdlib::sha256<Builder>(input);
+    byte_array_ct output_bits = bb::plonk::stdlib::sha256<Builder>(input);
 
     std::vector<field_ct> output = packed_byte_array_ct(output_bits).to_unverified_byte_slices(4);
 
@@ -281,7 +281,7 @@ TEST(stdlib_sha256, test_NIST_vector_three)
     // one byte, 0xbd
     byte_array_ct input(&builder, std::vector<uint8_t>{ 0xbd });
 
-    byte_array_ct output_bits = proof_system::plonk::stdlib::sha256<Builder>(input);
+    byte_array_ct output_bits = bb::plonk::stdlib::sha256<Builder>(input);
 
     std::vector<field_ct> output = packed_byte_array_ct(output_bits).to_unverified_byte_slices(4);
 
@@ -306,7 +306,7 @@ TEST(stdlib_sha256, test_NIST_vector_four)
     // 4 bytes, 0xc98c8e55
     byte_array_ct input(&builder, std::vector<uint8_t>{ 0xc9, 0x8c, 0x8e, 0x55 });
 
-    byte_array_ct output_bits = proof_system::plonk::stdlib::sha256<Builder>(input);
+    byte_array_ct output_bits = bb::plonk::stdlib::sha256<Builder>(input);
 
     std::vector<field_ct> output = packed_byte_array_ct(output_bits).to_unverified_byte_slices(4);
 
@@ -327,10 +327,10 @@ TEST(stdlib_sha256, test_NIST_vector_four)
 
 HEAVY_TEST(stdlib_sha256, test_NIST_vector_five)
 {
-    typedef proof_system::plonk::stdlib::field_t<proof_system::UltraCircuitBuilder> field_pt;
-    typedef proof_system::plonk::stdlib::packed_byte_array<proof_system::UltraCircuitBuilder> packed_byte_array_pt;
+    typedef bb::plonk::stdlib::field_t<bb::UltraCircuitBuilder> field_pt;
+    typedef bb::plonk::stdlib::packed_byte_array<bb::UltraCircuitBuilder> packed_byte_array_pt;
 
-    auto builder = proof_system::UltraCircuitBuilder();
+    auto builder = bb::UltraCircuitBuilder();
 
     packed_byte_array_pt input(
         &builder,
@@ -345,7 +345,7 @@ HEAVY_TEST(stdlib_sha256, test_NIST_vector_five)
         "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
         "AAAAAAAAAA");
 
-    packed_byte_array_pt output_bits = proof_system::plonk::stdlib::sha256<proof_system::UltraCircuitBuilder>(input);
+    packed_byte_array_pt output_bits = bb::plonk::stdlib::sha256<bb::UltraCircuitBuilder>(input);
 
     std::vector<field_pt> output = output_bits.to_unverified_byte_slices(4);
 
@@ -374,7 +374,7 @@ TEST(stdlib_sha256, test_input_len_multiple)
         auto input_buf = std::vector<uint8_t>(inp, 1);
 
         byte_array_ct input(&builder, input_buf);
-        byte_array_ct output_bits = proof_system::plonk::stdlib::sha256<Builder>(input);
+        byte_array_ct output_bits = bb::plonk::stdlib::sha256<Builder>(input);
 
         auto circuit_output = output_bits.get_value();
 
@@ -418,7 +418,7 @@ TEST(stdlib_sha256, test_input_str_len_multiple)
         auto input_buf = std::vector<uint8_t>(input_str.begin(), input_str.end());
 
         byte_array_ct input(&builder, input_buf);
-        byte_array_ct output_bits = proof_system::plonk::stdlib::sha256<Builder>(input);
+        byte_array_ct output_bits = bb::plonk::stdlib::sha256<Builder>(input);
 
         auto circuit_output = output_bits.get_value();
 
@@ -428,4 +428,4 @@ TEST(stdlib_sha256, test_input_str_len_multiple)
     }
 }
 
-} // namespace proof_system::test_stdlib_sha256
+} // namespace bb::test_stdlib_sha256
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/hash/sha256/sha256_plookup.cpp b/barretenberg/cpp/src/barretenberg/stdlib/hash/sha256/sha256_plookup.cpp
index 6268ab5315a6..56679f75bed9 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/hash/sha256/sha256_plookup.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/hash/sha256/sha256_plookup.cpp
@@ -9,7 +9,7 @@
 
 using namespace bb;
 
-namespace proof_system::plonk {
+namespace bb::plonk {
 namespace stdlib {
 namespace sha256_plookup {
 
@@ -363,10 +363,9 @@ template <typename Builder> packed_byte_array<Builder> sha256(const packed_byte_
     return packed_byte_array<Builder>(output, 4);
 }
 
-template packed_byte_array<proof_system::UltraCircuitBuilder> sha256(
-    const packed_byte_array<proof_system::UltraCircuitBuilder>& input);
-template packed_byte_array<proof_system::GoblinUltraCircuitBuilder> sha256(
-    const packed_byte_array<proof_system::GoblinUltraCircuitBuilder>& input);
+template packed_byte_array<bb::UltraCircuitBuilder> sha256(const packed_byte_array<bb::UltraCircuitBuilder>& input);
+template packed_byte_array<bb::GoblinUltraCircuitBuilder> sha256(
+    const packed_byte_array<bb::GoblinUltraCircuitBuilder>& input);
 } // namespace sha256_plookup
 } // namespace stdlib
-} // namespace proof_system::plonk
+} // namespace bb::plonk
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/hash/sha256/sha256_plookup.hpp b/barretenberg/cpp/src/barretenberg/stdlib/hash/sha256/sha256_plookup.hpp
index 302e0642d133..b068978c28f4 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/hash/sha256/sha256_plookup.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/hash/sha256/sha256_plookup.hpp
@@ -9,7 +9,7 @@
 #include "../../primitives/field/field.hpp"
 #include "../../primitives/packed_byte_array/packed_byte_array.hpp"
 
-namespace proof_system::plonk {
+namespace bb::plonk {
 namespace stdlib {
 namespace sha256_plookup {
 
@@ -87,4 +87,4 @@ std::array<field_t<Builder>, 8> sha256_block(const std::array<field_t<Builder>,
 template <typename Builder> packed_byte_array<Builder> sha256(const packed_byte_array<Builder>& input);
 } // namespace sha256_plookup
 } // namespace stdlib
-} // namespace proof_system::plonk
+} // namespace bb::plonk
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/hash.hpp b/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/hash.hpp
index ae3e3bb6effe..5248eaedf318 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/hash.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/hash.hpp
@@ -8,7 +8,7 @@
 #include "barretenberg/stdlib/primitives/field/field.hpp"
 #include <vector>
 
-namespace proof_system::plonk::stdlib::merkle_tree {
+namespace bb::plonk::stdlib::merkle_tree {
 
 inline bb::fr hash_pair_native(bb::fr const& lhs, bb::fr const& rhs)
 {
@@ -63,4 +63,4 @@ inline std::vector<bb::fr> compute_tree_native(std::vector<bb::fr> const& input)
     return tree;
 }
 
-} // namespace proof_system::plonk::stdlib::merkle_tree
+} // namespace bb::plonk::stdlib::merkle_tree
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/hash.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/hash.test.cpp
index 73a4af577c01..a159c1452a68 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/hash.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/hash.test.cpp
@@ -5,12 +5,12 @@
 #include "barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp"
 #include "barretenberg/stdlib/merkle_tree/membership.hpp"
 
-namespace proof_system::stdlib_merkle_tree_hash_test {
+namespace bb::stdlib_merkle_tree_hash_test {
 
 using namespace bb;
-using namespace proof_system::plonk::stdlib;
+using namespace bb::plonk::stdlib;
 
-using Builder = proof_system::UltraCircuitBuilder;
+using Builder = bb::UltraCircuitBuilder;
 
 using field_ct = field_t<Builder>;
 using witness_ct = witness_t<Builder>;
@@ -64,4 +64,4 @@ TEST(stdlib_merkle_tree_hash, compute_tree_native)
     }
     EXPECT_EQ(tree_vector.back(), mem_tree.root());
 }
-} // namespace proof_system::stdlib_merkle_tree_hash_test
\ No newline at end of file
+} // namespace bb::stdlib_merkle_tree_hash_test
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/hash_path.hpp b/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/hash_path.hpp
index 8a31b5062988..49ca47ad2c50 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/hash_path.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/hash_path.hpp
@@ -4,7 +4,7 @@
 #include <algorithm>
 #include <vector>
 
-namespace proof_system::plonk::stdlib::merkle_tree {
+namespace bb::plonk::stdlib::merkle_tree {
 
 using namespace bb;
 
@@ -61,13 +61,13 @@ inline fr zero_hash_at_height(size_t height)
     return current;
 }
 
-} // namespace proof_system::plonk::stdlib::merkle_tree
+} // namespace bb::plonk::stdlib::merkle_tree
 
 // We add to std namespace as fr_hash_path is actually a std::vector, and this is the only way
 // to achieve effective ADL.
 namespace std {
 template <typename Ctx>
-inline std::ostream& operator<<(std::ostream& os, proof_system::plonk::stdlib::merkle_tree::hash_path<Ctx> const& path)
+inline std::ostream& operator<<(std::ostream& os, bb::plonk::stdlib::merkle_tree::hash_path<Ctx> const& path)
 {
     os << "[\n";
     for (size_t i = 0; i < path.size(); ++i) {
@@ -77,7 +77,7 @@ inline std::ostream& operator<<(std::ostream& os, proof_system::plonk::stdlib::m
     return os;
 }
 
-inline std::ostream& operator<<(std::ostream& os, proof_system::plonk::stdlib::merkle_tree::fr_hash_path const& path)
+inline std::ostream& operator<<(std::ostream& os, bb::plonk::stdlib::merkle_tree::fr_hash_path const& path)
 {
     os << "[\n";
     for (size_t i = 0; i < path.size(); ++i) {
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/membership.hpp b/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/membership.hpp
index cbc667283bc8..ea5a0770c8ae 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/membership.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/membership.hpp
@@ -4,9 +4,7 @@
 #include "barretenberg/stdlib/primitives/field/field.hpp"
 #include "hash_path.hpp"
 
-namespace proof_system::plonk {
-namespace stdlib {
-namespace merkle_tree {
+namespace bb::plonk::stdlib::merkle_tree {
 
 template <typename Builder> using bit_vector = std::vector<bool_t<Builder>>;
 /**
@@ -316,6 +314,4 @@ void batch_update_membership(field_t<Builder> const& new_root,
         new_root, rollup_root, old_root, old_path, zero_subtree_root, start_index.decompose_into_bits(), height, msg);
 }
 
-} // namespace merkle_tree
-} // namespace stdlib
-} // namespace proof_system::plonk
+} // namespace bb::plonk::stdlib::merkle_tree
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/membership.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/membership.test.cpp
index af42b027a29c..3901e70bac83 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/membership.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/membership.test.cpp
@@ -11,13 +11,13 @@ namespace {
 auto& engine = numeric::random::get_debug_engine();
 }
 
-namespace proof_system::stdlib_merkle_test {
+namespace bb::stdlib_merkle_test {
 
 using namespace bb;
-using namespace proof_system::plonk::stdlib::merkle_tree;
-using namespace proof_system::plonk::stdlib;
+using namespace bb::plonk::stdlib::merkle_tree;
+using namespace bb::plonk::stdlib;
 
-using Builder = proof_system::UltraCircuitBuilder;
+using Builder = bb::UltraCircuitBuilder;
 
 using bool_ct = bool_t<Builder>;
 using field_ct = field_t<Builder>;
@@ -247,4 +247,4 @@ TEST(stdlib_merkle_tree, test_update_memberships)
     bool result = builder.check_circuit();
     EXPECT_EQ(result, true);
 }
-} // namespace proof_system::stdlib_merkle_test
\ No newline at end of file
+} // namespace bb::stdlib_merkle_test
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/memory_store.hpp b/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/memory_store.hpp
index d3e69928a47d..117f2f5f0b7a 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/memory_store.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/memory_store.hpp
@@ -4,7 +4,7 @@
 #include <map>
 #include <set>
 
-namespace proof_system::plonk {
+namespace bb::plonk {
 namespace stdlib {
 namespace merkle_tree {
 
@@ -88,4 +88,4 @@ class MemoryStore {
 
 } // namespace merkle_tree
 } // namespace stdlib
-} // namespace proof_system::plonk
+} // namespace bb::plonk
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/memory_tree.cpp b/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/memory_tree.cpp
index 4d5217e35082..eb23a56074ab 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/memory_tree.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/memory_tree.cpp
@@ -1,9 +1,7 @@
 #include "memory_tree.hpp"
 #include "hash.hpp"
 
-namespace proof_system::plonk {
-namespace stdlib {
-namespace merkle_tree {
+namespace bb::plonk::stdlib::merkle_tree {
 
 MemoryTree::MemoryTree(size_t depth)
     : depth_(depth)
@@ -76,6 +74,4 @@ fr MemoryTree::update_element(size_t index, fr const& value)
     return root_;
 }
 
-} // namespace merkle_tree
-} // namespace stdlib
-} // namespace proof_system::plonk
\ No newline at end of file
+} // namespace bb::plonk::stdlib::merkle_tree
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/memory_tree.hpp b/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/memory_tree.hpp
index 604bec13e763..0b107c6fae2b 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/memory_tree.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/memory_tree.hpp
@@ -1,9 +1,7 @@
 #pragma once
 #include "hash_path.hpp"
 
-namespace proof_system::plonk {
-namespace stdlib {
-namespace merkle_tree {
+namespace bb::plonk::stdlib::merkle_tree {
 
 using namespace bb;
 
@@ -43,6 +41,4 @@ class MemoryTree {
     std::vector<bb::fr> hashes_;
 };
 
-} // namespace merkle_tree
-} // namespace stdlib
-} // namespace proof_system::plonk
\ No newline at end of file
+} // namespace bb::plonk::stdlib::merkle_tree
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/memory_tree.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/memory_tree.test.cpp
index f86095b1b820..11b200f80ab5 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/memory_tree.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/memory_tree.test.cpp
@@ -2,7 +2,7 @@
 #include <gtest/gtest.h>
 
 using namespace bb;
-using namespace proof_system::plonk::stdlib::merkle_tree;
+using namespace bb::plonk::stdlib::merkle_tree;
 
 static std::vector<fr> VALUES = []() {
     std::vector<fr> values(4);
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/merkle_tree.bench.cpp b/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/merkle_tree.bench.cpp
index a32a879373cf..06217714b79b 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/merkle_tree.bench.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/merkle_tree.bench.cpp
@@ -5,7 +5,7 @@
 #include <benchmark/benchmark.h>
 
 using namespace benchmark;
-using namespace proof_system::plonk::stdlib::merkle_tree;
+using namespace bb::plonk::stdlib::merkle_tree;
 
 namespace {
 auto& engine = numeric::random::get_debug_engine();
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/merkle_tree.cpp b/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/merkle_tree.cpp
index b4886651ecfe..4e93004b394b 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/merkle_tree.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/merkle_tree.cpp
@@ -8,7 +8,7 @@
 #include <iostream>
 #include <sstream>
 
-namespace proof_system::plonk {
+namespace bb::plonk {
 namespace stdlib {
 namespace merkle_tree {
 
@@ -355,4 +355,4 @@ template class MerkleTree<MemoryStore>;
 
 } // namespace merkle_tree
 } // namespace stdlib
-} // namespace proof_system::plonk
+} // namespace bb::plonk
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/merkle_tree.hpp b/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/merkle_tree.hpp
index 1c25cb79e836..e7a19e2f87e4 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/merkle_tree.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/merkle_tree.hpp
@@ -2,7 +2,7 @@
 #include "barretenberg/stdlib/primitives/field/field.hpp"
 #include "hash_path.hpp"
 
-namespace proof_system::plonk {
+namespace bb::plonk {
 namespace stdlib {
 namespace merkle_tree {
 
@@ -99,4 +99,4 @@ template <typename Store> class MerkleTree {
 
 } // namespace merkle_tree
 } // namespace stdlib
-} // namespace proof_system::plonk
+} // namespace bb::plonk
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/merkle_tree.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/merkle_tree.test.cpp
index 0715c5be073d..37ca27f07cef 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/merkle_tree.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/merkle_tree.test.cpp
@@ -5,12 +5,12 @@
 #include "memory_store.hpp"
 #include "memory_tree.hpp"
 
-namespace proof_system::test_stdlib_merkle_tree {
+namespace bb::test_stdlib_merkle_tree {
 
-using namespace proof_system::plonk::stdlib;
-using namespace proof_system::plonk::stdlib::merkle_tree;
+using namespace bb::plonk::stdlib;
+using namespace bb::plonk::stdlib::merkle_tree;
 
-using Builder = proof_system::UltraCircuitBuilder;
+using Builder = bb::UltraCircuitBuilder;
 
 using field_ct = field_t<Builder>;
 using witness_ct = witness_t<Builder>;
@@ -184,4 +184,4 @@ TEST(stdlib_merkle_tree, test_get_sibling_path_layers)
         EXPECT_NE(before[2], after[2]);
     }
 }
-} // namespace proof_system::test_stdlib_merkle_tree
\ No newline at end of file
+} // namespace bb::test_stdlib_merkle_tree
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/nullifier_tree/nullifier_leaf.hpp b/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/nullifier_tree/nullifier_leaf.hpp
index 0bd8034cc271..88625381ce45 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/nullifier_tree/nullifier_leaf.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/nullifier_tree/nullifier_leaf.hpp
@@ -2,7 +2,7 @@
 #include "barretenberg/crypto/pedersen_commitment/pedersen.hpp"
 #include "barretenberg/serialize/msgpack.hpp"
 
-namespace proof_system::plonk {
+namespace bb::plonk {
 namespace stdlib {
 namespace merkle_tree {
 
@@ -115,4 +115,4 @@ inline std::pair<size_t, bool> find_closest_leaf(std::vector<WrappedNullifierLea
 
 } // namespace merkle_tree
 } // namespace stdlib
-} // namespace proof_system::plonk
+} // namespace bb::plonk
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/nullifier_tree/nullifier_memory_tree.cpp b/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/nullifier_tree/nullifier_memory_tree.cpp
index f070ab2dedbd..c38d3506d287 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/nullifier_tree/nullifier_memory_tree.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/nullifier_tree/nullifier_memory_tree.cpp
@@ -1,7 +1,7 @@
 #include "nullifier_memory_tree.hpp"
 #include "../hash.hpp"
 
-namespace proof_system::plonk {
+namespace bb::plonk {
 namespace stdlib {
 namespace merkle_tree {
 
@@ -74,4 +74,4 @@ fr NullifierMemoryTree::update_element(fr const& value)
 
 } // namespace merkle_tree
 } // namespace stdlib
-} // namespace proof_system::plonk
\ No newline at end of file
+} // namespace bb::plonk
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/nullifier_tree/nullifier_memory_tree.hpp b/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/nullifier_tree/nullifier_memory_tree.hpp
index be57eb7c9078..a8023c44295e 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/nullifier_tree/nullifier_memory_tree.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/nullifier_tree/nullifier_memory_tree.hpp
@@ -3,7 +3,7 @@
 #include "../memory_tree.hpp"
 #include "nullifier_leaf.hpp"
 
-namespace proof_system::plonk {
+namespace bb::plonk {
 namespace stdlib {
 namespace merkle_tree {
 
@@ -95,4 +95,4 @@ class NullifierMemoryTree : public MemoryTree {
 
 } // namespace merkle_tree
 } // namespace stdlib
-} // namespace proof_system::plonk
\ No newline at end of file
+} // namespace bb::plonk
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/nullifier_tree/nullifier_memory_tree.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/nullifier_tree/nullifier_memory_tree.test.cpp
index 6636641e1080..ed0dc57b2fa3 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/nullifier_tree/nullifier_memory_tree.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/nullifier_tree/nullifier_memory_tree.test.cpp
@@ -2,7 +2,7 @@
 #include <gtest/gtest.h>
 
 using namespace bb;
-using namespace proof_system::plonk::stdlib::merkle_tree;
+using namespace bb::plonk::stdlib::merkle_tree;
 
 void print_tree(const size_t depth, std::vector<fr> hashes, std::string const& msg)
 {
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/nullifier_tree/nullifier_tree.cpp b/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/nullifier_tree/nullifier_tree.cpp
index 083ae99a7e4d..5b4b920866e1 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/nullifier_tree/nullifier_tree.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/nullifier_tree/nullifier_tree.cpp
@@ -9,7 +9,7 @@
 #include <iostream>
 #include <sstream>
 
-namespace proof_system::plonk {
+namespace bb::plonk {
 namespace stdlib {
 namespace merkle_tree {
 
@@ -87,4 +87,4 @@ template class NullifierTree<MemoryStore>;
 
 } // namespace merkle_tree
 } // namespace stdlib
-} // namespace proof_system::plonk
\ No newline at end of file
+} // namespace bb::plonk
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/nullifier_tree/nullifier_tree.hpp b/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/nullifier_tree/nullifier_tree.hpp
index ddb7ef9471dc..ae2c6a164354 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/nullifier_tree/nullifier_tree.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/nullifier_tree/nullifier_tree.hpp
@@ -3,7 +3,7 @@
 #include "../merkle_tree.hpp"
 #include "nullifier_leaf.hpp"
 
-namespace proof_system::plonk {
+namespace bb::plonk {
 namespace stdlib {
 namespace merkle_tree {
 
@@ -40,4 +40,4 @@ template <typename Store> class NullifierTree : public MerkleTree<Store> {
 
 } // namespace merkle_tree
 } // namespace stdlib
-} // namespace proof_system::plonk
+} // namespace bb::plonk
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/nullifier_tree/nullifier_tree.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/nullifier_tree/nullifier_tree.test.cpp
index f8d55f3d3ad0..6ed72c3347ca 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/nullifier_tree/nullifier_tree.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/nullifier_tree/nullifier_tree.test.cpp
@@ -6,7 +6,7 @@
 #include "nullifier_memory_tree.hpp"
 
 using namespace bb;
-using namespace proof_system::plonk::stdlib::merkle_tree;
+using namespace bb::plonk::stdlib::merkle_tree;
 
 namespace {
 auto& engine = numeric::random::get_debug_engine();
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/address/address.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/address/address.hpp
index 7525c4f13435..865f64247e7f 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/address/address.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/address/address.hpp
@@ -6,7 +6,7 @@
 #include "barretenberg/stdlib/primitives/group/cycle_group.hpp"
 #include "barretenberg/stdlib/primitives/witness/witness.hpp"
 
-namespace proof_system::plonk {
+namespace bb::plonk {
 namespace stdlib {
 
 using bb::fr;
@@ -144,4 +144,4 @@ template <typename Builder> class address_t {
 };
 
 } // namespace stdlib
-} // namespace proof_system::plonk
+} // namespace bb::plonk
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield.fuzzer.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield.fuzzer.hpp
index 86e26fea2d17..b4293709ed4c 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield.fuzzer.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield.fuzzer.hpp
@@ -121,11 +121,11 @@ FastRandom VarianceRNG(0);
  */
 template <typename Builder> class BigFieldBase {
   private:
-    typedef proof_system::plonk::stdlib::bool_t<Builder> bool_t;
-    typedef proof_system::plonk::stdlib::field_t<Builder> field_t;
-    typedef proof_system::plonk::stdlib::witness_t<Builder> witness_t;
-    typedef proof_system::plonk::stdlib::public_witness_t<Builder> public_witness_t;
-    typedef proof_system::plonk::stdlib::bigfield<Builder, bb::Bn254FqParams> bigfield_t;
+    typedef bb::plonk::stdlib::bool_t<Builder> bool_t;
+    typedef bb::plonk::stdlib::field_t<Builder> field_t;
+    typedef bb::plonk::stdlib::witness_t<Builder> witness_t;
+    typedef bb::plonk::stdlib::public_witness_t<Builder> public_witness_t;
+    typedef bb::plonk::stdlib::bigfield<Builder, bb::Bn254FqParams> bigfield_t;
 
   public:
     /**
@@ -1930,7 +1930,7 @@ extern "C" int LLVMFuzzerInitialize(int* argc, char*** argv)
  */
 extern "C" size_t LLVMFuzzerCustomMutator(uint8_t* Data, size_t Size, size_t MaxSize, unsigned int Seed)
 {
-    using FuzzerClass = BigFieldBase<proof_system::StandardCircuitBuilder>;
+    using FuzzerClass = BigFieldBase<bb::StandardCircuitBuilder>;
     auto fast_random = FastRandom(Seed);
     auto size_occupied = ArithmeticFuzzHelper<FuzzerClass>::MutateInstructionBuffer(Data, Size, MaxSize, fast_random);
     if ((fast_random.next() % 200) < fuzzer_havoc_settings.GEN_LLVM_POST_MUTATION_PROB) {
@@ -1951,7 +1951,7 @@ extern "C" size_t LLVMFuzzerCustomCrossOver(const uint8_t* Data1,
                                             size_t MaxOutSize,
                                             unsigned int Seed)
 {
-    using FuzzerClass = BigFieldBase<proof_system::StandardCircuitBuilder>;
+    using FuzzerClass = BigFieldBase<bb::StandardCircuitBuilder>;
     auto fast_random = FastRandom(Seed);
     auto vecA = ArithmeticFuzzHelper<FuzzerClass>::parseDataIntoInstructions(Data1, Size1);
     auto vecB = ArithmeticFuzzHelper<FuzzerClass>::parseDataIntoInstructions(Data2, Size2);
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield.hpp
index 6bd83a79eefc..1662f4507e37 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield.hpp
@@ -11,7 +11,7 @@
 
 #include "../circuit_builders/circuit_builders_fwd.hpp"
 
-namespace proof_system::plonk {
+namespace bb::plonk {
 namespace stdlib {
 
 template <typename Builder, typename T> class bigfield {
@@ -498,6 +498,6 @@ template <typename C, typename T> inline std::ostream& operator<<(std::ostream&
 }
 
 } // namespace stdlib
-} // namespace proof_system::plonk
+} // namespace bb::plonk
 
 #include "bigfield_impl.hpp"
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield.test.cpp
index 9cc10d289d6f..cfc9141f4ce3 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield.test.cpp
@@ -20,7 +20,7 @@
 
 namespace test_stdlib_bigfield {
 using namespace bb;
-using namespace proof_system::plonk;
+using namespace bb::plonk;
 
 /* A note regarding Plookup:
    stdlib_bigfield_plookup tests were present when this file was standardized
@@ -847,7 +847,7 @@ template <typename Builder> class stdlib_bigfield : public testing::Test {
 };
 
 // Define types for which the above tests will be constructed.
-typedef testing::Types<proof_system::StandardCircuitBuilder, proof_system::UltraCircuitBuilder> CircuitTypes;
+typedef testing::Types<bb::StandardCircuitBuilder, bb::UltraCircuitBuilder> CircuitTypes;
 // Define the suite of tests.
 TYPED_TEST_SUITE(stdlib_bigfield, CircuitTypes);
 TYPED_TEST(stdlib_bigfield, badmul)
@@ -979,7 +979,7 @@ TYPED_TEST(stdlib_bigfield, division_context)
 // // PLOOKUP TESTS
 // TEST(stdlib_bigfield_plookup, test_mul)
 // {
-//     plonk::UltraPlonkBuilder builder = proof_system::plonk::UltraPlonkBuilder();
+//     plonk::UltraPlonkBuilder builder = bb::plonk::UltraPlonkBuilder();
 //     size_t num_repetitions = 1;
 //     for (size_t i = 0; i < num_repetitions; ++i) {
 //         fq inputs[3]{ fq::random_element(), fq::random_element(), fq::random_element() };
@@ -1026,7 +1026,7 @@ TYPED_TEST(stdlib_bigfield, division_context)
 
 // TEST(stdlib_bigfield_plookup, test_sqr)
 // {
-//     plonk::UltraPlonkBuilder builder = proof_system::plonk::UltraPlonkBuilder();
+//     plonk::UltraPlonkBuilder builder = bb::plonk::UltraPlonkBuilder();
 //     size_t num_repetitions = 10;
 //     for (size_t i = 0; i < num_repetitions; ++i) {
 //         fq inputs[3]{ fq::random_element(), fq::random_element(), fq::random_element() };
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield_impl.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield_impl.hpp
index d9f61931e2e9..c726ab4cebd6 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield_impl.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield_impl.hpp
@@ -11,7 +11,7 @@
 
 using namespace bb;
 
-namespace proof_system::plonk {
+namespace bb::plonk {
 namespace stdlib {
 
 template <typename Builder, typename T>
@@ -2023,7 +2023,7 @@ void bigfield<Builder, T>::unsafe_evaluate_multiply_add(const bigfield& input_le
         };
         field_t<Builder> remainder_prime_limb = field_t<Builder>::accumulate(prime_limb_accumulator);
 
-        proof_system::non_native_field_witnesses<bb::fr> witnesses{
+        bb::non_native_field_witnesses<bb::fr> witnesses{
             {
                 left.binary_basis_limbs[0].element.normalize().witness_index,
                 left.binary_basis_limbs[1].element.normalize().witness_index,
@@ -2363,7 +2363,7 @@ void bigfield<Builder, T>::unsafe_evaluate_multiple_multiply_add(const std::vect
             }
 
             if (i > 0) {
-                proof_system::non_native_field_witnesses<bb::fr> mul_witnesses = {
+                bb::non_native_field_witnesses<bb::fr> mul_witnesses = {
                     {
                         left[i].binary_basis_limbs[0].element.normalize().witness_index,
                         left[i].binary_basis_limbs[1].element.normalize().witness_index,
@@ -2459,7 +2459,7 @@ void bigfield<Builder, T>::unsafe_evaluate_multiple_multiply_add(const std::vect
         };
         field_t<Builder> remainder_prime_limb = field_t<Builder>::accumulate(prime_limb_accumulator);
 
-        proof_system::non_native_field_witnesses<bb::fr> witnesses{
+        bb::non_native_field_witnesses<bb::fr> witnesses{
             {
                 left[0].binary_basis_limbs[0].element.normalize().witness_index,
                 left[0].binary_basis_limbs[1].element.normalize().witness_index,
@@ -2938,4 +2938,4 @@ std::pair<bool, size_t> bigfield<Builder, T>::get_quotient_reduction_info(const
 }
 
 } // namespace stdlib
-} // namespace proof_system::plonk
+} // namespace bb::plonk
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup.hpp
index ba81f2027c15..46cb7096a04a 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup.hpp
@@ -16,7 +16,7 @@
 template <typename Builder, typename NativeGroup>
 concept IsNotGoblinInefficiencyTrap = !(IsGoblinBuilder<Builder> && std::same_as<NativeGroup, bb::g1>);
 
-namespace proof_system::plonk::stdlib {
+namespace bb::plonk::stdlib {
 
 // ( ͡° ͜ʖ ͡°)
 template <class Builder, class Fq, class Fr, class NativeGroup> class element {
@@ -905,7 +905,7 @@ inline std::ostream& operator<<(std::ostream& os, element<C, Fq, Fr, G> const& v
 {
     return os << "{ " << v.x << " , " << v.y << " }";
 }
-} // namespace proof_system::plonk::stdlib
+} // namespace bb::plonk::stdlib
 
 #include "biggroup_batch_mul.hpp"
 #include "biggroup_bn254.hpp"
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup.test.cpp
index e80440aaa4f1..a3f8c2cd38d0 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup.test.cpp
@@ -14,7 +14,7 @@ namespace {
 auto& engine = numeric::random::get_debug_engine();
 }
 
-using namespace proof_system::plonk;
+using namespace bb::plonk;
 
 // One can only define a TYPED_TEST with a single template paramter.
 // Our workaround is to pass parameters of the following type.
@@ -819,9 +819,9 @@ template <typename TestType> class stdlib_biggroup : public testing::Test {
 };
 
 enum UseBigfield { No, Yes };
-using TestTypes = testing::Types<TestType<stdlib::bn254<proof_system::StandardCircuitBuilder>, UseBigfield::No>,
-                                 TestType<stdlib::bn254<proof_system::UltraCircuitBuilder>, UseBigfield::Yes>,
-                                 TestType<stdlib::bn254<proof_system::GoblinUltraCircuitBuilder>, UseBigfield::No>>;
+using TestTypes = testing::Types<TestType<stdlib::bn254<bb::StandardCircuitBuilder>, UseBigfield::No>,
+                                 TestType<stdlib::bn254<bb::UltraCircuitBuilder>, UseBigfield::Yes>,
+                                 TestType<stdlib::bn254<bb::GoblinUltraCircuitBuilder>, UseBigfield::No>>;
 
 TYPED_TEST_SUITE(stdlib_biggroup, TestTypes);
 
@@ -907,7 +907,7 @@ HEAVY_TYPED_TEST(stdlib_biggroup, multiple_montgomery_ladder)
 HEAVY_TYPED_TEST(stdlib_biggroup, compute_naf)
 {
     // ULTRATODO: make this work for secp curves
-    if constexpr (TypeParam::Curve::type == proof_system::CurveType::BN254) {
+    if constexpr (TypeParam::Curve::type == bb::CurveType::BN254) {
         size_t num_repetitions = 1;
         for (size_t i = 0; i < num_repetitions; i++) {
             TestFixture::test_compute_naf();
@@ -980,7 +980,7 @@ HEAVY_TYPED_TEST(stdlib_biggroup, wnaf_batch_4)
 /* The following tests are specific to BN254 and don't work when Fr is a bigfield */
 HEAVY_TYPED_TEST(stdlib_biggroup, bn254_endo_batch_mul)
 {
-    if constexpr (TypeParam::Curve::type == proof_system::CurveType::BN254 && !TypeParam::use_bigfield) {
+    if constexpr (TypeParam::Curve::type == bb::CurveType::BN254 && !TypeParam::use_bigfield) {
         if constexpr (HasGoblinBuilder<TypeParam>) {
             GTEST_SKIP() << "https://github.com/AztecProtocol/barretenberg/issues/707";
         } else {
@@ -992,7 +992,7 @@ HEAVY_TYPED_TEST(stdlib_biggroup, bn254_endo_batch_mul)
 }
 HEAVY_TYPED_TEST(stdlib_biggroup, mixed_mul_bn254_endo)
 {
-    if constexpr (TypeParam::Curve::type == proof_system::CurveType::BN254 && !TypeParam::use_bigfield) {
+    if constexpr (TypeParam::Curve::type == bb::CurveType::BN254 && !TypeParam::use_bigfield) {
         if constexpr (HasGoblinBuilder<TypeParam>) {
             GTEST_SKIP() << "https://github.com/AztecProtocol/barretenberg/issues/707";
         } else {
@@ -1006,7 +1006,7 @@ HEAVY_TYPED_TEST(stdlib_biggroup, mixed_mul_bn254_endo)
 /* The following tests are specific to SECP256k1 */
 HEAVY_TYPED_TEST(stdlib_biggroup, wnaf_secp256k1)
 {
-    if constexpr (TypeParam::Curve::type == proof_system::CurveType::SECP256K1) {
+    if constexpr (TypeParam::Curve::type == bb::CurveType::SECP256K1) {
         TestFixture::test_wnaf_secp256k1();
     } else {
         GTEST_SKIP();
@@ -1014,7 +1014,7 @@ HEAVY_TYPED_TEST(stdlib_biggroup, wnaf_secp256k1)
 }
 HEAVY_TYPED_TEST(stdlib_biggroup, wnaf_8bit_secp256k1)
 {
-    if constexpr (TypeParam::Curve::type == proof_system::CurveType::SECP256K1) {
+    if constexpr (TypeParam::Curve::type == bb::CurveType::SECP256K1) {
         TestFixture::test_wnaf_8bit_secp256k1();
     } else {
         GTEST_SKIP();
@@ -1022,7 +1022,7 @@ HEAVY_TYPED_TEST(stdlib_biggroup, wnaf_8bit_secp256k1)
 }
 HEAVY_TYPED_TEST(stdlib_biggroup, ecdsa_mul_secp256k1)
 {
-    if constexpr (TypeParam::Curve::type == proof_system::CurveType::SECP256K1) {
+    if constexpr (TypeParam::Curve::type == bb::CurveType::SECP256K1) {
         TestFixture::test_ecdsa_mul_secp256k1();
     } else {
         GTEST_SKIP();
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_batch_mul.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_batch_mul.hpp
index 5cd3f7b861fb..34a4d044bbe4 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_batch_mul.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_batch_mul.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-namespace proof_system::plonk {
+namespace bb::plonk {
 namespace stdlib {
 
 /**
@@ -58,4 +58,4 @@ element<C, Fq, Fr, G> element<C, Fq, Fr, G>::wnaf_batch_mul(const std::vector<el
     return accumulator;
 }
 } // namespace stdlib
-} // namespace proof_system::plonk
\ No newline at end of file
+} // namespace bb::plonk
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_bn254.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_bn254.hpp
index 75f72b15f19d..9302ae795d27 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_bn254.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_bn254.hpp
@@ -7,7 +7,7 @@
  * We use a special case algorithm to split bn254 scalar multipliers into endomorphism scalars
  *
  **/
-namespace proof_system::plonk {
+namespace bb::plonk {
 namespace stdlib {
 
 /**
@@ -424,4 +424,4 @@ element<C, Fq, Fr, G> element<C, Fq, Fr, G>::bn254_endo_batch_mul(const std::vec
     return accumulator;
 }
 } // namespace stdlib
-} // namespace proof_system::plonk
\ No newline at end of file
+} // namespace bb::plonk
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_goblin.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_goblin.hpp
index 675ed03396d6..e520ce972151 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_goblin.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_goblin.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-namespace proof_system::plonk {
+namespace bb::plonk {
 namespace stdlib {
 
 /**
@@ -93,4 +93,4 @@ element<C, Fq, Fr, G> element<C, Fq, Fr, G>::goblin_batch_mul(const std::vector<
 }
 
 } // namespace stdlib
-} // namespace proof_system::plonk
+} // namespace bb::plonk
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_goblin.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_goblin.test.cpp
index 04f61ef7843c..020ec2bac132 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_goblin.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_goblin.test.cpp
@@ -14,7 +14,7 @@ namespace {
 auto& engine = numeric::random::get_debug_engine();
 }
 
-using namespace proof_system::plonk;
+using namespace bb::plonk;
 
 template <typename Curve> class stdlib_biggroup_goblin : public testing::Test {
     using element_ct = typename Curve::Element;
@@ -77,7 +77,7 @@ template <typename Curve> class stdlib_biggroup_goblin : public testing::Test {
     }
 };
 
-using TestTypes = testing::Types<stdlib::bn254<proof_system::GoblinUltraCircuitBuilder>>;
+using TestTypes = testing::Types<stdlib::bn254<bb::GoblinUltraCircuitBuilder>>;
 
 TYPED_TEST_SUITE(stdlib_biggroup_goblin, TestTypes);
 
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_impl.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_impl.hpp
index c5181c32ba94..1fa1ba11dd25 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_impl.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_impl.hpp
@@ -5,7 +5,7 @@
 
 using namespace bb;
 
-namespace proof_system::plonk::stdlib {
+namespace bb::plonk::stdlib {
 
 template <typename C, class Fq, class Fr, class G>
 element<C, Fq, Fr, G>::element()
@@ -730,4 +730,4 @@ element<C, Fq, Fr, G> element<C, Fq, Fr, G>::operator*(const Fr& scalar) const
         return element(out_x, out_y) - element(offset_generators.second);
     }
 }
-} // namespace proof_system::plonk::stdlib
+} // namespace bb::plonk::stdlib
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_nafs.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_nafs.hpp
index ba10e3e9f8d2..4b6e2c71e098 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_nafs.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_nafs.hpp
@@ -1,7 +1,7 @@
 #pragma once
 #include "barretenberg/ecc/curves/secp256k1/secp256k1.hpp"
 
-namespace proof_system::plonk {
+namespace bb::plonk {
 namespace stdlib {
 
 /**
@@ -568,4 +568,4 @@ std::vector<bool_t<C>> element<C, Fq, Fr, G>::compute_naf(const Fr& scalar, cons
     return naf_entries;
 }
 } // namespace stdlib
-} // namespace proof_system::plonk
+} // namespace bb::plonk
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_secp256k1.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_secp256k1.hpp
index e84d1f8d8914..ef3ae673f1fd 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_secp256k1.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_secp256k1.hpp
@@ -5,7 +5,7 @@
  * TODO: we should try to genericize this, but this method is super fiddly and we need it to be efficient!
  *
  **/
-namespace proof_system::plonk {
+namespace bb::plonk {
 namespace stdlib {
 
 template <typename C, class Fq, class Fr, class G>
@@ -141,4 +141,4 @@ element<C, Fq, Fr, G> element<C, Fq, Fr, G>::secp256k1_ecdsa_mul(const element&
     return accumulator;
 }
 } // namespace stdlib
-} // namespace proof_system::plonk
\ No newline at end of file
+} // namespace bb::plonk
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_tables.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_tables.hpp
index b413458a2d06..93c10fdc8770 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_tables.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_tables.hpp
@@ -1,6 +1,6 @@
 #pragma once
 #include "barretenberg/proof_system/plookup_tables/types.hpp"
-namespace proof_system::plonk {
+namespace bb::plonk {
 namespace stdlib {
 
 using plookup::MultiTableId;
@@ -644,4 +644,4 @@ element<C, Fq, Fr, G> element<C, Fq, Fr, G>::lookup_table_base<length>::get(
     return element::one(bits[0].get_context());
 }
 } // namespace stdlib
-} // namespace proof_system::plonk
+} // namespace bb::plonk
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array.cpp
index e83383509359..d6b044b022c8 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array.cpp
@@ -3,7 +3,7 @@
 
 #include <bitset>
 
-namespace proof_system::plonk {
+namespace bb::plonk {
 namespace stdlib {
 
 template <typename Builder>
@@ -157,9 +157,9 @@ template <typename Builder> std::string bit_array<Builder>::get_witness_as_strin
     return output;
 }
 
-template class bit_array<proof_system::StandardCircuitBuilder>;
-template class bit_array<proof_system::UltraCircuitBuilder>;
-template class bit_array<proof_system::GoblinUltraCircuitBuilder>;
+template class bit_array<bb::StandardCircuitBuilder>;
+template class bit_array<bb::UltraCircuitBuilder>;
+template class bit_array<bb::GoblinUltraCircuitBuilder>;
 
 } // namespace stdlib
-} // namespace proof_system::plonk
+} // namespace bb::plonk
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array.fuzzer.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array.fuzzer.hpp
index d4ad0fb0febd..b09004c1d4d8 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array.fuzzer.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array.fuzzer.hpp
@@ -30,10 +30,10 @@ FastRandom VarianceRNG(0);
  */
 template <typename Builder> class BitArrayFuzzBase {
   private:
-    typedef proof_system::plonk::stdlib::bit_array<Builder> bit_array_t;
-    typedef proof_system::plonk::stdlib::byte_array<Builder> byte_array_t;
+    typedef bb::plonk::stdlib::bit_array<Builder> bit_array_t;
+    typedef bb::plonk::stdlib::byte_array<Builder> byte_array_t;
     template <size_t NumBytes, size_t NumWords>
-    static std::vector<uint8_t> to_vector(std::array<proof_system::plonk::stdlib::uint32<Builder>, NumWords>& a32)
+    static std::vector<uint8_t> to_vector(std::array<bb::plonk::stdlib::uint32<Builder>, NumWords>& a32)
     {
         /* Convert array of uint32_t to vector of uint8_t */
         std::vector<uint8_t> v(NumBytes);
@@ -60,7 +60,7 @@ template <typename Builder> class BitArrayFuzzBase {
              */
             return static_cast<byte_array_t>(bit_array).get_value();
         } else if (bit_array.size() - offset == NumBits) {
-            std::array<proof_system::plonk::stdlib::uint32<Builder>, NumWords> a32;
+            std::array<bb::plonk::stdlib::uint32<Builder>, NumWords> a32;
             bit_array.template populate_uint32_array<NumWords>(offset, a32);
             return to_vector<NumBytes, NumWords>(a32);
         } else {
@@ -92,7 +92,7 @@ template <typename Builder> class BitArrayFuzzBase {
              */
             return static_cast<byte_array_t>(bit_array).get_value();
         } else if (bit_array.size() == NumBits) {
-            std::array<proof_system::plonk::stdlib::uint32<Builder>, NumWords> a32;
+            std::array<bb::plonk::stdlib::uint32<Builder>, NumWords> a32;
 
             /* Switch between two different methods to retrieve the uint32 array */
             if (cast_or_populate) {
@@ -445,8 +445,7 @@ template <typename Builder> class BitArrayFuzzBase {
                 if (bit_array.size() == MAX_ARRAY_SIZE / 32) {
                     std::array<uint32_t, MAX_ARRAY_SIZE> a32;
                     const auto a32_ =
-                        static_cast<std::array<proof_system::plonk::stdlib::uint32<Builder>, MAX_ARRAY_SIZE>>(
-                            bit_array);
+                        static_cast<std::array<bb::plonk::stdlib::uint32<Builder>, MAX_ARRAY_SIZE>>(bit_array);
                     for (size_t i = 0; i < a32_.size(); i++) {
                         a32[i] = static_cast<uint32_t>(a32_[i].get_value());
                     }
@@ -883,7 +882,7 @@ extern "C" int LLVMFuzzerInitialize(int* argc, char*** argv)
  */
 extern "C" size_t LLVMFuzzerCustomMutator(uint8_t* Data, size_t Size, size_t MaxSize, unsigned int Seed)
 {
-    using FuzzerClass = BitArrayFuzzBase<proof_system::StandardCircuitBuilder>;
+    using FuzzerClass = BitArrayFuzzBase<bb::StandardCircuitBuilder>;
     auto fast_random = FastRandom(Seed);
     auto size_occupied = ArithmeticFuzzHelper<FuzzerClass>::MutateInstructionBuffer(Data, Size, MaxSize, fast_random);
     if ((fast_random.next() % 200) < fuzzer_havoc_settings.GEN_LLVM_POST_MUTATION_PROB) {
@@ -904,7 +903,7 @@ extern "C" size_t LLVMFuzzerCustomCrossOver(const uint8_t* Data1,
                                             size_t MaxOutSize,
                                             unsigned int Seed)
 {
-    using FuzzerClass = BitArrayFuzzBase<proof_system::StandardCircuitBuilder>;
+    using FuzzerClass = BitArrayFuzzBase<bb::StandardCircuitBuilder>;
     auto fast_random = FastRandom(Seed);
     auto vecA = ArithmeticFuzzHelper<FuzzerClass>::parseDataIntoInstructions(Data1, Size1);
     auto vecB = ArithmeticFuzzHelper<FuzzerClass>::parseDataIntoInstructions(Data2, Size2);
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array.hpp
index e589a3336c82..766d205795e8 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array.hpp
@@ -3,7 +3,7 @@
 #include "../uint/uint.hpp"
 #include <algorithm>
 
-namespace proof_system::plonk {
+namespace bb::plonk {
 namespace stdlib {
 
 template <typename Builder> class bit_array {
@@ -180,4 +180,4 @@ template <typename Builder> class bit_array {
 };
 
 } // namespace stdlib
-} // namespace proof_system::plonk
+} // namespace bb::plonk
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array.test.cpp
index 02d9fefec2ea..eb8de1d74123 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array.test.cpp
@@ -20,7 +20,7 @@
 namespace test_stdlib_bit_array {
 
 using namespace bb;
-using namespace proof_system::plonk;
+using namespace bb::plonk;
 
 namespace {
 auto& engine = numeric::random::get_debug_engine();
@@ -28,7 +28,7 @@ auto& engine = numeric::random::get_debug_engine();
 
 template <class Builder> class BitArrayTest : public ::testing::Test {};
 
-using CircuitTypes = ::testing::Types<proof_system::StandardCircuitBuilder, proof_system::UltraCircuitBuilder>;
+using CircuitTypes = ::testing::Types<bb::StandardCircuitBuilder, bb::UltraCircuitBuilder>;
 TYPED_TEST_SUITE(BitArrayTest, CircuitTypes);
 
 TYPED_TEST(BitArrayTest, test_uint32_input_output_consistency)
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/bool/bool.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/bool/bool.cpp
index 271e84521c29..bd59ca05fb57 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/bool/bool.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/bool/bool.cpp
@@ -2,9 +2,9 @@
 #include "../circuit_builders/circuit_builders.hpp"
 
 using namespace bb;
-using namespace proof_system;
+using namespace bb;
 
-namespace proof_system::plonk {
+namespace bb::plonk {
 namespace stdlib {
 
 template <typename Builder>
@@ -548,9 +548,9 @@ template <typename Builder> bool_t<Builder> bool_t<Builder>::normalize() const
     return *this;
 }
 
-template class bool_t<proof_system::StandardCircuitBuilder>;
-template class bool_t<proof_system::UltraCircuitBuilder>;
-template class bool_t<proof_system::GoblinUltraCircuitBuilder>;
+template class bool_t<bb::StandardCircuitBuilder>;
+template class bool_t<bb::UltraCircuitBuilder>;
+template class bool_t<bb::GoblinUltraCircuitBuilder>;
 
 } // namespace stdlib
-} // namespace proof_system::plonk
+} // namespace bb::plonk
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/bool/bool.fuzzer.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/bool/bool.fuzzer.hpp
index 886fc1e9a468..a01f222910af 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/bool/bool.fuzzer.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/bool/bool.fuzzer.hpp
@@ -27,8 +27,8 @@ FastRandom VarianceRNG(0);
  */
 template <typename Builder> class BoolFuzzBase {
   private:
-    typedef proof_system::plonk::stdlib::bool_t<Builder> bool_t;
-    typedef proof_system::plonk::stdlib::witness_t<Builder> witness_t;
+    typedef bb::plonk::stdlib::bool_t<Builder> bool_t;
+    typedef bb::plonk::stdlib::witness_t<Builder> witness_t;
 
   public:
     /**
@@ -801,7 +801,7 @@ extern "C" int LLVMFuzzerInitialize(int* argc, char*** argv)
  */
 extern "C" size_t LLVMFuzzerCustomMutator(uint8_t* Data, size_t Size, size_t MaxSize, unsigned int Seed)
 {
-    using FuzzerClass = BoolFuzzBase<proof_system::StandardCircuitBuilder>;
+    using FuzzerClass = BoolFuzzBase<bb::StandardCircuitBuilder>;
     auto fast_random = FastRandom(Seed);
     auto size_occupied = ArithmeticFuzzHelper<FuzzerClass>::MutateInstructionBuffer(Data, Size, MaxSize, fast_random);
     if ((fast_random.next() % 200) < fuzzer_havoc_settings.GEN_LLVM_POST_MUTATION_PROB) {
@@ -822,7 +822,7 @@ extern "C" size_t LLVMFuzzerCustomCrossOver(const uint8_t* Data1,
                                             size_t MaxOutSize,
                                             unsigned int Seed)
 {
-    using FuzzerClass = BoolFuzzBase<proof_system::StandardCircuitBuilder>;
+    using FuzzerClass = BoolFuzzBase<bb::StandardCircuitBuilder>;
     auto fast_random = FastRandom(Seed);
     auto vecA = ArithmeticFuzzHelper<FuzzerClass>::parseDataIntoInstructions(Data1, Size1);
     auto vecB = ArithmeticFuzzHelper<FuzzerClass>::parseDataIntoInstructions(Data2, Size2);
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/bool/bool.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/bool/bool.hpp
index abc983fedf53..bace1b9c8121 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/bool/bool.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/bool/bool.hpp
@@ -2,7 +2,7 @@
 #include "../circuit_builders/circuit_builders_fwd.hpp"
 #include "../witness/witness.hpp"
 
-namespace proof_system::plonk::stdlib {
+namespace bb::plonk::stdlib {
 
 template <typename Builder> class bool_t {
   public:
@@ -75,4 +75,4 @@ template <typename T> inline std::ostream& operator<<(std::ostream& os, bool_t<T
     return os << v.get_value();
 }
 
-} // namespace proof_system::plonk::stdlib
+} // namespace bb::plonk::stdlib
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/bool/bool.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/bool/bool.test.cpp
index 771226f64eb4..69ae06247c22 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/bool/bool.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/bool/bool.test.cpp
@@ -10,7 +10,7 @@
 
 namespace test_stdlib_bool {
 using namespace bb;
-using namespace proof_system::plonk;
+using namespace bb::plonk;
 
 namespace {
 auto& engine = numeric::random::get_debug_engine();
@@ -18,7 +18,7 @@ auto& engine = numeric::random::get_debug_engine();
 
 template <class Builder> class BoolTest : public ::testing::Test {};
 
-using CircuitTypes = ::testing::Types<proof_system::StandardCircuitBuilder, proof_system::UltraCircuitBuilder>;
+using CircuitTypes = ::testing::Types<bb::StandardCircuitBuilder, bb::UltraCircuitBuilder>;
 
 TYPED_TEST_SUITE(BoolTest, CircuitTypes);
 TYPED_TEST(BoolTest, TestBasicOperations)
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array.cpp
index c767b835affc..0cbb3149ebc3 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array.cpp
@@ -6,7 +6,7 @@
 
 using namespace bb;
 
-namespace proof_system::plonk {
+namespace bb::plonk {
 namespace stdlib {
 
 // ULTRA: Further merging with
@@ -380,9 +380,9 @@ typename byte_array<Builder>::byte_slice byte_array<Builder>::split_byte(const s
     return { low, scaled_high, bit };
 }
 
-template class byte_array<proof_system::StandardCircuitBuilder>;
-template class byte_array<proof_system::UltraCircuitBuilder>;
-template class byte_array<proof_system::GoblinUltraCircuitBuilder>;
+template class byte_array<bb::StandardCircuitBuilder>;
+template class byte_array<bb::UltraCircuitBuilder>;
+template class byte_array<bb::GoblinUltraCircuitBuilder>;
 
 } // namespace stdlib
-} // namespace proof_system::plonk
\ No newline at end of file
+} // namespace bb::plonk
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array.fuzzer.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array.fuzzer.hpp
index 6aa4d3f36575..049a309e1d6c 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array.fuzzer.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array.fuzzer.hpp
@@ -31,9 +31,9 @@ FastRandom VarianceRNG(0);
  */
 template <typename Builder> class ByteArrayFuzzBase {
   private:
-    typedef proof_system::plonk::stdlib::byte_array<Builder> byte_array_t;
-    typedef proof_system::plonk::stdlib::field_t<Builder> field_t;
-    typedef proof_system::plonk::stdlib::safe_uint_t<Builder> suint_t;
+    typedef bb::plonk::stdlib::byte_array<Builder> byte_array_t;
+    typedef bb::plonk::stdlib::field_t<Builder> field_t;
+    typedef bb::plonk::stdlib::safe_uint_t<Builder> suint_t;
 
     template <class From, class To> static To from_to(const From& in, const std::optional<size_t> size = std::nullopt)
     {
@@ -930,7 +930,7 @@ extern "C" int LLVMFuzzerInitialize(int* argc, char*** argv)
  */
 extern "C" size_t LLVMFuzzerCustomMutator(uint8_t* Data, size_t Size, size_t MaxSize, unsigned int Seed)
 {
-    using FuzzerClass = ByteArrayFuzzBase<proof_system::StandardCircuitBuilder>;
+    using FuzzerClass = ByteArrayFuzzBase<bb::StandardCircuitBuilder>;
     auto fast_random = FastRandom(Seed);
     auto size_occupied = ArithmeticFuzzHelper<FuzzerClass>::MutateInstructionBuffer(Data, Size, MaxSize, fast_random);
     if ((fast_random.next() % 200) < fuzzer_havoc_settings.GEN_LLVM_POST_MUTATION_PROB) {
@@ -951,7 +951,7 @@ extern "C" size_t LLVMFuzzerCustomCrossOver(const uint8_t* Data1,
                                             size_t MaxOutSize,
                                             unsigned int Seed)
 {
-    using FuzzerClass = ByteArrayFuzzBase<proof_system::StandardCircuitBuilder>;
+    using FuzzerClass = ByteArrayFuzzBase<bb::StandardCircuitBuilder>;
     auto fast_random = FastRandom(Seed);
     auto vecA = ArithmeticFuzzHelper<FuzzerClass>::parseDataIntoInstructions(Data1, Size1);
     auto vecB = ArithmeticFuzzHelper<FuzzerClass>::parseDataIntoInstructions(Data2, Size2);
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array.hpp
index c08e4bc372a8..ccc65f93f328 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array.hpp
@@ -3,7 +3,7 @@
 #include "../circuit_builders/circuit_builders_fwd.hpp"
 #include "../field/field.hpp"
 #include "../safe_uint/safe_uint.hpp"
-namespace proof_system::plonk {
+namespace bb::plonk {
 namespace stdlib {
 
 template <typename Builder> class byte_array {
@@ -100,4 +100,4 @@ template <typename Builder> inline std::ostream& operator<<(std::ostream& os, by
     return os;
 }
 } // namespace stdlib
-} // namespace proof_system::plonk
+} // namespace bb::plonk
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array.test.cpp
index 63b3f4f22876..5be205f75957 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array.test.cpp
@@ -9,7 +9,7 @@
 
 namespace test_stdlib_byte_array {
 using namespace bb;
-using namespace proof_system::plonk::stdlib;
+using namespace bb::plonk::stdlib;
 
 #define STDLIB_TYPE_ALIASES                                                                                            \
     using Builder = TypeParam;                                                                                         \
@@ -22,7 +22,7 @@ template <class Builder> class ByteArrayTest : public ::testing::Test {};
 
 template <class Builder> using byte_array_ct = byte_array<Builder>;
 
-using CircuitTypes = ::testing::Types<proof_system::StandardCircuitBuilder, proof_system::UltraCircuitBuilder>;
+using CircuitTypes = ::testing::Types<bb::StandardCircuitBuilder, bb::UltraCircuitBuilder>;
 TYPED_TEST_SUITE(ByteArrayTest, CircuitTypes);
 
 TYPED_TEST(ByteArrayTest, test_reverse)
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/circuit_builders/circuit_builders.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/circuit_builders/circuit_builders.hpp
index 26f844697c9a..050fe337f8f2 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/circuit_builders/circuit_builders.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/circuit_builders/circuit_builders.hpp
@@ -8,11 +8,10 @@
 #include "barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp"
 
 template <typename T>
-concept HasPlookup =
-    proof_system::IsAnyOf<T, proof_system::UltraCircuitBuilder, proof_system::GoblinUltraCircuitBuilder>;
+concept HasPlookup = bb::IsAnyOf<T, bb::UltraCircuitBuilder, bb::GoblinUltraCircuitBuilder>;
 
 template <typename T>
-concept IsGoblinBuilder = proof_system::IsAnyOf<T, proof_system::GoblinUltraCircuitBuilder>;
+concept IsGoblinBuilder = bb::IsAnyOf<T, bb::GoblinUltraCircuitBuilder>;
 template <typename T>
 concept IsNotGoblinBuilder = !
 IsGoblinBuilder<T>;
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/circuit_builders/circuit_builders_fwd.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/circuit_builders/circuit_builders_fwd.hpp
index d17994fc5812..b1427d772764 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/circuit_builders/circuit_builders_fwd.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/circuit_builders/circuit_builders_fwd.hpp
@@ -9,12 +9,12 @@ construction in stdlib and contains macros for explicit instantiation.
 #pragma once
 #include <concepts>
 
-namespace proof_system::honk {
+namespace bb::honk {
 namespace flavor {
 class Standard;
 class Ultra;
 } // namespace flavor
-} // namespace proof_system::honk
+} // namespace bb::honk
 
 namespace bb {
 class Bn254FrParams;
@@ -24,7 +24,7 @@ template <class Params> struct alignas(32) field;
 namespace arithmetization {
 template <typename FF_> class Ultra;
 } // namespace arithmetization
-namespace proof_system {
+namespace bb {
 template <class FF> class StandardCircuitBuilder_;
 using StandardCircuitBuilder = StandardCircuitBuilder_<bb::field<bb::Bn254FrParams>>;
 using StandardGrumpkinCircuitBuilder = StandardCircuitBuilder_<bb::field<bb::Bn254FqParams>>;
@@ -32,4 +32,4 @@ template <class Arithmetization> class UltraCircuitBuilder_;
 using UltraCircuitBuilder = UltraCircuitBuilder_<arithmetization::Ultra<bb::field<bb::Bn254FrParams>>>;
 template <class FF> class GoblinUltraCircuitBuilder_;
 using GoblinUltraCircuitBuilder = GoblinUltraCircuitBuilder_<bb::field<bb::Bn254FrParams>>;
-} // namespace proof_system
\ No newline at end of file
+} // namespace bb
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/curves/bn254.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/curves/bn254.hpp
index 6d0d88cff443..3bb9a27a14b6 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/curves/bn254.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/curves/bn254.hpp
@@ -4,11 +4,11 @@
 #include "../field/field.hpp"
 #include "barretenberg/ecc/curves/types.hpp"
 
-namespace proof_system::plonk {
+namespace bb::plonk {
 namespace stdlib {
 
 template <typename CircuitBuilder> struct bn254 {
-    static constexpr proof_system::CurveType type = proof_system::CurveType::BN254;
+    static constexpr bb::CurveType type = bb::CurveType::BN254;
     // TODO(#673): This flag is temporary. It is needed in the verifier classes (GeminiVerifier, etc.) while these
     // classes are instantiated with "native" curve types. Eventually, the verifier classes will be instantiated only
     // with stdlib types, and "native" verification will be acheived via a simulated builder.
@@ -43,4 +43,4 @@ template <typename CircuitBuilder> struct bn254 {
 
 }; // namespace bn254
 } // namespace stdlib
-} // namespace proof_system::plonk
+} // namespace bb::plonk
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/curves/secp256k1.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/curves/secp256k1.hpp
index a3123b820e0a..aebf8715081d 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/curves/secp256k1.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/curves/secp256k1.hpp
@@ -6,11 +6,11 @@
 
 #include "barretenberg/ecc/curves/secp256k1/secp256k1.hpp"
 
-namespace proof_system::plonk {
+namespace bb::plonk {
 namespace stdlib {
 
 template <typename CircuitType> struct secp256k1 {
-    static constexpr proof_system::CurveType type = proof_system::CurveType::SECP256K1;
+    static constexpr bb::CurveType type = bb::CurveType::SECP256K1;
 
     typedef ::secp256k1::fq fq;
     typedef ::secp256k1::fr fr;
@@ -30,4 +30,4 @@ template <typename CircuitType> struct secp256k1 {
     typedef element<Builder, fq_ct, bigfr_ct, g1> g1_bigfr_ct;
 };
 } // namespace stdlib
-} // namespace proof_system::plonk
+} // namespace bb::plonk
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/curves/secp256r1.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/curves/secp256r1.hpp
index e8f731560f08..570af3aec19f 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/curves/secp256r1.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/curves/secp256r1.hpp
@@ -6,11 +6,11 @@
 
 #include "barretenberg/ecc/curves/secp256r1/secp256r1.hpp"
 
-namespace proof_system::plonk {
+namespace bb::plonk {
 namespace stdlib {
 
 template <typename CircuitType> struct secp256r1 {
-    static constexpr proof_system::CurveType type = proof_system::CurveType::SECP256R1;
+    static constexpr bb::CurveType type = bb::CurveType::SECP256R1;
 
     typedef ::secp256r1::fq fq;
     typedef ::secp256r1::fr fr;
@@ -30,4 +30,4 @@ template <typename CircuitType> struct secp256r1 {
     typedef element<Builder, fq_ct, bigfr_ct, g1> g1_bigfr_ct;
 };
 } // namespace stdlib
-} // namespace proof_system::plonk
+} // namespace bb::plonk
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/array.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/array.hpp
index 61999ee3c855..6525850c7cde 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/array.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/array.hpp
@@ -3,7 +3,7 @@
 #include "../safe_uint/safe_uint.hpp"
 #include "field.hpp"
 
-namespace proof_system::plonk {
+namespace bb::plonk {
 namespace stdlib {
 
 /**
@@ -176,4 +176,4 @@ void push_array_to_array(std::array<field_t<Builder>, size_1> const& source,
 }
 
 } // namespace stdlib
-} // namespace proof_system::plonk
\ No newline at end of file
+} // namespace bb::plonk
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/array.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/array.test.cpp
index 9f65fb59a22c..b40b569a1ac8 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/array.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/array.test.cpp
@@ -15,7 +15,7 @@ auto& engine = numeric::random::get_debug_engine();
 template <class T> void ignore_unused(T&) {} // use to ignore unused variables in lambdas
 
 using namespace bb;
-using namespace proof_system::plonk;
+using namespace bb::plonk;
 
 template <typename Builder> class stdlib_array : public testing::Test {
     typedef stdlib::bool_t<Builder> bool_ct;
@@ -595,7 +595,7 @@ template <typename Builder> class stdlib_array : public testing::Test {
     }
 };
 
-typedef testing::Types<proof_system::StandardCircuitBuilder, proof_system::UltraCircuitBuilder> CircuitTypes;
+typedef testing::Types<bb::StandardCircuitBuilder, bb::UltraCircuitBuilder> CircuitTypes;
 
 TYPED_TEST_SUITE(stdlib_array, CircuitTypes);
 
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/field.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/field.cpp
index eca27a46ee88..3255cb71076e 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/field.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/field.cpp
@@ -4,9 +4,9 @@
 #include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp"
 #include <functional>
 
-using namespace proof_system;
+using namespace bb;
 
-namespace proof_system::plonk {
+namespace bb::plonk {
 namespace stdlib {
 
 template <typename Builder>
@@ -724,7 +724,7 @@ void field_t<Builder>::create_range_constraint(const size_t num_bits, std::strin
             if constexpr (HasPlookup<Builder>) {
                 context->decompose_into_default_range(normalize().get_witness_index(),
                                                       num_bits,
-                                                      proof_system::UltraCircuitBuilder::DEFAULT_PLOOKUP_RANGE_BITNUM,
+                                                      bb::UltraCircuitBuilder::DEFAULT_PLOOKUP_RANGE_BITNUM,
                                                       msg);
             } else {
                 context->decompose_into_base4_accumulators(normalize().get_witness_index(), num_bits, msg);
@@ -1140,9 +1140,9 @@ std::vector<bool_t<Builder>> field_t<Builder>::decompose_into_bits(
     return result;
 }
 
-template class field_t<proof_system::StandardCircuitBuilder>;
-template class field_t<proof_system::UltraCircuitBuilder>;
-template class field_t<proof_system::GoblinUltraCircuitBuilder>;
+template class field_t<bb::StandardCircuitBuilder>;
+template class field_t<bb::UltraCircuitBuilder>;
+template class field_t<bb::GoblinUltraCircuitBuilder>;
 
 } // namespace stdlib
-} // namespace proof_system::plonk
+} // namespace bb::plonk
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/field.fuzzer.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/field.fuzzer.hpp
index dccc80a409b7..e02d28e66705 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/field.fuzzer.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/field.fuzzer.hpp
@@ -120,10 +120,10 @@ FastRandom VarianceRNG(0);
  */
 template <typename Builder> class FieldBase {
   private:
-    typedef proof_system::plonk::stdlib::bool_t<Builder> bool_t;
-    typedef proof_system::plonk::stdlib::field_t<Builder> field_t;
-    typedef proof_system::plonk::stdlib::witness_t<Builder> witness_t;
-    typedef proof_system::plonk::stdlib::public_witness_t<Builder> public_witness_t;
+    typedef bb::plonk::stdlib::bool_t<Builder> bool_t;
+    typedef bb::plonk::stdlib::field_t<Builder> field_t;
+    typedef bb::plonk::stdlib::witness_t<Builder> witness_t;
+    typedef bb::plonk::stdlib::public_witness_t<Builder> public_witness_t;
 
   public:
     /**
@@ -1017,8 +1017,8 @@ template <typename Builder> class FieldBase {
                  *
                  * TEST(stdlib_field, test_construct_via_bool_t)
                  * {
-                 *     proof_system::StandardCircuitBuilder builder =
-                 * proof_system::proof_system::StandardCircuitBuilder(); field_t a(witness_t(&builder,
+                 *     bb::StandardCircuitBuilder builder =
+                 * bb::bb::StandardCircuitBuilder(); field_t a(witness_t(&builder,
                  * fr(uint256_t{0xf396b678452ebf15, 0x82ae10893982638b, 0xdf185a29c65fbf80, 0x1d18b2de99e48308})));
                  * field_t b = a - a; field_t c(static_cast<bool_t>(b)); std::cout << c.get_value() << std::endl;
                  * }
@@ -1969,7 +1969,7 @@ extern "C" int LLVMFuzzerInitialize(int* argc, char*** argv)
  */
 extern "C" size_t LLVMFuzzerCustomMutator(uint8_t* Data, size_t Size, size_t MaxSize, unsigned int Seed)
 {
-    using FuzzerClass = FieldBase<proof_system::StandardCircuitBuilder>;
+    using FuzzerClass = FieldBase<bb::StandardCircuitBuilder>;
     auto fast_random = FastRandom(Seed);
     auto size_occupied = ArithmeticFuzzHelper<FuzzerClass>::MutateInstructionBuffer(Data, Size, MaxSize, fast_random);
     if ((fast_random.next() % 200) < fuzzer_havoc_settings.GEN_LLVM_POST_MUTATION_PROB) {
@@ -1990,7 +1990,7 @@ extern "C" size_t LLVMFuzzerCustomCrossOver(const uint8_t* Data1,
                                             size_t MaxOutSize,
                                             unsigned int Seed)
 {
-    using FuzzerClass = FieldBase<proof_system::StandardCircuitBuilder>;
+    using FuzzerClass = FieldBase<bb::StandardCircuitBuilder>;
     auto fast_random = FastRandom(Seed);
     auto vecA = ArithmeticFuzzHelper<FuzzerClass>::parseDataIntoInstructions(Data1, Size1);
     auto vecB = ArithmeticFuzzHelper<FuzzerClass>::parseDataIntoInstructions(Data2, Size2);
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/field.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/field.hpp
index ac5f80b773ea..5988f32d1c20 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/field.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/field.hpp
@@ -4,7 +4,7 @@
 #include "barretenberg/common/assert.hpp"
 #include <functional>
 
-namespace proof_system::plonk::stdlib {
+namespace bb::plonk::stdlib {
 
 template <typename Builder> class bool_t;
 template <typename Builder> class field_t {
@@ -424,4 +424,4 @@ template <typename Builder> inline std::ostream& operator<<(std::ostream& os, fi
 {
     return os << v.get_value();
 }
-} // namespace proof_system::plonk::stdlib
+} // namespace bb::plonk::stdlib
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/field.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/field.test.cpp
index 07490d3bc992..51a0a4cdc48f 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/field.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/field.test.cpp
@@ -8,7 +8,7 @@
 #include <gtest/gtest.h>
 #include <utility>
 
-using namespace proof_system;
+using namespace bb;
 
 namespace test_stdlib_field {
 
@@ -19,7 +19,7 @@ auto& engine = numeric::random::get_debug_engine();
 template <class T> void ignore_unused(T&) {} // use to ignore unused variables in lambdas
 
 using namespace bb;
-using namespace proof_system::plonk;
+using namespace bb::plonk;
 
 template <typename Builder> class stdlib_field : public testing::Test {
     typedef stdlib::bool_t<Builder> bool_ct;
@@ -908,7 +908,7 @@ template <typename Builder> class stdlib_field : public testing::Test {
     }
 };
 
-typedef testing::Types<proof_system::StandardCircuitBuilder, proof_system::UltraCircuitBuilder> CircuitTypes;
+typedef testing::Types<bb::StandardCircuitBuilder, bb::UltraCircuitBuilder> CircuitTypes;
 
 TYPED_TEST_SUITE(stdlib_field, CircuitTypes);
 
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/group/cycle_group.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/group/cycle_group.cpp
index 7a45132f21a7..882969cd7248 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/group/cycle_group.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/group/cycle_group.cpp
@@ -5,7 +5,7 @@
 #include "./cycle_group.hpp"
 #include "barretenberg/proof_system/plookup_tables/types.hpp"
 #include "barretenberg/stdlib/primitives/plookup/plookup.hpp"
-namespace proof_system::plonk::stdlib {
+namespace bb::plonk::stdlib {
 
 template <typename Composer>
 cycle_group<Composer>::cycle_group(Composer* _context)
@@ -211,7 +211,7 @@ cycle_group<Composer> cycle_group<Composer>::dbl() const
         return cycle_group(x3, y3, is_point_at_infinity().get_value());
     }
     cycle_group result(witness_t(context, x3), witness_t(context, y3), is_point_at_infinity());
-    context->create_ecc_dbl_gate(proof_system::ecc_dbl_gate_<FF>{
+    context->create_ecc_dbl_gate(bb::ecc_dbl_gate_<FF>{
         .x1 = x.get_witness_index(),
         .y1 = modified_y.normalize().get_witness_index(),
         .x3 = result.x.get_witness_index(),
@@ -282,7 +282,7 @@ cycle_group<Composer> cycle_group<Composer>::unconditional_add(const cycle_group
     field_t r_y(witness_t(context, p3.y));
     cycle_group result(r_x, r_y, false);
 
-    proof_system::ecc_add_gate_<FF> add_gate{
+    bb::ecc_add_gate_<FF> add_gate{
         .x1 = x.get_witness_index(),
         .y1 = y.get_witness_index(),
         .x2 = other.x.get_witness_index(),
@@ -334,7 +334,7 @@ cycle_group<Composer> cycle_group<Composer>::unconditional_subtract(const cycle_
         field_t r_y(witness_t(context, p3.y));
         cycle_group result(r_x, r_y, false);
 
-        proof_system::ecc_add_gate_<FF> add_gate{
+        bb::ecc_add_gate_<FF> add_gate{
             .x1 = x.get_witness_index(),
             .y1 = y.get_witness_index(),
             .x2 = other.x.get_witness_index(),
@@ -1358,8 +1358,8 @@ template <typename Composer> cycle_group<Composer> cycle_group<Composer>::operat
     throw_or_abort("Implementation under construction...");
 }
 
-template class cycle_group<proof_system::StandardCircuitBuilder>;
-template class cycle_group<proof_system::UltraCircuitBuilder>;
-template class cycle_group<proof_system::GoblinUltraCircuitBuilder>;
+template class cycle_group<bb::StandardCircuitBuilder>;
+template class cycle_group<bb::UltraCircuitBuilder>;
+template class cycle_group<bb::GoblinUltraCircuitBuilder>;
 
-} // namespace proof_system::plonk::stdlib
+} // namespace bb::plonk::stdlib
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/group/cycle_group.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/group/cycle_group.hpp
index 06435e00aac4..9cba233e32e2 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/group/cycle_group.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/group/cycle_group.hpp
@@ -8,7 +8,7 @@
 #include "barretenberg/stdlib/primitives/field/field.hpp"
 #include <optional>
 
-namespace proof_system::plonk::stdlib {
+namespace bb::plonk::stdlib {
 
 template <typename Composer>
 concept IsUltraArithmetic = (Composer::CIRCUIT_TYPE == CircuitType::ULTRA);
@@ -233,4 +233,4 @@ inline std::ostream& operator<<(std::ostream& os, cycle_group<ComposerContext> c
 {
     return os << v.get_value();
 }
-} // namespace proof_system::plonk::stdlib
+} // namespace bb::plonk::stdlib
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/group/cycle_group.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/group/cycle_group.test.cpp
index 75373813e1f5..8edaeb25a136 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/group/cycle_group.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/group/cycle_group.test.cpp
@@ -19,7 +19,7 @@
 
 namespace stdlib_cycle_group_tests {
 using namespace bb;
-using namespace proof_system::plonk;
+using namespace bb::plonk;
 
 namespace {
 auto& engine = numeric::random::get_debug_engine();
@@ -47,7 +47,7 @@ template <class Builder> class CycleGroupTest : public ::testing::Test {
     };
 };
 
-using CircuitTypes = ::testing::Types<proof_system::StandardCircuitBuilder, proof_system::UltraCircuitBuilder>;
+using CircuitTypes = ::testing::Types<bb::StandardCircuitBuilder, bb::UltraCircuitBuilder>;
 TYPED_TEST_SUITE(CycleGroupTest, CircuitTypes);
 
 TYPED_TEST(CycleGroupTest, TestDbl)
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/logic/logic.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/logic/logic.cpp
index 2810657e787f..71c488984a47 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/logic/logic.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/logic/logic.cpp
@@ -6,7 +6,7 @@
 #include "barretenberg/stdlib/primitives/field/field.hpp"
 #include <cstddef>
 
-namespace proof_system::plonk::stdlib {
+namespace bb::plonk::stdlib {
 
 /**
  * @brief A logical AND or XOR over a variable number of bits.
@@ -113,7 +113,7 @@ field_t<Builder> logic<Builder>::create_logic_constraint(
         return field_t<Builder>::from_witness_index(ctx, out_idx);
     }
 }
-template class logic<proof_system::StandardCircuitBuilder>;
-template class logic<proof_system::UltraCircuitBuilder>;
-template class logic<proof_system::GoblinUltraCircuitBuilder>;
-} // namespace proof_system::plonk::stdlib
+template class logic<bb::StandardCircuitBuilder>;
+template class logic<bb::UltraCircuitBuilder>;
+template class logic<bb::GoblinUltraCircuitBuilder>;
+} // namespace bb::plonk::stdlib
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/logic/logic.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/logic/logic.hpp
index 25dbba47d0b9..79f98744588a 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/logic/logic.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/logic/logic.hpp
@@ -7,7 +7,7 @@
 #include <functional>
 #include <utility>
 
-namespace proof_system::plonk::stdlib {
+namespace bb::plonk::stdlib {
 
 template <typename Builder> class logic {
   public:
@@ -27,4 +27,4 @@ template <typename Builder> class logic {
                 return std::make_pair(left_chunk, right_chunk);
             });
 };
-} // namespace proof_system::plonk::stdlib
\ No newline at end of file
+} // namespace bb::plonk::stdlib
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/logic/logic.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/logic/logic.test.cpp
index ab21c3d3fed5..80a43e381030 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/logic/logic.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/logic/logic.test.cpp
@@ -25,11 +25,11 @@ auto& engine = numeric::random::get_debug_engine();
 template <class T> void ignore_unused(T&) {} // use to ignore unused variables in lambdas
 
 using namespace bb;
-using namespace proof_system::plonk;
+using namespace bb::plonk;
 
 template <class Builder> class LogicTest : public testing::Test {};
 
-using CircuitTypes = ::testing::Types<proof_system::StandardCircuitBuilder, proof_system::UltraCircuitBuilder>;
+using CircuitTypes = ::testing::Types<bb::StandardCircuitBuilder, bb::UltraCircuitBuilder>;
 
 TYPED_TEST_SUITE(LogicTest, CircuitTypes);
 
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/dynamic_array.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/dynamic_array.cpp
index 4d8eb825bf2f..ba3626cf747c 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/dynamic_array.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/dynamic_array.cpp
@@ -3,7 +3,7 @@
 #include "../bool/bool.hpp"
 #include "../circuit_builders/circuit_builders.hpp"
 
-namespace proof_system::plonk {
+namespace bb::plonk {
 namespace stdlib {
 
 /**
@@ -273,7 +273,7 @@ template <typename Builder> void DynamicArray<Builder>::conditional_pop(const bo
     _length -= predicate;
 }
 
-template class DynamicArray<proof_system::UltraCircuitBuilder>;
-template class DynamicArray<proof_system::GoblinUltraCircuitBuilder>;
+template class DynamicArray<bb::UltraCircuitBuilder>;
+template class DynamicArray<bb::GoblinUltraCircuitBuilder>;
 } // namespace stdlib
-} // namespace proof_system::plonk
\ No newline at end of file
+} // namespace bb::plonk
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/dynamic_array.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/dynamic_array.hpp
index 825c5bb6dd43..3caea8c6701d 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/dynamic_array.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/dynamic_array.hpp
@@ -1,7 +1,7 @@
 #pragma once
 #include "../circuit_builders/circuit_builders_fwd.hpp"
 #include "ram_table.hpp"
-namespace proof_system::plonk {
+namespace bb::plonk {
 namespace stdlib {
 
 /**
@@ -48,4 +48,4 @@ template <typename Builder> class DynamicArray {
     mutable ram_table<Builder> _inner_table;
 };
 } // namespace stdlib
-} // namespace proof_system::plonk
\ No newline at end of file
+} // namespace bb::plonk
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/dynamic_array.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/dynamic_array.test.cpp
index 72106bfa1301..c4cda938e8e0 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/dynamic_array.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/dynamic_array.test.cpp
@@ -9,14 +9,14 @@
 
 namespace test_stdlib_dynamic_array {
 using namespace bb;
-using namespace proof_system::plonk;
+using namespace bb::plonk;
 
 namespace {
 auto& engine = numeric::random::get_debug_engine();
 }
 
 // Defining ultra-specific types for local testing.
-using Builder = proof_system::UltraCircuitBuilder;
+using Builder = bb::UltraCircuitBuilder;
 using bool_ct = stdlib::bool_t<Builder>;
 using field_ct = stdlib::field_t<Builder>;
 using witness_ct = stdlib::witness_t<Builder>;
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/ram_table.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/ram_table.cpp
index 1b40c5f3446b..5627c562ae97 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/ram_table.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/ram_table.cpp
@@ -2,7 +2,7 @@
 
 #include "../circuit_builders/circuit_builders.hpp"
 
-namespace proof_system::plonk {
+namespace bb::plonk {
 namespace stdlib {
 
 /**
@@ -252,7 +252,7 @@ template <typename Builder> void ram_table<Builder>::write(const field_pt& index
     }
 }
 
-template class ram_table<proof_system::UltraCircuitBuilder>;
-template class ram_table<proof_system::GoblinUltraCircuitBuilder>;
+template class ram_table<bb::UltraCircuitBuilder>;
+template class ram_table<bb::GoblinUltraCircuitBuilder>;
 } // namespace stdlib
-} // namespace proof_system::plonk
\ No newline at end of file
+} // namespace bb::plonk
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/ram_table.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/ram_table.hpp
index 5613ddc342c4..9eb12f5418c1 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/ram_table.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/ram_table.hpp
@@ -2,7 +2,7 @@
 #include "../circuit_builders/circuit_builders_fwd.hpp"
 #include "../field/field.hpp"
 
-namespace proof_system::plonk {
+namespace bb::plonk {
 namespace stdlib {
 
 // A runtime-defined read-only memory table. Table entries must be initialized in the constructor.
@@ -57,4 +57,4 @@ template <typename Builder> class ram_table {
     mutable Builder* _context = nullptr;
 };
 } // namespace stdlib
-} // namespace proof_system::plonk
\ No newline at end of file
+} // namespace bb::plonk
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/ram_table.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/ram_table.test.cpp
index 614362fa4efa..23ce3bebea56 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/ram_table.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/ram_table.test.cpp
@@ -6,9 +6,9 @@
 
 namespace test_stdlib_ram_table {
 
-using namespace proof_system::plonk;
+using namespace bb::plonk;
 // Defining ultra-specific types for local testing.
-using Builder = proof_system::UltraCircuitBuilder;
+using Builder = bb::UltraCircuitBuilder;
 using field_ct = stdlib::field_t<Builder>;
 using witness_ct = stdlib::witness_t<Builder>;
 using ram_table_ct = stdlib::ram_table<Builder>;
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/rom_table.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/rom_table.cpp
index 6778b1882343..46c252fd43f9 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/rom_table.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/rom_table.cpp
@@ -4,7 +4,7 @@
 
 using namespace bb;
 
-namespace proof_system::plonk {
+namespace bb::plonk {
 namespace stdlib {
 
 template <typename Builder> rom_table<Builder>::rom_table(const std::vector<field_pt>& table_entries)
@@ -122,7 +122,7 @@ template <typename Builder> field_t<Builder> rom_table<Builder>::operator[](cons
     return field_pt::from_witness_index(context, output_idx);
 }
 
-template class rom_table<proof_system::UltraCircuitBuilder>;
-template class rom_table<proof_system::GoblinUltraCircuitBuilder>;
+template class rom_table<bb::UltraCircuitBuilder>;
+template class rom_table<bb::GoblinUltraCircuitBuilder>;
 } // namespace stdlib
-} // namespace proof_system::plonk
\ No newline at end of file
+} // namespace bb::plonk
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/rom_table.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/rom_table.hpp
index 9dd426c2f37a..d310110291b3 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/rom_table.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/rom_table.hpp
@@ -2,7 +2,7 @@
 #include "../circuit_builders/circuit_builders_fwd.hpp"
 #include "../field/field.hpp"
 
-namespace proof_system::plonk {
+namespace bb::plonk {
 namespace stdlib {
 
 // A runtime-defined read-only memory table. Table entries must be initialized in the constructor.
@@ -41,4 +41,4 @@ template <typename Builder> class rom_table {
     mutable Builder* context = nullptr;
 };
 } // namespace stdlib
-} // namespace proof_system::plonk
\ No newline at end of file
+} // namespace bb::plonk
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/rom_table.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/rom_table.test.cpp
index 8f23652699ab..07eaccf1b629 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/rom_table.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/rom_table.test.cpp
@@ -7,10 +7,10 @@
 
 namespace test_stdlib_rom_array {
 using namespace bb;
-using namespace proof_system::plonk;
+using namespace bb::plonk;
 
 // Defining ultra-specific types for local testing.
-using Builder = proof_system::UltraCircuitBuilder;
+using Builder = bb::UltraCircuitBuilder;
 using field_ct = stdlib::field_t<Builder>;
 using witness_ct = stdlib::witness_t<Builder>;
 using rom_table_ct = stdlib::rom_table<Builder>;
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/twin_rom_table.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/twin_rom_table.cpp
index 39ea56eb5b9f..438c99f2b54f 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/twin_rom_table.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/twin_rom_table.cpp
@@ -4,7 +4,7 @@
 
 using namespace bb;
 
-namespace proof_system::plonk {
+namespace bb::plonk {
 namespace stdlib {
 
 template <typename Builder>
@@ -139,7 +139,7 @@ std::array<field_t<Builder>, 2> twin_rom_table<Builder>::operator[](const field_
     };
 }
 
-template class twin_rom_table<proof_system::UltraCircuitBuilder>;
-template class twin_rom_table<proof_system::GoblinUltraCircuitBuilder>;
+template class twin_rom_table<bb::UltraCircuitBuilder>;
+template class twin_rom_table<bb::GoblinUltraCircuitBuilder>;
 } // namespace stdlib
-} // namespace proof_system::plonk
\ No newline at end of file
+} // namespace bb::plonk
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/twin_rom_table.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/twin_rom_table.hpp
index d192180af662..2fd110744f87 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/twin_rom_table.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/twin_rom_table.hpp
@@ -2,7 +2,7 @@
 #include "../circuit_builders/circuit_builders_fwd.hpp"
 #include "../field/field.hpp"
 
-namespace proof_system::plonk {
+namespace bb::plonk {
 namespace stdlib {
 
 // A runtime-defined read-only memory table. Table entries must be initialized in the constructor.
@@ -43,4 +43,4 @@ template <typename Builder> class twin_rom_table {
     mutable Builder* context = nullptr;
 };
 } // namespace stdlib
-} // namespace proof_system::plonk
\ No newline at end of file
+} // namespace bb::plonk
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/packed_byte_array/packed_byte_array.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/packed_byte_array/packed_byte_array.cpp
index 37c4e1490035..60839e569283 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/packed_byte_array/packed_byte_array.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/packed_byte_array/packed_byte_array.cpp
@@ -4,7 +4,7 @@
 
 using namespace bb;
 
-namespace proof_system::plonk {
+namespace bb::plonk {
 namespace stdlib {
 
 namespace {
@@ -266,9 +266,9 @@ template <typename Builder> std::string packed_byte_array<Builder>::get_value()
     return bytes;
 }
 
-template class packed_byte_array<proof_system::StandardCircuitBuilder>;
-template class packed_byte_array<proof_system::UltraCircuitBuilder>;
-template class packed_byte_array<proof_system::GoblinUltraCircuitBuilder>;
+template class packed_byte_array<bb::StandardCircuitBuilder>;
+template class packed_byte_array<bb::UltraCircuitBuilder>;
+template class packed_byte_array<bb::GoblinUltraCircuitBuilder>;
 
 } // namespace stdlib
-} // namespace proof_system::plonk
\ No newline at end of file
+} // namespace bb::plonk
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/packed_byte_array/packed_byte_array.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/packed_byte_array/packed_byte_array.hpp
index f4a92a5c145b..5b2f4724e9e7 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/packed_byte_array/packed_byte_array.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/packed_byte_array/packed_byte_array.hpp
@@ -4,7 +4,7 @@
 #include "../circuit_builders/circuit_builders_fwd.hpp"
 #include "../field/field.hpp"
 
-namespace proof_system::plonk {
+namespace bb::plonk {
 namespace stdlib {
 
 template <typename Builder> class packed_byte_array {
@@ -64,4 +64,4 @@ template <typename Builder> inline std::ostream& operator<<(std::ostream& os, pa
     return os;
 }
 } // namespace stdlib
-} // namespace proof_system::plonk
+} // namespace bb::plonk
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/packed_byte_array/packed_byte_array.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/packed_byte_array/packed_byte_array.test.cpp
index 8369cee02b0a..febe3b5cf825 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/packed_byte_array/packed_byte_array.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/packed_byte_array/packed_byte_array.test.cpp
@@ -9,7 +9,7 @@
 
 namespace test_stdlib_packed_byte_array {
 using namespace bb;
-using namespace proof_system::plonk;
+using namespace bb::plonk;
 
 namespace {
 auto& engine = numeric::random::get_debug_engine();
@@ -21,7 +21,7 @@ auto& engine = numeric::random::get_debug_engine();
 
 template <class Builder> class PackedByteArrayTest : public ::testing::Test {};
 
-using CircuitTypes = ::testing::Types<proof_system::StandardCircuitBuilder, proof_system::UltraCircuitBuilder>;
+using CircuitTypes = ::testing::Types<bb::StandardCircuitBuilder, bb::UltraCircuitBuilder>;
 TYPED_TEST_SUITE(PackedByteArrayTest, CircuitTypes);
 
 TYPED_TEST(PackedByteArrayTest, string_constructor_and_get_value_consistency)
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/plookup/plookup.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/plookup/plookup.cpp
index 3b956bb17660..06c0aab7c473 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/plookup/plookup.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/plookup/plookup.cpp
@@ -3,11 +3,11 @@
 #include "barretenberg/proof_system/plookup_tables/types.hpp"
 #include "barretenberg/stdlib/primitives/circuit_builders/circuit_builders.hpp"
 
-namespace proof_system::plonk {
+namespace bb::plonk {
 class UltraPlonkBuilder;
-} // namespace proof_system::plonk
+} // namespace bb::plonk
 
-namespace proof_system::plonk {
+namespace bb::plonk {
 namespace stdlib {
 
 using plookup::ColumnIdx;
@@ -91,7 +91,7 @@ field_t<Builder> plookup_read<Builder>::read_from_1_to_2_table(const MultiTableI
     return lookup[ColumnIdx::C2][0];
 }
 
-template class plookup_read<proof_system::UltraCircuitBuilder>;
-template class plookup_read<proof_system::GoblinUltraCircuitBuilder>;
+template class plookup_read<bb::UltraCircuitBuilder>;
+template class plookup_read<bb::GoblinUltraCircuitBuilder>;
 } // namespace stdlib
-} // namespace proof_system::plonk
+} // namespace bb::plonk
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/plookup/plookup.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/plookup/plookup.hpp
index 73365da4799b..28595a86d0ee 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/plookup/plookup.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/plookup/plookup.hpp
@@ -6,7 +6,7 @@
 #include <array>
 #include <vector>
 
-namespace proof_system::plonk {
+namespace bb::plonk {
 namespace stdlib {
 
 template <typename Builder> class plookup_read {
@@ -26,4 +26,4 @@ template <typename Builder> class plookup_read {
                                                                const bool is_2_to_1_lookup = false);
 };
 } // namespace stdlib
-} // namespace proof_system::plonk
+} // namespace bb::plonk
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/plookup/plookup.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/plookup/plookup.test.cpp
index 2db53e2351c9..fc9a1162cb85 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/plookup/plookup.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/plookup/plookup.test.cpp
@@ -11,14 +11,14 @@
 
 namespace test_stdlib_plookups {
 using namespace bb;
-using namespace proof_system::plonk;
+using namespace bb::plonk;
 using namespace plookup;
 
 // Defining ultra-specific types for local testing.
-using Builder = proof_system::UltraCircuitBuilder;
+using Builder = bb::UltraCircuitBuilder;
 using field_ct = stdlib::field_t<Builder>;
 using witness_ct = stdlib::witness_t<Builder>;
-using plookup_read = proof_system::plonk::stdlib::plookup_read<Builder>;
+using plookup_read = bb::plonk::stdlib::plookup_read<Builder>;
 namespace {
 auto& engine = numeric::random::get_debug_engine();
 }
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint.cpp
index 2fa749da2d94..50924235318e 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint.cpp
@@ -3,7 +3,7 @@
 #include "../circuit_builders/circuit_builders.hpp"
 #include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp"
 
-namespace proof_system::plonk {
+namespace bb::plonk {
 namespace stdlib {
 
 template <typename Builder>
@@ -239,9 +239,9 @@ std::array<safe_uint_t<Builder>, 3> safe_uint_t<Builder>::slice(const uint8_t ms
     return result;
 }
 
-template class safe_uint_t<proof_system::StandardCircuitBuilder>;
-template class safe_uint_t<proof_system::UltraCircuitBuilder>;
-template class safe_uint_t<proof_system::GoblinUltraCircuitBuilder>;
+template class safe_uint_t<bb::StandardCircuitBuilder>;
+template class safe_uint_t<bb::UltraCircuitBuilder>;
+template class safe_uint_t<bb::GoblinUltraCircuitBuilder>;
 
 } // namespace stdlib
-} // namespace proof_system::plonk
+} // namespace bb::plonk
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint.fuzzer.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint.fuzzer.hpp
index 77438c407300..4a8a36dd6493 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint.fuzzer.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint.fuzzer.hpp
@@ -110,11 +110,11 @@ FastRandom VarianceRNG(0);
  */
 template <typename Builder> class SafeUintFuzzBase {
   private:
-    typedef proof_system::plonk::stdlib::bool_t<Builder> bool_t;
-    typedef proof_system::plonk::stdlib::field_t<Builder> field_t;
-    typedef proof_system::plonk::stdlib::safe_uint_t<Builder> suint_t;
-    typedef proof_system::plonk::stdlib::witness_t<Builder> witness_t;
-    typedef proof_system::plonk::stdlib::public_witness_t<Builder> public_witness_t;
+    typedef bb::plonk::stdlib::bool_t<Builder> bool_t;
+    typedef bb::plonk::stdlib::field_t<Builder> field_t;
+    typedef bb::plonk::stdlib::safe_uint_t<Builder> suint_t;
+    typedef bb::plonk::stdlib::witness_t<Builder> witness_t;
+    typedef bb::plonk::stdlib::public_witness_t<Builder> public_witness_t;
 
   public:
     /**
@@ -1420,7 +1420,7 @@ extern "C" int LLVMFuzzerInitialize(int* argc, char*** argv)
  */
 extern "C" size_t LLVMFuzzerCustomMutator(uint8_t* Data, size_t Size, size_t MaxSize, unsigned int Seed)
 {
-    using FuzzerClass = SafeUintFuzzBase<proof_system::StandardCircuitBuilder>;
+    using FuzzerClass = SafeUintFuzzBase<bb::StandardCircuitBuilder>;
     auto fast_random = FastRandom(Seed);
     auto size_occupied = ArithmeticFuzzHelper<FuzzerClass>::MutateInstructionBuffer(Data, Size, MaxSize, fast_random);
     if ((fast_random.next() % 200) < fuzzer_havoc_settings.GEN_LLVM_POST_MUTATION_PROB) {
@@ -1441,7 +1441,7 @@ extern "C" size_t LLVMFuzzerCustomCrossOver(const uint8_t* Data1,
                                             size_t MaxOutSize,
                                             unsigned int Seed)
 {
-    using FuzzerClass = SafeUintFuzzBase<proof_system::StandardCircuitBuilder>;
+    using FuzzerClass = SafeUintFuzzBase<bb::StandardCircuitBuilder>;
     auto fast_random = FastRandom(Seed);
     auto vecA = ArithmeticFuzzHelper<FuzzerClass>::parseDataIntoInstructions(Data1, Size1);
     auto vecB = ArithmeticFuzzHelper<FuzzerClass>::parseDataIntoInstructions(Data2, Size2);
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint.hpp
index b61e5757f9cb..fc5ce6c97c27 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint.hpp
@@ -11,7 +11,7 @@
 // Despite the name, it is *not* a "safe" version of the uint class - as operations are positive integer
 // operations, and not modulo 2^t for some t, as they are in the uint class.
 
-namespace proof_system::plonk {
+namespace bb::plonk {
 namespace stdlib {
 
 template <typename Builder> class safe_uint_t {
@@ -210,4 +210,4 @@ template <typename Builder> inline std::ostream& operator<<(std::ostream& os, sa
     return os << v.value;
 }
 } // namespace stdlib
-} // namespace proof_system::plonk
+} // namespace bb::plonk
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint.test.cpp
index eaf84cfd8ae3..5e1036d4a020 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint.test.cpp
@@ -24,13 +24,13 @@ auto& engine = numeric::random::get_debug_engine();
 
 namespace test_stdlib_safe_uint {
 using namespace bb;
-using namespace proof_system::plonk;
+using namespace bb::plonk;
 
 template <class T> void ignore_unused(T&) {} // use to ignore unused variables in lambdas
 
 template <class Builder> class SafeUintTest : public ::testing::Test {};
 
-using CircuitTypes = ::testing::Types<proof_system::StandardCircuitBuilder, proof_system::UltraCircuitBuilder>;
+using CircuitTypes = ::testing::Types<bb::StandardCircuitBuilder, bb::UltraCircuitBuilder>;
 TYPED_TEST_SUITE(SafeUintTest, CircuitTypes);
 
 // CONSTRUCTOR
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/arithmetic.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/arithmetic.cpp
index 3312830d752e..32effc2f5c38 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/arithmetic.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/arithmetic.cpp
@@ -2,9 +2,9 @@
 #include "uint.hpp"
 
 using namespace bb;
-using namespace proof_system;
+using namespace bb;
 
-namespace proof_system::plonk {
+namespace bb::plonk {
 namespace stdlib {
 
 /**
@@ -391,10 +391,10 @@ std::pair<uint<Builder, Native>, uint<Builder, Native>> uint<Builder, Native>::d
     return std::make_pair(quotient, remainder);
 }
 
-template class uint<proof_system::StandardCircuitBuilder, uint8_t>;
-template class uint<proof_system::StandardCircuitBuilder, uint16_t>;
-template class uint<proof_system::StandardCircuitBuilder, uint32_t>;
-template class uint<proof_system::StandardCircuitBuilder, uint64_t>;
+template class uint<bb::StandardCircuitBuilder, uint8_t>;
+template class uint<bb::StandardCircuitBuilder, uint16_t>;
+template class uint<bb::StandardCircuitBuilder, uint32_t>;
+template class uint<bb::StandardCircuitBuilder, uint64_t>;
 
 } // namespace stdlib
-} // namespace proof_system::plonk
\ No newline at end of file
+} // namespace bb::plonk
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/comparison.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/comparison.cpp
index 5078aa04b48d..60ec9926da27 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/comparison.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/comparison.cpp
@@ -3,7 +3,7 @@
 
 using namespace bb;
 
-namespace proof_system::plonk {
+namespace bb::plonk {
 namespace stdlib {
 
 template <typename Builder, typename Native>
@@ -97,9 +97,9 @@ template <typename Builder, typename Native> bool_t<Builder> uint<Builder, Nativ
     return (field_t<Builder>(*this).is_zero()).normalize();
 }
 
-template class uint<proof_system::StandardCircuitBuilder, uint8_t>;
-template class uint<proof_system::StandardCircuitBuilder, uint16_t>;
-template class uint<proof_system::StandardCircuitBuilder, uint32_t>;
-template class uint<proof_system::StandardCircuitBuilder, uint64_t>;
+template class uint<bb::StandardCircuitBuilder, uint8_t>;
+template class uint<bb::StandardCircuitBuilder, uint16_t>;
+template class uint<bb::StandardCircuitBuilder, uint32_t>;
+template class uint<bb::StandardCircuitBuilder, uint64_t>;
 } // namespace stdlib
-} // namespace proof_system::plonk
\ No newline at end of file
+} // namespace bb::plonk
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/logic.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/logic.cpp
index bcea0e3c2bea..329fddb45e27 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/logic.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/logic.cpp
@@ -2,9 +2,9 @@
 #include "uint.hpp"
 
 using namespace bb;
-using namespace proof_system;
+using namespace bb;
 
-namespace proof_system::plonk {
+namespace bb::plonk {
 namespace stdlib {
 
 template <typename Builder, typename Native>
@@ -523,10 +523,10 @@ uint<Builder, Native> uint<Builder, Native>::logic_operator(const uint& other, c
     return result;
 }
 
-template class uint<proof_system::StandardCircuitBuilder, uint8_t>;
-template class uint<proof_system::StandardCircuitBuilder, uint16_t>;
-template class uint<proof_system::StandardCircuitBuilder, uint32_t>;
-template class uint<proof_system::StandardCircuitBuilder, uint64_t>;
+template class uint<bb::StandardCircuitBuilder, uint8_t>;
+template class uint<bb::StandardCircuitBuilder, uint16_t>;
+template class uint<bb::StandardCircuitBuilder, uint32_t>;
+template class uint<bb::StandardCircuitBuilder, uint64_t>;
 
 } // namespace stdlib
-} // namespace proof_system::plonk
+} // namespace bb::plonk
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/plookup/arithmetic.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/plookup/arithmetic.cpp
index 1fda18bb48af..4bb464ed79d0 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/plookup/arithmetic.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/plookup/arithmetic.cpp
@@ -2,9 +2,9 @@
 #include "uint.hpp"
 
 using namespace bb;
-using namespace proof_system;
+using namespace bb;
 
-namespace proof_system::plonk {
+namespace bb::plonk {
 namespace stdlib {
 
 template <typename Builder, typename Native>
@@ -256,14 +256,14 @@ std::pair<uint_plookup<Builder, Native>, uint_plookup<Builder, Native>> uint_plo
 
     return std::make_pair(quotient, remainder);
 }
-template class uint_plookup<proof_system::UltraCircuitBuilder, uint8_t>;
-template class uint_plookup<proof_system::GoblinUltraCircuitBuilder, uint8_t>;
-template class uint_plookup<proof_system::UltraCircuitBuilder, uint16_t>;
-template class uint_plookup<proof_system::GoblinUltraCircuitBuilder, uint16_t>;
-template class uint_plookup<proof_system::UltraCircuitBuilder, uint32_t>;
-template class uint_plookup<proof_system::GoblinUltraCircuitBuilder, uint32_t>;
-template class uint_plookup<proof_system::UltraCircuitBuilder, uint64_t>;
-template class uint_plookup<proof_system::GoblinUltraCircuitBuilder, uint64_t>;
+template class uint_plookup<bb::UltraCircuitBuilder, uint8_t>;
+template class uint_plookup<bb::GoblinUltraCircuitBuilder, uint8_t>;
+template class uint_plookup<bb::UltraCircuitBuilder, uint16_t>;
+template class uint_plookup<bb::GoblinUltraCircuitBuilder, uint16_t>;
+template class uint_plookup<bb::UltraCircuitBuilder, uint32_t>;
+template class uint_plookup<bb::GoblinUltraCircuitBuilder, uint32_t>;
+template class uint_plookup<bb::UltraCircuitBuilder, uint64_t>;
+template class uint_plookup<bb::GoblinUltraCircuitBuilder, uint64_t>;
 ;
 } // namespace stdlib
-} // namespace proof_system::plonk
\ No newline at end of file
+} // namespace bb::plonk
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/plookup/comparison.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/plookup/comparison.cpp
index 149f63896f62..333075cd4553 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/plookup/comparison.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/plookup/comparison.cpp
@@ -3,7 +3,7 @@
 
 using namespace bb;
 
-namespace proof_system::plonk {
+namespace bb::plonk {
 namespace stdlib {
 
 template <typename Builder, typename Native>
@@ -74,13 +74,13 @@ template <typename Builder, typename Native> bool_t<Builder> uint_plookup<Builde
     return (field_t<Builder>(*this).is_zero()).normalize();
 }
 
-template class uint_plookup<proof_system::UltraCircuitBuilder, uint8_t>;
-template class uint_plookup<proof_system::GoblinUltraCircuitBuilder, uint8_t>;
-template class uint_plookup<proof_system::UltraCircuitBuilder, uint16_t>;
-template class uint_plookup<proof_system::GoblinUltraCircuitBuilder, uint16_t>;
-template class uint_plookup<proof_system::UltraCircuitBuilder, uint32_t>;
-template class uint_plookup<proof_system::GoblinUltraCircuitBuilder, uint32_t>;
-template class uint_plookup<proof_system::UltraCircuitBuilder, uint64_t>;
-template class uint_plookup<proof_system::GoblinUltraCircuitBuilder, uint64_t>;
+template class uint_plookup<bb::UltraCircuitBuilder, uint8_t>;
+template class uint_plookup<bb::GoblinUltraCircuitBuilder, uint8_t>;
+template class uint_plookup<bb::UltraCircuitBuilder, uint16_t>;
+template class uint_plookup<bb::GoblinUltraCircuitBuilder, uint16_t>;
+template class uint_plookup<bb::UltraCircuitBuilder, uint32_t>;
+template class uint_plookup<bb::GoblinUltraCircuitBuilder, uint32_t>;
+template class uint_plookup<bb::UltraCircuitBuilder, uint64_t>;
+template class uint_plookup<bb::GoblinUltraCircuitBuilder, uint64_t>;
 } // namespace stdlib
-} // namespace proof_system::plonk
\ No newline at end of file
+} // namespace bb::plonk
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/plookup/logic.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/plookup/logic.cpp
index 215e95d837d3..a3a0000863ed 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/plookup/logic.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/plookup/logic.cpp
@@ -3,7 +3,7 @@
 
 using namespace bb;
 
-namespace proof_system::plonk {
+namespace bb::plonk {
 namespace stdlib {
 
 using namespace plookup;
@@ -326,14 +326,14 @@ uint_plookup<Builder, Native> uint_plookup<Builder, Native>::logic_operator(cons
     return result;
 }
 
-template class uint_plookup<proof_system::UltraCircuitBuilder, uint8_t>;
-template class uint_plookup<proof_system::GoblinUltraCircuitBuilder, uint8_t>;
-template class uint_plookup<proof_system::UltraCircuitBuilder, uint16_t>;
-template class uint_plookup<proof_system::GoblinUltraCircuitBuilder, uint16_t>;
-template class uint_plookup<proof_system::UltraCircuitBuilder, uint32_t>;
-template class uint_plookup<proof_system::GoblinUltraCircuitBuilder, uint32_t>;
-template class uint_plookup<proof_system::UltraCircuitBuilder, uint64_t>;
-template class uint_plookup<proof_system::GoblinUltraCircuitBuilder, uint64_t>;
+template class uint_plookup<bb::UltraCircuitBuilder, uint8_t>;
+template class uint_plookup<bb::GoblinUltraCircuitBuilder, uint8_t>;
+template class uint_plookup<bb::UltraCircuitBuilder, uint16_t>;
+template class uint_plookup<bb::GoblinUltraCircuitBuilder, uint16_t>;
+template class uint_plookup<bb::UltraCircuitBuilder, uint32_t>;
+template class uint_plookup<bb::GoblinUltraCircuitBuilder, uint32_t>;
+template class uint_plookup<bb::UltraCircuitBuilder, uint64_t>;
+template class uint_plookup<bb::GoblinUltraCircuitBuilder, uint64_t>;
 
 } // namespace stdlib
-} // namespace proof_system::plonk
\ No newline at end of file
+} // namespace bb::plonk
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/plookup/uint.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/plookup/uint.cpp
index 3f00bd8472c7..869834d3ee98 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/plookup/uint.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/plookup/uint.cpp
@@ -3,7 +3,7 @@
 
 using namespace bb;
 
-namespace proof_system::plonk {
+namespace bb::plonk {
 namespace stdlib {
 
 template <typename Builder, typename Native>
@@ -240,14 +240,14 @@ bool_t<Builder> uint_plookup<Builder, Native>::at(const size_t bit_index) const
     return result;
 }
 
-template class uint_plookup<proof_system::UltraCircuitBuilder, uint8_t>;
-template class uint_plookup<proof_system::GoblinUltraCircuitBuilder, uint8_t>;
-template class uint_plookup<proof_system::UltraCircuitBuilder, uint16_t>;
-template class uint_plookup<proof_system::GoblinUltraCircuitBuilder, uint16_t>;
-template class uint_plookup<proof_system::UltraCircuitBuilder, uint32_t>;
-template class uint_plookup<proof_system::GoblinUltraCircuitBuilder, uint32_t>;
-template class uint_plookup<proof_system::UltraCircuitBuilder, uint64_t>;
-template class uint_plookup<proof_system::GoblinUltraCircuitBuilder, uint64_t>;
+template class uint_plookup<bb::UltraCircuitBuilder, uint8_t>;
+template class uint_plookup<bb::GoblinUltraCircuitBuilder, uint8_t>;
+template class uint_plookup<bb::UltraCircuitBuilder, uint16_t>;
+template class uint_plookup<bb::GoblinUltraCircuitBuilder, uint16_t>;
+template class uint_plookup<bb::UltraCircuitBuilder, uint32_t>;
+template class uint_plookup<bb::GoblinUltraCircuitBuilder, uint32_t>;
+template class uint_plookup<bb::UltraCircuitBuilder, uint64_t>;
+template class uint_plookup<bb::GoblinUltraCircuitBuilder, uint64_t>;
 
 } // namespace stdlib
-} // namespace proof_system::plonk
\ No newline at end of file
+} // namespace bb::plonk
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/plookup/uint.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/plookup/uint.hpp
index 6acb0570901c..ff201d5ecb65 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/plookup/uint.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/plookup/uint.hpp
@@ -5,7 +5,7 @@
 #include "../../field/field.hpp"
 #include "../../plookup/plookup.hpp"
 
-namespace proof_system::plonk {
+namespace bb::plonk {
 namespace stdlib {
 
 template <typename Builder, typename Native> class uint_plookup {
@@ -173,4 +173,4 @@ template <typename T, typename w> inline std::ostream& operator<<(std::ostream&
     return os << v.get_value();
 }
 } // namespace stdlib
-} // namespace proof_system::plonk
\ No newline at end of file
+} // namespace bb::plonk
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/uint.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/uint.cpp
index c1ac65269612..71be50cf858f 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/uint.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/uint.cpp
@@ -2,9 +2,9 @@
 #include "../circuit_builders/circuit_builders.hpp"
 
 using namespace bb;
-using namespace proof_system;
+using namespace bb;
 
-namespace proof_system::plonk {
+namespace bb::plonk {
 namespace stdlib {
 
 /**
@@ -390,10 +390,10 @@ template <typename Builder, typename Native> bool_t<Builder> uint<Builder, Nativ
     return result;
 }
 
-template class uint<proof_system::StandardCircuitBuilder, uint8_t>;
-template class uint<proof_system::StandardCircuitBuilder, uint16_t>;
-template class uint<proof_system::StandardCircuitBuilder, uint32_t>;
-template class uint<proof_system::StandardCircuitBuilder, uint64_t>;
+template class uint<bb::StandardCircuitBuilder, uint8_t>;
+template class uint<bb::StandardCircuitBuilder, uint16_t>;
+template class uint<bb::StandardCircuitBuilder, uint32_t>;
+template class uint<bb::StandardCircuitBuilder, uint64_t>;
 
 } // namespace stdlib
-} // namespace proof_system::plonk
+} // namespace bb::plonk
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/uint.fuzzer.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/uint.fuzzer.hpp
index 77c17242e4b1..4e7f5a30274b 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/uint.fuzzer.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/uint.fuzzer.hpp
@@ -32,13 +32,13 @@ FastRandom VarianceRNG(0);
  */
 template <typename Builder> class UintFuzzBase {
   private:
-    typedef proof_system::plonk::stdlib::bool_t<Builder> bool_t;
-    typedef proof_system::plonk::stdlib::uint<Builder, uint8_t> uint_8_t;
-    typedef proof_system::plonk::stdlib::uint<Builder, uint16_t> uint_16_t;
-    typedef proof_system::plonk::stdlib::uint<Builder, uint32_t> uint_32_t;
-    typedef proof_system::plonk::stdlib::uint<Builder, uint64_t> uint_64_t;
-    typedef proof_system::plonk::stdlib::field_t<Builder> field_t;
-    typedef proof_system::plonk::stdlib::byte_array<Builder> byte_array_t;
+    typedef bb::plonk::stdlib::bool_t<Builder> bool_t;
+    typedef bb::plonk::stdlib::uint<Builder, uint8_t> uint_8_t;
+    typedef bb::plonk::stdlib::uint<Builder, uint16_t> uint_16_t;
+    typedef bb::plonk::stdlib::uint<Builder, uint32_t> uint_32_t;
+    typedef bb::plonk::stdlib::uint<Builder, uint64_t> uint_64_t;
+    typedef bb::plonk::stdlib::field_t<Builder> field_t;
+    typedef bb::plonk::stdlib::byte_array<Builder> byte_array_t;
 
     template <class From, class To> static To from_to(const From& in, const std::optional<size_t> size = std::nullopt)
     {
@@ -1547,7 +1547,7 @@ extern "C" int LLVMFuzzerInitialize(int* argc, char*** argv)
  */
 extern "C" size_t LLVMFuzzerCustomMutator(uint8_t* Data, size_t Size, size_t MaxSize, unsigned int Seed)
 {
-    using FuzzerClass = UintFuzzBase<proof_system::StandardCircuitBuilder>;
+    using FuzzerClass = UintFuzzBase<bb::StandardCircuitBuilder>;
     auto fast_random = FastRandom(Seed);
     auto size_occupied = ArithmeticFuzzHelper<FuzzerClass>::MutateInstructionBuffer(Data, Size, MaxSize, fast_random);
     if ((fast_random.next() % 200) < fuzzer_havoc_settings.GEN_LLVM_POST_MUTATION_PROB) {
@@ -1568,7 +1568,7 @@ extern "C" size_t LLVMFuzzerCustomCrossOver(const uint8_t* Data1,
                                             size_t MaxOutSize,
                                             unsigned int Seed)
 {
-    using FuzzerClass = UintFuzzBase<proof_system::StandardCircuitBuilder>;
+    using FuzzerClass = UintFuzzBase<bb::StandardCircuitBuilder>;
     auto fast_random = FastRandom(Seed);
     auto vecA = ArithmeticFuzzHelper<FuzzerClass>::parseDataIntoInstructions(Data1, Size1);
     auto vecB = ArithmeticFuzzHelper<FuzzerClass>::parseDataIntoInstructions(Data2, Size2);
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/uint.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/uint.hpp
index e51ce2db6926..85b3abb0046d 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/uint.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/uint.hpp
@@ -7,7 +7,7 @@
 
 #include "./plookup/uint.hpp"
 
-namespace proof_system::plonk {
+namespace bb::plonk {
 namespace stdlib {
 
 /**
@@ -202,4 +202,4 @@ using uint64 =
     typename std::conditional<HasPlookup<Builder>, uint_plookup<Builder, uint64_t>, uint<Builder, uint64_t>>::type;
 
 } // namespace stdlib
-} // namespace proof_system::plonk
+} // namespace bb::plonk
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/uint.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/uint.test.cpp
index e3415543c20a..59b5b9c1f812 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/uint.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/uint.test.cpp
@@ -4,8 +4,8 @@
 #include <gtest/gtest.h>
 
 using namespace bb;
-using namespace proof_system::plonk;
-using namespace proof_system;
+using namespace bb::plonk;
+using namespace bb;
 
 namespace {
 auto& engine = numeric::random::get_debug_engine();
@@ -1739,7 +1739,7 @@ template <typename Builder> class stdlib_uint : public testing::Test {
     }
 };
 
-typedef testing::Types<proof_system::StandardCircuitBuilder, proof_system::UltraCircuitBuilder> CircuitTypes;
+typedef testing::Types<bb::StandardCircuitBuilder, bb::UltraCircuitBuilder> CircuitTypes;
 
 TYPED_TEST_SUITE(stdlib_uint, CircuitTypes);
 
@@ -1916,10 +1916,10 @@ TYPED_TEST(stdlib_uint, test_at)
 // There was one plookup-specific test in the ./plookup/uint_plookup.test.cpp
 TEST(stdlib_uint32, test_accumulators_plookup_uint32)
 {
-    using uint32_ct = proof_system::plonk::stdlib::uint32<proof_system::UltraCircuitBuilder>;
-    using witness_ct = proof_system::plonk::stdlib::witness_t<proof_system::UltraCircuitBuilder>;
+    using uint32_ct = bb::plonk::stdlib::uint32<bb::UltraCircuitBuilder>;
+    using witness_ct = bb::plonk::stdlib::witness_t<bb::UltraCircuitBuilder>;
 
-    proof_system::UltraCircuitBuilder builder;
+    bb::UltraCircuitBuilder builder;
 
     uint32_t a_val = engine.get_random_uint32();
     uint32_t b_val = engine.get_random_uint32();
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/witness/witness.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/witness/witness.hpp
index 3cc38a644db9..f37d8ef0f895 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/witness/witness.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/witness/witness.hpp
@@ -1,7 +1,7 @@
 #pragma once
 #include "barretenberg/ecc/curves/bn254/fr.hpp"
 
-namespace proof_system::plonk {
+namespace bb::plonk {
 namespace stdlib {
 
 // indicates whether a witness index actually contains a constant
@@ -82,4 +82,4 @@ template <typename Builder> class public_witness_t : public witness_t<Builder> {
 };
 
 } // namespace stdlib
-} // namespace proof_system::plonk
+} // namespace bb::plonk
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/recursion/aggregation_state/aggregation_state.hpp b/barretenberg/cpp/src/barretenberg/stdlib/recursion/aggregation_state/aggregation_state.hpp
index 551f65ec365f..81407b94af4f 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/recursion/aggregation_state/aggregation_state.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/recursion/aggregation_state/aggregation_state.hpp
@@ -1,7 +1,7 @@
 #pragma once
 #include "../../primitives/field/field.hpp"
 
-namespace proof_system::plonk {
+namespace bb::plonk {
 namespace stdlib {
 namespace recursion {
 
@@ -109,4 +109,4 @@ template <typename NCT> std::ostream& operator<<(std::ostream& os, aggregation_s
 
 } // namespace recursion
 } // namespace stdlib
-} // namespace proof_system::plonk
+} // namespace bb::plonk
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/recursion/aggregation_state/native_aggregation_state.hpp b/barretenberg/cpp/src/barretenberg/stdlib/recursion/aggregation_state/native_aggregation_state.hpp
index 210364371976..a87c30800d93 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/recursion/aggregation_state/native_aggregation_state.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/recursion/aggregation_state/native_aggregation_state.hpp
@@ -3,7 +3,7 @@
 #include "barretenberg/ecc/curves/bn254/g1.hpp"
 #include "barretenberg/ecc/groups/affine_element.hpp"
 
-namespace proof_system::plonk {
+namespace bb::plonk {
 namespace stdlib {
 namespace recursion {
 
@@ -41,4 +41,4 @@ inline std::ostream& operator<<(std::ostream& os, native_aggregation_state const
 
 } // namespace recursion
 } // namespace stdlib
-} // namespace proof_system::plonk
+} // namespace bb::plonk
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/transcript/transcript.hpp b/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/transcript/transcript.hpp
index 842310d06748..6f53a7aeb589 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/transcript/transcript.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/transcript/transcript.hpp
@@ -13,12 +13,12 @@
 #include "barretenberg/stdlib/utility/utility.hpp"
 
 // Note: this namespace will be sensible once stdlib is moved out of the plonk namespace
-namespace proof_system::plonk::stdlib::recursion::honk {
+namespace bb::plonk::stdlib::recursion::honk {
 template <typename Builder> class Transcript {
   public:
     using field_ct = field_t<Builder>;
     using FF = bb::fr;
-    using BaseTranscript = proof_system::honk::BaseTranscript;
+    using BaseTranscript = bb::honk::BaseTranscript;
     using StdlibTypes = utility::StdlibTypesUtility<Builder>;
 
     static constexpr size_t HASH_OUTPUT_SIZE = BaseTranscript::HASH_OUTPUT_SIZE;
@@ -101,4 +101,4 @@ template <typename Builder> class Transcript {
         return StdlibTypes::from_witness(builder, element);
     }
 };
-} // namespace proof_system::plonk::stdlib::recursion::honk
+} // namespace bb::plonk::stdlib::recursion::honk
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/transcript/transcript.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/transcript/transcript.test.cpp
index 860da39467aa..1ddc1db88a82 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/transcript/transcript.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/transcript/transcript.test.cpp
@@ -8,13 +8,13 @@
 #include "barretenberg/stdlib/recursion/honk/transcript/transcript.hpp"
 #include "barretenberg/transcript/transcript.hpp"
 
-namespace proof_system::plonk::stdlib::recursion::honk {
+namespace bb::plonk::stdlib::recursion::honk {
 
 using Builder = UltraCircuitBuilder;
-using UltraFlavor = ::proof_system::honk::flavor::Ultra;
-using UltraRecursiveFlavor = ::proof_system::honk::flavor::UltraRecursive_<Builder>;
+using UltraFlavor = ::bb::honk::flavor::Ultra;
+using UltraRecursiveFlavor = ::bb::honk::flavor::UltraRecursive_<Builder>;
 using FF = bb::fr;
-using BaseTranscript = ::proof_system::honk::BaseTranscript;
+using BaseTranscript = ::bb::honk::BaseTranscript;
 
 /**
  * @brief Create some mock data; add it to the provided prover transcript in various mock rounds
@@ -176,4 +176,4 @@ TEST(RecursiveHonkTranscript, ReturnValuesMatch)
     EXPECT_EQ(static_cast<FF>(native_alpha), stdlib_alpha.get_value());
     EXPECT_EQ(static_cast<FF>(native_beta), stdlib_beta.get_value());
 }
-} // namespace proof_system::plonk::stdlib::recursion::honk
\ No newline at end of file
+} // namespace bb::plonk::stdlib::recursion::honk
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/goblin_verifier.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/goblin_verifier.test.cpp
index 2e6a67f41ca3..b3794a5502ec 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/goblin_verifier.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/goblin_verifier.test.cpp
@@ -7,7 +7,7 @@
 #include "barretenberg/ultra_honk/ultra_composer.hpp"
 #include "barretenberg/ultra_honk/ultra_verifier.hpp"
 
-namespace proof_system::plonk::stdlib::recursion::honk {
+namespace bb::plonk::stdlib::recursion::honk {
 
 /**
  * @brief Test suite for recursive verification of Goblin Ultra Honk proofs
@@ -19,10 +19,10 @@ namespace proof_system::plonk::stdlib::recursion::honk {
 template <typename BuilderType> class GoblinRecursiveVerifierTest : public testing::Test {
 
     // Define types relevant for testing
-    using UltraFlavor = ::proof_system::honk::flavor::Ultra;
-    using GoblinUltraFlavor = ::proof_system::honk::flavor::GoblinUltra;
-    using UltraComposer = ::proof_system::honk::UltraComposer_<UltraFlavor>;
-    using GoblinUltraComposer = ::proof_system::honk::UltraComposer_<GoblinUltraFlavor>;
+    using UltraFlavor = ::bb::honk::flavor::Ultra;
+    using GoblinUltraFlavor = ::bb::honk::flavor::GoblinUltra;
+    using UltraComposer = ::bb::honk::UltraComposer_<UltraFlavor>;
+    using GoblinUltraComposer = ::bb::honk::UltraComposer_<GoblinUltraFlavor>;
 
     // Define types for the inner circuit, i.e. the circuit whose proof will be recursively verified
     using InnerFlavor = GoblinUltraFlavor;
@@ -33,9 +33,9 @@ template <typename BuilderType> class GoblinRecursiveVerifierTest : public testi
     using InnerFF = InnerFlavor::FF;
 
     // Types for recursive verifier circuit
-    using RecursiveFlavor = ::proof_system::honk::flavor::GoblinUltraRecursive;
-    using RecursiveVerifier = UltraRecursiveVerifier_<RecursiveFlavor>;
     using OuterBuilder = BuilderType;
+    using RecursiveFlavor = ::bb::honk::flavor::GoblinUltraRecursive_<OuterBuilder>;
+    using RecursiveVerifier = UltraRecursiveVerifier_<RecursiveFlavor>;
     using VerificationKey = typename RecursiveVerifier::VerificationKey;
 
     // Helper for getting composer for prover/verifier of recursive (outer) circuit
@@ -255,7 +255,7 @@ template <typename BuilderType> class GoblinRecursiveVerifierTest : public testi
 };
 
 // Run the recursive verifier tests with conventional Ultra builder and Goblin builder
-using BuilderTypes = testing::Types<GoblinUltraCircuitBuilder>;
+using BuilderTypes = testing::Types<UltraCircuitBuilder, GoblinUltraCircuitBuilder>;
 
 TYPED_TEST_SUITE(GoblinRecursiveVerifierTest, BuilderTypes);
 
@@ -279,4 +279,4 @@ HEAVY_TYPED_TEST(GoblinRecursiveVerifierTest, SingleRecursiveVerificationFailure
     TestFixture::test_recursive_verification_fails();
 };
 
-} // namespace proof_system::plonk::stdlib::recursion::honk
\ No newline at end of file
+} // namespace bb::plonk::stdlib::recursion::honk
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/merge_recursive_verifier.cpp b/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/merge_recursive_verifier.cpp
index 78444cd519e9..f8a8c38382dc 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/merge_recursive_verifier.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/merge_recursive_verifier.cpp
@@ -1,6 +1,6 @@
 #include "barretenberg/stdlib/recursion/honk/verifier/merge_recursive_verifier.hpp"
 
-namespace proof_system::plonk::stdlib::recursion::goblin {
+namespace bb::plonk::stdlib::recursion::goblin {
 
 template <typename CircuitBuilder>
 MergeRecursiveVerifier_<CircuitBuilder>::MergeRecursiveVerifier_(CircuitBuilder* builder)
@@ -85,4 +85,4 @@ std::array<typename bn254<CircuitBuilder>::Element, 2> MergeRecursiveVerifier_<C
 template class MergeRecursiveVerifier_<GoblinUltraCircuitBuilder>;
 template class MergeRecursiveVerifier_<UltraCircuitBuilder>;
 
-} // namespace proof_system::plonk::stdlib::recursion::goblin
+} // namespace bb::plonk::stdlib::recursion::goblin
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/merge_recursive_verifier.hpp b/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/merge_recursive_verifier.hpp
index 0206ce2e0df9..52d5d8e7f209 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/merge_recursive_verifier.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/merge_recursive_verifier.hpp
@@ -4,15 +4,15 @@
 #include "barretenberg/stdlib/primitives/curves/bn254.hpp"
 #include "barretenberg/stdlib/recursion/honk/transcript/transcript.hpp"
 
-namespace proof_system::plonk::stdlib::recursion::goblin {
+namespace bb::plonk::stdlib::recursion::goblin {
 template <typename CircuitBuilder> class MergeRecursiveVerifier_ {
   public:
     using Curve = bn254<CircuitBuilder>;
     using FF = typename Curve::ScalarField;
     using Commitment = typename Curve::Element;
     using GroupElement = typename Curve::Element;
-    using KZG = ::proof_system::honk::pcs::kzg::KZG<Curve>;
-    using OpeningClaim = ::proof_system::honk::pcs::OpeningClaim<Curve>;
+    using KZG = ::bb::honk::pcs::kzg::KZG<Curve>;
+    using OpeningClaim = ::bb::honk::pcs::OpeningClaim<Curve>;
     using PairingPoints = std::array<GroupElement, 2>;
     using Transcript = honk::Transcript<CircuitBuilder>;
 
@@ -26,4 +26,4 @@ template <typename CircuitBuilder> class MergeRecursiveVerifier_ {
     PairingPoints verify_proof(const plonk::proof& proof);
 };
 
-} // namespace proof_system::plonk::stdlib::recursion::goblin
+} // namespace bb::plonk::stdlib::recursion::goblin
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/merge_verifier.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/merge_verifier.test.cpp
index bbffb5950503..622af62de60f 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/merge_verifier.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/merge_verifier.test.cpp
@@ -4,7 +4,7 @@
 #include "barretenberg/stdlib/recursion/honk/verifier/merge_recursive_verifier.hpp"
 #include "barretenberg/ultra_honk/ultra_composer.hpp"
 
-namespace proof_system::plonk::stdlib::recursion::goblin {
+namespace bb::plonk::stdlib::recursion::goblin {
 
 /**
  * @brief Test suite for recursive verification of Goblin Merge proofs
@@ -20,8 +20,8 @@ class RecursiveMergeVerifierTest : public testing::Test {
     using RecursiveMergeVerifier = MergeRecursiveVerifier_<RecursiveBuilder>;
 
     // Define types relevant for inner circuit
-    using GoblinUltraFlavor = ::proof_system::honk::flavor::GoblinUltra;
-    using GoblinUltraComposer = ::proof_system::honk::UltraComposer_<GoblinUltraFlavor>;
+    using GoblinUltraFlavor = ::bb::honk::flavor::GoblinUltra;
+    using GoblinUltraComposer = ::bb::honk::UltraComposer_<GoblinUltraFlavor>;
     using InnerFlavor = GoblinUltraFlavor;
     using InnerComposer = GoblinUltraComposer;
     using InnerBuilder = typename InnerComposer::CircuitBuilder;
@@ -29,7 +29,7 @@ class RecursiveMergeVerifierTest : public testing::Test {
     // Define additional types for testing purposes
     using Commitment = InnerFlavor::Commitment;
     using FF = InnerFlavor::FF;
-    using VerifierCommitmentKey = ::proof_system::honk::pcs::VerifierCommitmentKey<curve::BN254>;
+    using VerifierCommitmentKey = ::bb::honk::pcs::VerifierCommitmentKey<curve::BN254>;
 
   public:
     static void SetUpTestSuite() { bb::srs::init_crs_factory("../srs_db/ignition"); }
@@ -97,4 +97,4 @@ TEST_F(RecursiveMergeVerifierTest, SingleRecursiveVerification)
     RecursiveMergeVerifierTest::test_recursive_merge_verification();
 };
 
-} // namespace proof_system::plonk::stdlib::recursion::goblin
\ No newline at end of file
+} // namespace bb::plonk::stdlib::recursion::goblin
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/ultra_recursive_verifier.cpp b/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/ultra_recursive_verifier.cpp
index fb9719d6cde6..6fe19e8edc94 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/ultra_recursive_verifier.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/ultra_recursive_verifier.cpp
@@ -4,7 +4,7 @@
 #include "barretenberg/proof_system/library/grand_product_delta.hpp"
 #include "barretenberg/transcript/transcript.hpp"
 
-namespace proof_system::plonk::stdlib::recursion::honk {
+namespace bb::plonk::stdlib::recursion::honk {
 
 template <typename Flavor>
 UltraRecursiveVerifier_<Flavor>::UltraRecursiveVerifier_(
@@ -20,12 +20,12 @@ UltraRecursiveVerifier_<Flavor>::UltraRecursiveVerifier_(
 template <typename Flavor>
 std::array<typename Flavor::GroupElement, 2> UltraRecursiveVerifier_<Flavor>::verify_proof(const plonk::proof& proof)
 {
-    using Sumcheck = ::proof_system::honk::sumcheck::SumcheckVerifier<Flavor>;
+    using Sumcheck = ::bb::honk::sumcheck::SumcheckVerifier<Flavor>;
     using Curve = typename Flavor::Curve;
-    using ZeroMorph = ::proof_system::honk::pcs::zeromorph::ZeroMorphVerifier_<Curve>;
+    using ZeroMorph = ::bb::honk::pcs::zeromorph::ZeroMorphVerifier_<Curve>;
     using VerifierCommitments = typename Flavor::VerifierCommitments;
     using CommitmentLabels = typename Flavor::CommitmentLabels;
-    using RelationParams = ::proof_system::RelationParameters<FF>;
+    using RelationParams = ::bb::RelationParameters<FF>;
     using Transcript = typename Flavor::Transcript;
 
     RelationParams relation_parameters;
@@ -86,10 +86,9 @@ std::array<typename Flavor::GroupElement, 2> UltraRecursiveVerifier_<Flavor>::ve
             transcript->template receive_from_prover<Commitment>(commitment_labels.lookup_inverses);
     }
 
-    const FF public_input_delta = proof_system::honk::compute_public_input_delta<Flavor>(
+    const FF public_input_delta = bb::honk::compute_public_input_delta<Flavor>(
         public_inputs, beta, gamma, circuit_size, static_cast<uint32_t>(pub_inputs_offset.get_value()));
-    const FF lookup_grand_product_delta =
-        proof_system::honk::compute_lookup_grand_product_delta<FF>(beta, gamma, circuit_size);
+    const FF lookup_grand_product_delta = bb::honk::compute_lookup_grand_product_delta<FF>(beta, gamma, circuit_size);
 
     relation_parameters.beta = beta;
     relation_parameters.gamma = gamma;
@@ -125,7 +124,8 @@ std::array<typename Flavor::GroupElement, 2> UltraRecursiveVerifier_<Flavor>::ve
     return pairing_points;
 }
 
-template class UltraRecursiveVerifier_<proof_system::honk::flavor::UltraRecursive_<UltraCircuitBuilder>>;
-template class UltraRecursiveVerifier_<proof_system::honk::flavor::UltraRecursive_<GoblinUltraCircuitBuilder>>;
-template class UltraRecursiveVerifier_<proof_system::honk::flavor::GoblinUltraRecursive>;
-} // namespace proof_system::plonk::stdlib::recursion::honk
+template class UltraRecursiveVerifier_<bb::honk::flavor::UltraRecursive_<UltraCircuitBuilder>>;
+template class UltraRecursiveVerifier_<bb::honk::flavor::UltraRecursive_<GoblinUltraCircuitBuilder>>;
+template class UltraRecursiveVerifier_<bb::honk::flavor::GoblinUltraRecursive_<UltraCircuitBuilder>>;
+template class UltraRecursiveVerifier_<bb::honk::flavor::GoblinUltraRecursive_<GoblinUltraCircuitBuilder>>;
+} // namespace bb::plonk::stdlib::recursion::honk
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/ultra_recursive_verifier.hpp b/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/ultra_recursive_verifier.hpp
index 5315297b673c..ca0cbb095109 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/ultra_recursive_verifier.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/ultra_recursive_verifier.hpp
@@ -5,7 +5,7 @@
 #include "barretenberg/stdlib/recursion/honk/transcript/transcript.hpp"
 #include "barretenberg/sumcheck/sumcheck.hpp"
 
-namespace proof_system::plonk::stdlib::recursion::honk {
+namespace bb::plonk::stdlib::recursion::honk {
 template <typename Flavor> class UltraRecursiveVerifier_ {
   public:
     using FF = typename Flavor::FF;
@@ -35,5 +35,4 @@ template <typename Flavor> class UltraRecursiveVerifier_ {
 // Instance declarations for Ultra and Goblin-Ultra verifier circuits with both conventional Ultra and Goblin-Ultra
 // arithmetization.
 using UltraRecursiveVerifier = UltraRecursiveVerifier_<UltraCircuitBuilder>;
-using GoblinRecursiveVerifier = UltraRecursiveVerifier_<proof_system::honk::flavor::GoblinUltraRecursive>;
-} // namespace proof_system::plonk::stdlib::recursion::honk
+} // namespace bb::plonk::stdlib::recursion::honk
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/verifier.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/verifier.test.cpp
index 3c966a4dcc35..276d1faffb47 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/verifier.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/verifier.test.cpp
@@ -7,7 +7,7 @@
 #include "barretenberg/ultra_honk/ultra_composer.hpp"
 #include "barretenberg/ultra_honk/ultra_verifier.hpp"
 
-namespace proof_system::plonk::stdlib::recursion::honk {
+namespace bb::plonk::stdlib::recursion::honk {
 
 /**
  * @brief Test suite for recursive verification of conventional Ultra Honk proofs
@@ -19,10 +19,10 @@ namespace proof_system::plonk::stdlib::recursion::honk {
 template <typename BuilderType> class RecursiveVerifierTest : public testing::Test {
 
     // Define types relevant for testing
-    using UltraFlavor = ::proof_system::honk::flavor::Ultra;
-    using GoblinUltraFlavor = ::proof_system::honk::flavor::GoblinUltra;
-    using UltraComposer = ::proof_system::honk::UltraComposer_<UltraFlavor>;
-    using GoblinUltraComposer = ::proof_system::honk::UltraComposer_<GoblinUltraFlavor>;
+    using UltraFlavor = ::bb::honk::flavor::Ultra;
+    using GoblinUltraFlavor = ::bb::honk::flavor::GoblinUltra;
+    using UltraComposer = ::bb::honk::UltraComposer_<UltraFlavor>;
+    using GoblinUltraComposer = ::bb::honk::UltraComposer_<GoblinUltraFlavor>;
 
     using InnerFlavor = UltraFlavor;
     using InnerComposer = UltraComposer;
@@ -32,7 +32,7 @@ template <typename BuilderType> class RecursiveVerifierTest : public testing::Te
     using FF = InnerFlavor::FF;
 
     // Types for recursive verifier circuit
-    using RecursiveFlavor = ::proof_system::honk::flavor::UltraRecursive_<BuilderType>;
+    using RecursiveFlavor = ::bb::honk::flavor::UltraRecursive_<BuilderType>;
     using RecursiveVerifier = UltraRecursiveVerifier_<RecursiveFlavor>;
     using OuterBuilder = BuilderType;
     using VerificationKey = typename RecursiveVerifier::VerificationKey;
@@ -263,4 +263,4 @@ HEAVY_TYPED_TEST(RecursiveVerifierTest, SingleRecursiveVerificationFailure)
     TestFixture::test_recursive_verification_fails();
 };
 
-} // namespace proof_system::plonk::stdlib::recursion::honk
\ No newline at end of file
+} // namespace bb::plonk::stdlib::recursion::honk
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/recursion/transcript/transcript.hpp b/barretenberg/cpp/src/barretenberg/stdlib/recursion/transcript/transcript.hpp
index b010f8652252..ef4ed20a8825 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/recursion/transcript/transcript.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/recursion/transcript/transcript.hpp
@@ -14,7 +14,7 @@
 #include "barretenberg/ecc/curves/bn254/g1.hpp"
 #include "barretenberg/plonk/transcript/transcript.hpp"
 
-namespace proof_system::plonk::stdlib::recursion {
+namespace bb::plonk::stdlib::recursion {
 template <typename Builder> class Transcript {
   public:
     using field_pt = field_t<Builder>;
@@ -405,4 +405,4 @@ template <typename Builder> class Transcript {
 
     size_t current_round = 0;
 };
-} // namespace proof_system::plonk::stdlib::recursion
+} // namespace bb::plonk::stdlib::recursion
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/recursion/transcript/transcript.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/recursion/transcript/transcript.test.cpp
index b1d8d0d31e63..1ed43b8c50b9 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/recursion/transcript/transcript.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/recursion/transcript/transcript.test.cpp
@@ -5,7 +5,7 @@
 #include "barretenberg/transcript/transcript.hpp"
 #include "transcript.hpp"
 
-namespace proof_system::plonk::stdlib::recursion {
+namespace bb::plonk::stdlib::recursion {
 
 // TODO(Cody): Testing only one circuit type.
 using Builder = StandardCircuitBuilder;
@@ -273,4 +273,4 @@ TEST(stdlib_transcript, validate_transcript)
     auto result = builder.check_circuit();
     EXPECT_EQ(result, true);
 }
-} // namespace proof_system::plonk::stdlib::recursion
\ No newline at end of file
+} // namespace bb::plonk::stdlib::recursion
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/recursion/verification_key/verification_key.hpp b/barretenberg/cpp/src/barretenberg/stdlib/recursion/verification_key/verification_key.hpp
index e59dc8144814..f77323920c4a 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/recursion/verification_key/verification_key.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/recursion/verification_key/verification_key.hpp
@@ -15,7 +15,7 @@
 #include "barretenberg/stdlib/hash/pedersen/pedersen.hpp"
 #include <map>
 
-namespace proof_system::plonk::stdlib::recursion {
+namespace bb::plonk::stdlib::recursion {
 
 /**
  * @brief Constructs a packed buffer of field elements to be fed into a Pedersen hash function
@@ -449,4 +449,4 @@ template <typename Curve> struct verification_key {
     Builder* context;
 };
 
-} // namespace proof_system::plonk::stdlib::recursion
+} // namespace bb::plonk::stdlib::recursion
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/recursion/verification_key/verification_key.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/recursion/verification_key/verification_key.test.cpp
index 019bc0cd0068..c953c17e780c 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/recursion/verification_key/verification_key.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/recursion/verification_key/verification_key.test.cpp
@@ -10,7 +10,7 @@ namespace {
 auto& engine = numeric::random::get_debug_engine();
 } // namespace
 
-using namespace proof_system::plonk;
+using namespace bb::plonk;
 
 /**
  * @brief A test fixture that will let us generate VK data and run tests
@@ -20,8 +20,8 @@ using namespace proof_system::plonk;
  */
 template <typename Builder> class VerificationKeyFixture : public testing::Test {
   public:
-    using Curve = proof_system::plonk::stdlib::bn254<Builder>;
-    using RecursVk = proof_system::plonk::stdlib::recursion::verification_key<Curve>;
+    using Curve = bb::plonk::stdlib::bn254<Builder>;
+    using RecursVk = bb::plonk::stdlib::recursion::verification_key<Curve>;
 
     static void SetUpTestSuite() { bb::srs::init_crs_factory("../srs_db/ignition"); }
 
@@ -44,7 +44,7 @@ template <typename Builder> class VerificationKeyFixture : public testing::Test
     }
 };
 
-using CircuitTypes = testing::Types<proof_system::StandardCircuitBuilder, proof_system::UltraCircuitBuilder>;
+using CircuitTypes = testing::Types<bb::StandardCircuitBuilder, bb::UltraCircuitBuilder>;
 TYPED_TEST_SUITE(VerificationKeyFixture, CircuitTypes);
 
 TYPED_TEST(VerificationKeyFixture, VkDataVsRecursionHashNative)
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/recursion/verifier/program_settings.hpp b/barretenberg/cpp/src/barretenberg/stdlib/recursion/verifier/program_settings.hpp
index 90d600eab226..897ba2f1d9c9 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/recursion/verifier/program_settings.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/recursion/verifier/program_settings.hpp
@@ -3,7 +3,7 @@
 #include "barretenberg/plonk/proof_system/types/program_settings.hpp"
 #include "barretenberg/stdlib/recursion/transcript/transcript.hpp"
 
-namespace proof_system::plonk {
+namespace bb::plonk {
 namespace stdlib {
 namespace recursion {
 
@@ -12,18 +12,16 @@ template <typename Curve> class recursive_ultra_verifier_settings : public plonk
     typedef typename Curve::ScalarField fr_ct;
     typedef typename Curve::GroupNative::affine_element g1;
     typedef typename Curve::Builder Builder;
-    typedef proof_system::plonk::stdlib::recursion::Transcript<Builder> Transcript_pt;
-    typedef proof_system::plonk::VerifierPermutationWidget<fr_ct, g1, Transcript_pt> PermutationWidget;
-    typedef proof_system::plonk::VerifierPlookupWidget<fr_ct, g1, Transcript_pt> PlookupWidget;
+    typedef bb::plonk::stdlib::recursion::Transcript<Builder> Transcript_pt;
+    typedef bb::plonk::VerifierPermutationWidget<fr_ct, g1, Transcript_pt> PermutationWidget;
+    typedef bb::plonk::VerifierPlookupWidget<fr_ct, g1, Transcript_pt> PlookupWidget;
 
-    typedef proof_system::plonk::ultra_settings base_settings;
+    typedef bb::plonk::ultra_settings base_settings;
 
-    typedef proof_system::plonk::VerifierPlookupArithmeticWidget<fr_ct, g1, Transcript_pt, base_settings>
-        PlookupArithmeticWidget;
-    typedef proof_system::plonk::VerifierGenPermSortWidget<fr_ct, g1, Transcript_pt, base_settings> GenPermSortWidget;
-    typedef proof_system::plonk::VerifierEllipticWidget<fr_ct, g1, Transcript_pt, base_settings> EllipticWidget;
-    typedef proof_system::plonk::VerifierPlookupAuxiliaryWidget<fr_ct, g1, Transcript_pt, base_settings>
-        PlookupAuxiliaryWidget;
+    typedef bb::plonk::VerifierPlookupArithmeticWidget<fr_ct, g1, Transcript_pt, base_settings> PlookupArithmeticWidget;
+    typedef bb::plonk::VerifierGenPermSortWidget<fr_ct, g1, Transcript_pt, base_settings> GenPermSortWidget;
+    typedef bb::plonk::VerifierEllipticWidget<fr_ct, g1, Transcript_pt, base_settings> EllipticWidget;
+    typedef bb::plonk::VerifierPlookupAuxiliaryWidget<fr_ct, g1, Transcript_pt, base_settings> PlookupAuxiliaryWidget;
 
     static constexpr size_t num_challenge_bytes = 16;
     static constexpr transcript::HashType hash_type = transcript::HashType::PedersenBlake3s;
@@ -89,22 +87,20 @@ class recursive_ultra_to_standard_verifier_settings : public recursive_ultra_ver
     typedef typename Curve::ScalarField fr_ct;
     typedef typename Curve::GroupNative::affine_element g1;
     typedef typename Curve::Builder Builder;
-    typedef proof_system::plonk::stdlib::recursion::Transcript<Builder> Transcript_pt;
-    typedef proof_system::plonk::VerifierPermutationWidget<fr_ct, g1, Transcript_pt> PermutationWidget;
-    typedef proof_system::plonk::VerifierPlookupWidget<fr_ct, g1, Transcript_pt> PlookupWidget;
+    typedef bb::plonk::stdlib::recursion::Transcript<Builder> Transcript_pt;
+    typedef bb::plonk::VerifierPermutationWidget<fr_ct, g1, Transcript_pt> PermutationWidget;
+    typedef bb::plonk::VerifierPlookupWidget<fr_ct, g1, Transcript_pt> PlookupWidget;
 
-    typedef proof_system::plonk::ultra_to_standard_settings base_settings;
+    typedef bb::plonk::ultra_to_standard_settings base_settings;
 
-    typedef proof_system::plonk::VerifierPlookupArithmeticWidget<fr_ct, g1, Transcript_pt, base_settings>
-        PlookupArithmeticWidget;
-    typedef proof_system::plonk::VerifierGenPermSortWidget<fr_ct, g1, Transcript_pt, base_settings> GenPermSortWidget;
-    typedef proof_system::plonk::VerifierEllipticWidget<fr_ct, g1, Transcript_pt, base_settings> EllipticWidget;
-    typedef proof_system::plonk::VerifierPlookupAuxiliaryWidget<fr_ct, g1, Transcript_pt, base_settings>
-        PlookupAuxiliaryWidget;
+    typedef bb::plonk::VerifierPlookupArithmeticWidget<fr_ct, g1, Transcript_pt, base_settings> PlookupArithmeticWidget;
+    typedef bb::plonk::VerifierGenPermSortWidget<fr_ct, g1, Transcript_pt, base_settings> GenPermSortWidget;
+    typedef bb::plonk::VerifierEllipticWidget<fr_ct, g1, Transcript_pt, base_settings> EllipticWidget;
+    typedef bb::plonk::VerifierPlookupAuxiliaryWidget<fr_ct, g1, Transcript_pt, base_settings> PlookupAuxiliaryWidget;
 
     static constexpr transcript::HashType hash_type = transcript::HashType::PedersenBlake3s;
 };
 
 } // namespace recursion
 } // namespace stdlib
-} // namespace proof_system::plonk
+} // namespace bb::plonk
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/recursion/verifier/verifier.hpp b/barretenberg/cpp/src/barretenberg/stdlib/recursion/verifier/verifier.hpp
index 0084585dbdc2..136ae6d4ca17 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/recursion/verifier/verifier.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/recursion/verifier/verifier.hpp
@@ -14,7 +14,7 @@
 #include "barretenberg/stdlib/recursion/transcript/transcript.hpp"
 #include "barretenberg/stdlib/recursion/verifier/program_settings.hpp"
 
-namespace proof_system::plonk {
+namespace bb::plonk {
 namespace stdlib {
 namespace recursion {
 
@@ -99,7 +99,7 @@ void populate_kate_element_map(typename Curve::Builder* ctx,
     fr_ct u = transcript.get_challenge_field_element("separator", 0);
 
     fr_ct batch_evaluation =
-        proof_system::plonk::compute_kate_batch_evaluation<fr_ct, Transcript, program_settings>(key, transcript);
+        bb::plonk::compute_kate_batch_evaluation<fr_ct, Transcript, program_settings>(key, transcript);
     batch_opening_scalar = -batch_evaluation;
 
     kate_g1_elements.insert({ "PI_Z_OMEGA", PI_Z_OMEGA });
@@ -431,4 +431,4 @@ aggregation_state<bn254<typename Flavor::CircuitBuilder>> verify_proof(
 
 } // namespace recursion
 } // namespace stdlib
-} // namespace proof_system::plonk
+} // namespace bb::plonk
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/recursion/verifier/verifier.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/recursion/verifier/verifier.test.cpp
index cea520713a9f..2fded954a07c 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/recursion/verifier/verifier.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/recursion/verifier/verifier.test.cpp
@@ -12,11 +12,11 @@
 #include "barretenberg/stdlib/primitives/curves/bn254.hpp"
 #include "barretenberg/transcript/transcript.hpp"
 
-namespace proof_system::plonk::stdlib {
+namespace bb::plonk::stdlib {
 
 template <typename OuterComposer> class stdlib_verifier : public testing::Test {
 
-    using InnerComposer = proof_system::plonk::UltraComposer;
+    using InnerComposer = bb::plonk::UltraComposer;
     using InnerBuilder = typename InnerComposer::CircuitBuilder;
 
     using OuterBuilder = typename OuterComposer::CircuitBuilder;
@@ -46,7 +46,7 @@ template <typename OuterComposer> class stdlib_verifier : public testing::Test {
     // select the relevant prover and verifier types (whose settings use the same hash for fiat-shamir),
     // depending on the Inner-Outer combo. It's a bit clunky, but the alternative is to have a template argument
     // for the hashtype, and that would pervade the entire UltraPlonkComposer, which would be horrendous.
-    static constexpr bool is_ultra_to_ultra = std::is_same_v<OuterComposer, proof_system::plonk::UltraComposer>;
+    static constexpr bool is_ultra_to_ultra = std::is_same_v<OuterComposer, bb::plonk::UltraComposer>;
     using ProverOfInnerCircuit =
         std::conditional_t<is_ultra_to_ultra, plonk::UltraProver, plonk::UltraToStandardProver>;
     using VerifierOfInnerProof =
@@ -212,7 +212,7 @@ template <typename OuterComposer> class stdlib_verifier : public testing::Test {
 
         plonk::proof proof_to_recursively_verify_b = prover.construct_proof();
 
-        auto output = proof_system::plonk::stdlib::recursion::verify_proof<outer_curve, RecursiveSettings>(
+        auto output = bb::plonk::stdlib::recursion::verify_proof<outer_curve, RecursiveSettings>(
             &outer_circuit, verification_key_b, recursive_manifest, proof_to_recursively_verify_b, previous_output);
 
         verification_key_b->hash();
@@ -265,8 +265,8 @@ template <typename OuterComposer> class stdlib_verifier : public testing::Test {
 
         transcript::Manifest recursive_manifest = InnerComposer::create_manifest(prover_a.key->num_public_inputs);
 
-        proof_system::plonk::stdlib::recursion::aggregation_state<outer_curve> output =
-            proof_system::plonk::stdlib::recursion::verify_proof<outer_curve, RecursiveSettings>(
+        bb::plonk::stdlib::recursion::aggregation_state<outer_curve> output =
+            bb::plonk::stdlib::recursion::verify_proof<outer_curve, RecursiveSettings>(
                 &outer_circuit, verification_key, recursive_manifest, recursive_proof);
 
         return { output, verification_key };
@@ -617,4 +617,4 @@ HEAVY_TYPED_TEST(stdlib_verifier, recursive_proof_composition_const_verif_key)
     TestFixture::test_recursive_proof_composition_with_constant_verification_key();
 }
 
-} // namespace proof_system::plonk::stdlib
\ No newline at end of file
+} // namespace bb::plonk::stdlib
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/types/ultra.hpp b/barretenberg/cpp/src/barretenberg/stdlib/types/ultra.hpp
index a4c199d01ab4..ebba3e3feb5a 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/types/ultra.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/types/ultra.hpp
@@ -19,11 +19,11 @@
 #include "barretenberg/stdlib/primitives/witness/witness.hpp"
 #include "barretenberg/stdlib/recursion/verifier/program_settings.hpp"
 
-namespace proof_system::plonk::stdlib::types {
+namespace bb::plonk::stdlib::types {
 
-using namespace proof_system::plonk;
+using namespace bb::plonk;
 
-using Builder = proof_system::UltraCircuitBuilder;
+using Builder = bb::UltraCircuitBuilder;
 using Composer = plonk::UltraComposer;
 
 // TODO(Cody): These might be wrong depending on desired F-S hash.
@@ -66,4 +66,4 @@ using rom_table_ct = stdlib::rom_table<plonk::UltraComposer>;
 
 using recursive_inner_verifier_settings = recursion::recursive_ultra_verifier_settings<bn254>;
 
-} // namespace proof_system::plonk::stdlib::types
+} // namespace bb::plonk::stdlib::types
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/utility/utility.hpp b/barretenberg/cpp/src/barretenberg/stdlib/utility/utility.hpp
index 02035aa61979..bc87276d2120 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib/utility/utility.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib/utility/utility.hpp
@@ -11,7 +11,7 @@
 #include "barretenberg/stdlib/primitives/biggroup/biggroup.hpp"
 #include "barretenberg/stdlib/primitives/field/field.hpp"
 
-namespace proof_system::plonk::stdlib::recursion::utility {
+namespace bb::plonk::stdlib::recursion::utility {
 
 /**
  * @brief Utility class for converting native types to corresponding stdlib types
@@ -135,4 +135,4 @@ template <typename Builder> class StdlibTypesUtility {
         using type = Univariate<LENGTH>;
     };
 };
-} // namespace proof_system::plonk::stdlib::recursion::utility
\ No newline at end of file
+} // namespace bb::plonk::stdlib::recursion::utility
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/sumcheck/instance/instances.hpp b/barretenberg/cpp/src/barretenberg/sumcheck/instance/instances.hpp
index 405f49d84633..d8262e40d8f7 100644
--- a/barretenberg/cpp/src/barretenberg/sumcheck/instance/instances.hpp
+++ b/barretenberg/cpp/src/barretenberg/sumcheck/instance/instances.hpp
@@ -2,7 +2,7 @@
 #include "barretenberg/sumcheck/instance/prover_instance.hpp"
 #include "barretenberg/sumcheck/instance/verifier_instance.hpp"
 
-namespace proof_system::honk {
+namespace bb::honk {
 
 template <typename Flavor_, size_t NUM_> struct ProverInstances_ {
   public:
@@ -17,7 +17,7 @@ template <typename Flavor_, size_t NUM_> struct ProverInstances_ {
     // The extended length here is the length of a composition of polynomials.
     static constexpr size_t EXTENDED_LENGTH = (Flavor::MAX_TOTAL_RELATION_LENGTH - 1) * (NUM - 1) + 1;
     static constexpr size_t BATCHED_EXTENDED_LENGTH = (Flavor::MAX_TOTAL_RELATION_LENGTH - 1 + NUM - 1) * (NUM - 1) + 1;
-    using RelationParameters = proof_system::RelationParameters<Univariate<FF, EXTENDED_LENGTH>>;
+    using RelationParameters = bb::RelationParameters<Univariate<FF, EXTENDED_LENGTH>>;
     using RelationSeparator = std::array<Univariate<FF, BATCHED_EXTENDED_LENGTH>, NUM_SUBRELATIONS - 1>;
     ArrayType _data;
     RelationParameters relation_parameters;
@@ -105,4 +105,4 @@ template <typename Flavor_, size_t NUM_> struct VerifierInstances_ {
         std::generate(_data.begin(), _data.end(), []() { return std::make_unique<Instance>(); });
     };
 };
-} // namespace proof_system::honk
+} // namespace bb::honk
diff --git a/barretenberg/cpp/src/barretenberg/sumcheck/instance/prover_instance.cpp b/barretenberg/cpp/src/barretenberg/sumcheck/instance/prover_instance.cpp
index 34757cdc54ec..9bb8ebddc69d 100644
--- a/barretenberg/cpp/src/barretenberg/sumcheck/instance/prover_instance.cpp
+++ b/barretenberg/cpp/src/barretenberg/sumcheck/instance/prover_instance.cpp
@@ -5,7 +5,7 @@
 #include "barretenberg/proof_system/library/grand_product_delta.hpp"
 #include "barretenberg/proof_system/library/grand_product_library.hpp"
 
-namespace proof_system::honk {
+namespace bb::honk {
 /**
  * @brief Helper method to compute quantities like total number of gates and dyadic circuit size
  *
@@ -428,4 +428,4 @@ template <class Flavor> void ProverInstance_<Flavor>::compute_grand_product_poly
 template class ProverInstance_<honk::flavor::Ultra>;
 template class ProverInstance_<honk::flavor::GoblinUltra>;
 
-} // namespace proof_system::honk
+} // namespace bb::honk
diff --git a/barretenberg/cpp/src/barretenberg/sumcheck/instance/prover_instance.hpp b/barretenberg/cpp/src/barretenberg/sumcheck/instance/prover_instance.hpp
index cde5de07b30f..74106338322d 100644
--- a/barretenberg/cpp/src/barretenberg/sumcheck/instance/prover_instance.hpp
+++ b/barretenberg/cpp/src/barretenberg/sumcheck/instance/prover_instance.hpp
@@ -5,7 +5,7 @@
 #include "barretenberg/proof_system/composer/composer_lib.hpp"
 #include "barretenberg/relations/relation_parameters.hpp"
 
-namespace proof_system::honk {
+namespace bb::honk {
 /**
  * @brief  An Instance is normally constructed from a finalized circuit and it's role is to compute all the polynomials
  * involved in creating a proof and, if requested, the verification key.
@@ -46,7 +46,7 @@ template <class Flavor> class ProverInstance_ {
     // instances
     size_t pub_inputs_offset = 0;
     RelationSeparator alphas;
-    proof_system::RelationParameters<FF> relation_parameters;
+    bb::RelationParameters<FF> relation_parameters;
     std::vector<uint32_t> recursive_proof_public_input_indices;
 
     bool is_accumulator = false;
@@ -107,4 +107,4 @@ template <class Flavor> class ProverInstance_ {
     void add_plookup_memory_records_to_wire_4(FF);
 };
 
-} // namespace proof_system::honk
+} // namespace bb::honk
diff --git a/barretenberg/cpp/src/barretenberg/sumcheck/instance/prover_instance.test.cpp b/barretenberg/cpp/src/barretenberg/sumcheck/instance/prover_instance.test.cpp
index d6f7dd1a57f0..9de85a376045 100644
--- a/barretenberg/cpp/src/barretenberg/sumcheck/instance/prover_instance.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/sumcheck/instance/prover_instance.test.cpp
@@ -6,7 +6,7 @@
 #include "barretenberg/srs/factories/file_crs_factory.hpp"
 #include <gtest/gtest.h>
 
-using namespace proof_system::honk;
+using namespace bb::honk;
 namespace instance_tests {
 
 template <class Flavor> class InstanceTests : public testing::Test {
diff --git a/barretenberg/cpp/src/barretenberg/sumcheck/instance/verifier_instance.hpp b/barretenberg/cpp/src/barretenberg/sumcheck/instance/verifier_instance.hpp
index 23faaf878759..05a6a7444e2e 100644
--- a/barretenberg/cpp/src/barretenberg/sumcheck/instance/verifier_instance.hpp
+++ b/barretenberg/cpp/src/barretenberg/sumcheck/instance/verifier_instance.hpp
@@ -2,7 +2,7 @@
 #include "barretenberg/flavor/flavor.hpp"
 #include "barretenberg/relations/relation_parameters.hpp"
 
-namespace proof_system::honk {
+namespace bb::honk {
 template <class Flavor> class VerifierInstance_ {
   public:
     using FF = typename Flavor::FF;
@@ -28,4 +28,4 @@ template <class Flavor> class VerifierInstance_ {
     WitnessCommitments witness_commitments;
     CommitmentLabels commitment_labels;
 };
-} // namespace proof_system::honk
\ No newline at end of file
+} // namespace bb::honk
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/sumcheck/partial_evaluation.test.cpp b/barretenberg/cpp/src/barretenberg/sumcheck/partial_evaluation.test.cpp
index 4cc607f50241..c0df47b4861e 100644
--- a/barretenberg/cpp/src/barretenberg/sumcheck/partial_evaluation.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/sumcheck/partial_evaluation.test.cpp
@@ -3,12 +3,12 @@
 
 #include <gtest/gtest.h>
 
-using namespace proof_system::honk::sumcheck;
+using namespace bb::honk::sumcheck;
 namespace test_sumcheck_polynomials {
 
 template <typename Flavor> class PartialEvaluationTests : public testing::Test {};
 
-using Flavors = testing::Types<proof_system::honk::flavor::Ultra>;
+using Flavors = testing::Types<bb::honk::flavor::Ultra>;
 
 TYPED_TEST_SUITE(PartialEvaluationTests, Flavors);
 
diff --git a/barretenberg/cpp/src/barretenberg/sumcheck/sumcheck.hpp b/barretenberg/cpp/src/barretenberg/sumcheck/sumcheck.hpp
index df110ef178d4..7f32a7b9fc73 100644
--- a/barretenberg/cpp/src/barretenberg/sumcheck/sumcheck.hpp
+++ b/barretenberg/cpp/src/barretenberg/sumcheck/sumcheck.hpp
@@ -5,7 +5,7 @@
 #include "barretenberg/transcript/transcript.hpp"
 #include "sumcheck_round.hpp"
 
-namespace proof_system::honk::sumcheck {
+namespace bb::honk::sumcheck {
 
 template <typename Flavor> class SumcheckProver {
 
@@ -83,7 +83,7 @@ template <typename Flavor> class SumcheckProver {
      * @details
      */
     SumcheckOutput<Flavor> prove(ProverPolynomials& full_polynomials,
-                                 const proof_system::RelationParameters<FF>& relation_parameters,
+                                 const bb::RelationParameters<FF>& relation_parameters,
                                  const RelationSeparator alpha,
                                  const std::vector<FF>& gate_challenges)
     {
@@ -202,7 +202,7 @@ template <typename Flavor> class SumcheckVerifier {
      * @param relation_parameters
      * @param transcript
      */
-    SumcheckOutput<Flavor> verify(const proof_system::RelationParameters<FF>& relation_parameters,
+    SumcheckOutput<Flavor> verify(const bb::RelationParameters<FF>& relation_parameters,
                                   RelationSeparator alpha,
                                   const std::vector<FF>& gate_challenges)
     {
@@ -257,4 +257,4 @@ template <typename Flavor> class SumcheckVerifier {
         return SumcheckOutput<Flavor>{ multivariate_challenge, purported_evaluations, verified };
     };
 };
-} // namespace proof_system::honk::sumcheck
+} // namespace bb::honk::sumcheck
diff --git a/barretenberg/cpp/src/barretenberg/sumcheck/sumcheck.test.cpp b/barretenberg/cpp/src/barretenberg/sumcheck/sumcheck.test.cpp
index 00dfabe6b49b..7d385c5947e2 100644
--- a/barretenberg/cpp/src/barretenberg/sumcheck/sumcheck.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/sumcheck/sumcheck.test.cpp
@@ -12,9 +12,9 @@
 
 #include <gtest/gtest.h>
 
-using namespace proof_system::honk;
-using namespace proof_system::honk::sumcheck;
-using Flavor = proof_system::honk::flavor::Ultra;
+using namespace bb::honk;
+using namespace bb::honk::sumcheck;
+using Flavor = bb::honk::flavor::Ultra;
 using FF = typename Flavor::FF;
 using ProverPolynomials = typename Flavor::ProverPolynomials;
 using RelationSeparator = Flavor::RelationSeparator;
@@ -213,7 +213,7 @@ TEST_F(SumcheckTests, ProverAndVerifierSimple)
         full_polynomials.q_arith = q_arith;
 
         // Set aribitrary random relation parameters
-        proof_system::RelationParameters<FF> relation_parameters{
+        bb::RelationParameters<FF> relation_parameters{
             .beta = FF::random_element(),
             .gamma = FF::random_element(),
             .public_input_delta = FF::one(),
diff --git a/barretenberg/cpp/src/barretenberg/sumcheck/sumcheck_output.hpp b/barretenberg/cpp/src/barretenberg/sumcheck/sumcheck_output.hpp
index 57c854d236e6..ea25b076ff82 100644
--- a/barretenberg/cpp/src/barretenberg/sumcheck/sumcheck_output.hpp
+++ b/barretenberg/cpp/src/barretenberg/sumcheck/sumcheck_output.hpp
@@ -4,7 +4,7 @@
 #include <optional>
 #include <vector>
 
-namespace proof_system::honk::sumcheck {
+namespace bb::honk::sumcheck {
 
 /**
  * @brief Contains the multi-linear evaluations of the polynomials at the challenge point 'u'.
@@ -20,4 +20,4 @@ template <typename Flavor> struct SumcheckOutput {
     // Whether or not the claimed multilinear evaluations and final sumcheck evaluation have been confirmed
     std::optional<bool> verified = false; // optional b/c this struct is shared by the Prover/Verifier
 };
-} // namespace proof_system::honk::sumcheck
+} // namespace bb::honk::sumcheck
diff --git a/barretenberg/cpp/src/barretenberg/sumcheck/sumcheck_round.hpp b/barretenberg/cpp/src/barretenberg/sumcheck/sumcheck_round.hpp
index fac33a1e47c6..4b06970542fa 100644
--- a/barretenberg/cpp/src/barretenberg/sumcheck/sumcheck_round.hpp
+++ b/barretenberg/cpp/src/barretenberg/sumcheck/sumcheck_round.hpp
@@ -7,7 +7,7 @@
 #include "barretenberg/relations/relation_types.hpp"
 #include "barretenberg/relations/utils.hpp"
 
-namespace proof_system::honk::sumcheck {
+namespace bb::honk::sumcheck {
 
 /*
  Notation: The polynomial P(X0, X1) that is the low-degree extension of its values vij = P(i,j)
@@ -103,7 +103,7 @@ template <typename Flavor> class SumcheckProverRound {
     template <typename ProverPolynomialsOrPartiallyEvaluatedMultivariates>
     bb::Univariate<FF, BATCHED_RELATION_PARTIAL_LENGTH> compute_univariate(
         ProverPolynomialsOrPartiallyEvaluatedMultivariates& polynomials,
-        const proof_system::RelationParameters<FF>& relation_parameters,
+        const bb::RelationParameters<FF>& relation_parameters,
         const bb::PowPolynomial<FF>& pow_polynomial,
         const RelationSeparator alpha)
     {
@@ -204,7 +204,7 @@ template <typename Flavor> class SumcheckProverRound {
 
             using Relation = typename std::tuple_element_t<relation_idx, Relations>;
             const bool is_subrelation_linearly_independent =
-                proof_system::subrelation_is_linearly_independent<Relation, subrelation_idx>();
+                bb::subrelation_is_linearly_independent<Relation, subrelation_idx>();
             // Except from the log derivative subrelation, each other subrelation in part is required to be 0 hence we
             // multiply by the power polynomial. As the sumcheck prover is required to send a univariate to the
             // verifier, we additionally need a univariate contribution from the pow polynomial.
@@ -236,7 +236,7 @@ template <typename Flavor> class SumcheckProverRound {
     template <size_t relation_idx = 0>
     void accumulate_relation_univariates(SumcheckTupleOfTuplesOfUnivariates& univariate_accumulators,
                                          const auto& extended_edges,
-                                         const proof_system::RelationParameters<FF>& relation_parameters,
+                                         const bb::RelationParameters<FF>& relation_parameters,
                                          const FF& scaling_factor)
     {
         using Relation = std::tuple_element_t<relation_idx, Relations>;
@@ -322,7 +322,7 @@ template <typename Flavor> class SumcheckVerifierRound {
     // so instead of having claimed evaluations of each relation in part  you have the actual evaluations
     // kill the pow_univariat
     FF compute_full_honk_relation_purported_value(ClaimedEvaluations purported_evaluations,
-                                                  const proof_system::RelationParameters<FF>& relation_parameters,
+                                                  const bb::RelationParameters<FF>& relation_parameters,
                                                   const bb::PowPolynomial<FF>& pow_polynomial,
                                                   const RelationSeparator alpha)
     {
@@ -335,4 +335,4 @@ template <typename Flavor> class SumcheckVerifierRound {
         return output;
     }
 };
-} // namespace proof_system::honk::sumcheck
+} // namespace bb::honk::sumcheck
diff --git a/barretenberg/cpp/src/barretenberg/sumcheck/sumcheck_round.test.cpp b/barretenberg/cpp/src/barretenberg/sumcheck/sumcheck_round.test.cpp
index af1f4a78f4c7..bb33dc4ef7f6 100644
--- a/barretenberg/cpp/src/barretenberg/sumcheck/sumcheck_round.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/sumcheck/sumcheck_round.test.cpp
@@ -4,8 +4,8 @@
 
 #include <gtest/gtest.h>
 
-using namespace proof_system::honk;
-using namespace proof_system::honk::sumcheck;
+using namespace bb::honk;
+using namespace bb::honk::sumcheck;
 
 using bb::BarycentricData;
 using bb::Univariate;
@@ -22,7 +22,7 @@ namespace test_sumcheck_round {
  */
 TEST(SumcheckRound, SumcheckTupleOfTuplesOfUnivariates)
 {
-    using Flavor = proof_system::honk::flavor::Ultra;
+    using Flavor = bb::honk::flavor::Ultra;
     using FF = typename Flavor::FF;
     using RelationSeparator = typename Flavor::RelationSeparator;
 
@@ -73,7 +73,7 @@ TEST(SumcheckRound, SumcheckTupleOfTuplesOfUnivariates)
  */
 TEST(SumcheckRound, TuplesOfEvaluationArrays)
 {
-    using Flavor = proof_system::honk::flavor::Ultra;
+    using Flavor = bb::honk::flavor::Ultra;
     using Utils = bb::RelationUtils<Flavor>;
     using FF = typename Flavor::FF;
     using RelationSeparator = typename Flavor::RelationSeparator;
@@ -113,7 +113,7 @@ TEST(SumcheckRound, TuplesOfEvaluationArrays)
  */
 TEST(SumcheckRound, AddTuplesOfTuplesOfUnivariates)
 {
-    using Flavor = proof_system::honk::flavor::Ultra;
+    using Flavor = bb::honk::flavor::Ultra;
     using FF = typename Flavor::FF;
 
     // Define some arbitrary univariates
diff --git a/barretenberg/cpp/src/barretenberg/transcript/transcript.hpp b/barretenberg/cpp/src/barretenberg/transcript/transcript.hpp
index a809c4b801f6..cf791175c98e 100644
--- a/barretenberg/cpp/src/barretenberg/transcript/transcript.hpp
+++ b/barretenberg/cpp/src/barretenberg/transcript/transcript.hpp
@@ -7,7 +7,7 @@
 // #define LOG_CHALLENGES
 // #define LOG_INTERACTIONS
 
-namespace proof_system::honk {
+namespace bb::honk {
 
 template <typename T, typename... U>
 concept Loggable = (std::same_as<T, bb::fr> || std::same_as<T, grumpkin::fr> ||
@@ -363,4 +363,4 @@ template <typename FF, typename T, size_t N> std::array<FF, N> challenges_to_fie
     std::move(arr.begin(), arr.end(), result.begin());
     return result;
 }
-} // namespace proof_system::honk
+} // namespace bb::honk
diff --git a/barretenberg/cpp/src/barretenberg/transcript/transcript.test.cpp b/barretenberg/cpp/src/barretenberg/transcript/transcript.test.cpp
index 5a22fd4fe027..b62cc960a2a4 100644
--- a/barretenberg/cpp/src/barretenberg/transcript/transcript.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/transcript/transcript.test.cpp
@@ -6,7 +6,7 @@ namespace bb::honk_transcript_tests {
 using FF = bb::fr;
 using Fr = bb::fr;
 using Fq = bb::fq;
-using Transcript = proof_system::honk::BaseTranscript;
+using Transcript = bb::honk::BaseTranscript;
 
 /**
  * @brief Test sending, receiving, and exporting proofs
diff --git a/barretenberg/cpp/src/barretenberg/translator_vm/goblin_translator_composer.cpp b/barretenberg/cpp/src/barretenberg/translator_vm/goblin_translator_composer.cpp
index 1e23cf12f4ad..285546ee4b7c 100644
--- a/barretenberg/cpp/src/barretenberg/translator_vm/goblin_translator_composer.cpp
+++ b/barretenberg/cpp/src/barretenberg/translator_vm/goblin_translator_composer.cpp
@@ -11,7 +11,7 @@
 #include "barretenberg/proof_system/composer/composer_lib.hpp"
 #include "barretenberg/proof_system/composer/permutation_lib.hpp"
 
-namespace proof_system::honk {
+namespace bb::honk {
 using Flavor = honk::flavor::GoblinTranslator;
 using Curve = typename Flavor::Curve;
 using FF = typename Flavor::FF;
@@ -184,11 +184,11 @@ void GoblinTranslatorComposer::compute_witness(CircuitBuilder& circuit_builder)
 
     // We construct concatenated versions of range constraint polynomials, where several polynomials are concatenated
     // into one. These polynomials are not commited to.
-    proof_system::honk::permutation_library::compute_concatenated_polynomials<Flavor>(proving_key.get());
+    bb::honk::permutation_library::compute_concatenated_polynomials<Flavor>(proving_key.get());
 
     // We also contruct ordered polynomials, which have the same values as concatenated ones + enough values to bridge
     // the range from 0 to maximum range defined by the range constraint.
-    proof_system::honk::permutation_library::compute_goblin_translator_range_constraint_ordered_polynomials<Flavor>(
+    bb::honk::permutation_library::compute_goblin_translator_range_constraint_ordered_polynomials<Flavor>(
         proving_key.get());
 
     computed_witness = true;
@@ -273,12 +273,11 @@ std::shared_ptr<typename Flavor::ProvingKey> GoblinTranslatorComposer::compute_p
 
     // Compute polynomials with odd and even indices set to 1 up to the minicircuit margin + lagrange polynomials at
     // second and second to last indices in the minicircuit
-    proof_system::honk::permutation_library::compute_lagrange_polynomials_for_goblin_translator<Flavor>(
-        proving_key.get());
+    bb::honk::permutation_library::compute_lagrange_polynomials_for_goblin_translator<Flavor>(proving_key.get());
 
     // Compute the numerator for the permutation argument with several repetitions of steps bridging 0 and maximum range
     // constraint
-    proof_system::honk::permutation_library::compute_extra_range_constraint_numerator<Flavor>(proving_key.get());
+    bb::honk::permutation_library::compute_extra_range_constraint_numerator<Flavor>(proving_key.get());
 
     return proving_key;
 }
@@ -314,4 +313,4 @@ std::shared_ptr<VerificationKey> GoblinTranslatorComposer::compute_verification_
 
     return verification_key;
 }
-} // namespace proof_system::honk
+} // namespace bb::honk
diff --git a/barretenberg/cpp/src/barretenberg/translator_vm/goblin_translator_composer.hpp b/barretenberg/cpp/src/barretenberg/translator_vm/goblin_translator_composer.hpp
index 4f8aa24410ef..4f1d4a9d2192 100644
--- a/barretenberg/cpp/src/barretenberg/translator_vm/goblin_translator_composer.hpp
+++ b/barretenberg/cpp/src/barretenberg/translator_vm/goblin_translator_composer.hpp
@@ -7,7 +7,7 @@
 #include "barretenberg/translator_vm/goblin_translator_prover.hpp"
 #include "barretenberg/translator_vm/goblin_translator_verifier.hpp"
 
-namespace proof_system::honk {
+namespace bb::honk {
 class GoblinTranslatorComposer {
   public:
     using Flavor = honk::flavor::GoblinTranslator;
@@ -70,4 +70,4 @@ class GoblinTranslatorComposer {
         return commitment_key;
     };
 };
-} // namespace proof_system::honk
\ No newline at end of file
+} // namespace bb::honk
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/translator_vm/goblin_translator_composer.test.cpp b/barretenberg/cpp/src/barretenberg/translator_vm/goblin_translator_composer.test.cpp
index 6c766285f15b..f6bcffd50bd5 100644
--- a/barretenberg/cpp/src/barretenberg/translator_vm/goblin_translator_composer.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/translator_vm/goblin_translator_composer.test.cpp
@@ -8,10 +8,10 @@
 
 #include <gtest/gtest.h>
 
-using namespace proof_system::honk;
+using namespace bb::honk;
 using CircuitBuilder = flavor::GoblinTranslator::CircuitBuilder;
 using Transcript = flavor::GoblinTranslator::Transcript;
-using OpQueue = proof_system::ECCOpQueue;
+using OpQueue = bb::ECCOpQueue;
 
 namespace test_goblin_translator_composer {
 
@@ -57,7 +57,7 @@ TEST_F(GoblinTranslatorComposerTests, Basic)
     auto z = Fr::random_element();
 
     // Add the same operations to the ECC op queue; the native computation is performed under the hood.
-    auto op_queue = std::make_shared<proof_system::ECCOpQueue>();
+    auto op_queue = std::make_shared<bb::ECCOpQueue>();
     for (size_t i = 0; i < 500; i++) {
         op_queue->add_accumulate(P1);
         op_queue->mul_accumulate(P2, z);
diff --git a/barretenberg/cpp/src/barretenberg/translator_vm/goblin_translator_prover.cpp b/barretenberg/cpp/src/barretenberg/translator_vm/goblin_translator_prover.cpp
index 00a4e291e8e5..b25a3cb5059a 100644
--- a/barretenberg/cpp/src/barretenberg/translator_vm/goblin_translator_prover.cpp
+++ b/barretenberg/cpp/src/barretenberg/translator_vm/goblin_translator_prover.cpp
@@ -5,7 +5,7 @@
 #include "barretenberg/proof_system/library/grand_product_library.hpp"
 #include "barretenberg/sumcheck/sumcheck.hpp"
 
-namespace proof_system::honk {
+namespace bb::honk {
 
 /**
  * Create GoblinTranslatorProver from proving key, witness and manifest.
@@ -197,4 +197,4 @@ plonk::proof& GoblinTranslatorProver::construct_proof()
     return export_proof();
 }
 
-} // namespace proof_system::honk
+} // namespace bb::honk
diff --git a/barretenberg/cpp/src/barretenberg/translator_vm/goblin_translator_prover.hpp b/barretenberg/cpp/src/barretenberg/translator_vm/goblin_translator_prover.hpp
index 4aa8299272bb..f9988f38ed21 100644
--- a/barretenberg/cpp/src/barretenberg/translator_vm/goblin_translator_prover.hpp
+++ b/barretenberg/cpp/src/barretenberg/translator_vm/goblin_translator_prover.hpp
@@ -4,7 +4,7 @@
 #include "barretenberg/relations/relation_parameters.hpp"
 #include "barretenberg/sumcheck/sumcheck_output.hpp"
 
-namespace proof_system::honk {
+namespace bb::honk {
 
 // We won't compile this class with honk::flavor::Standard, but we will like want to compile it (at least for testing)
 // with a flavor that uses the curve Grumpkin, or a flavor that does/does not have zk, etc.
@@ -40,7 +40,7 @@ class GoblinTranslatorProver {
 
     std::shared_ptr<Transcript> transcript = std::make_shared<Transcript>();
 
-    proof_system::RelationParameters<FF> relation_parameters;
+    bb::RelationParameters<FF> relation_parameters;
 
     std::shared_ptr<ProvingKey> key;
 
@@ -57,4 +57,4 @@ class GoblinTranslatorProver {
     plonk::proof proof;
 };
 
-} // namespace proof_system::honk
+} // namespace bb::honk
diff --git a/barretenberg/cpp/src/barretenberg/translator_vm/goblin_translator_verifier.cpp b/barretenberg/cpp/src/barretenberg/translator_vm/goblin_translator_verifier.cpp
index 406e94190e92..0cced54df802 100644
--- a/barretenberg/cpp/src/barretenberg/translator_vm/goblin_translator_verifier.cpp
+++ b/barretenberg/cpp/src/barretenberg/translator_vm/goblin_translator_verifier.cpp
@@ -4,9 +4,9 @@
 #include "barretenberg/transcript/transcript.hpp"
 
 using namespace bb;
-using namespace proof_system::honk::sumcheck;
+using namespace bb::honk::sumcheck;
 
-namespace proof_system::honk {
+namespace bb::honk {
 
 GoblinTranslatorVerifier::GoblinTranslatorVerifier(
     const std::shared_ptr<typename Flavor::VerificationKey>& verifier_key,
@@ -312,4 +312,4 @@ bool GoblinTranslatorVerifier::verify_translation(const TranslationEvaluations&
     return is_value_reconstructed;
 }
 
-} // namespace proof_system::honk
+} // namespace bb::honk
diff --git a/barretenberg/cpp/src/barretenberg/translator_vm/goblin_translator_verifier.hpp b/barretenberg/cpp/src/barretenberg/translator_vm/goblin_translator_verifier.hpp
index 44120b73e34a..3418501fcc43 100644
--- a/barretenberg/cpp/src/barretenberg/translator_vm/goblin_translator_verifier.hpp
+++ b/barretenberg/cpp/src/barretenberg/translator_vm/goblin_translator_verifier.hpp
@@ -3,7 +3,7 @@
 #include "barretenberg/goblin/translation_evaluations.hpp"
 #include "barretenberg/plonk/proof_system/types/proof.hpp"
 
-namespace proof_system::honk {
+namespace bb::honk {
 class GoblinTranslatorVerifier {
   public:
     using Flavor = honk::flavor::GoblinTranslator;
@@ -38,4 +38,4 @@ class GoblinTranslatorVerifier {
     bool verify_proof(const plonk::proof& proof);
     bool verify_translation(const TranslationEvaluations& translation_evaluations);
 };
-} // namespace proof_system::honk
+} // namespace bb::honk
diff --git a/barretenberg/cpp/src/barretenberg/ultra_honk/databus_composer.test.cpp b/barretenberg/cpp/src/barretenberg/ultra_honk/databus_composer.test.cpp
index de6377f3ebee..654834bd1516 100644
--- a/barretenberg/cpp/src/barretenberg/ultra_honk/databus_composer.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/ultra_honk/databus_composer.test.cpp
@@ -10,7 +10,7 @@
 #include "barretenberg/ultra_honk/ultra_composer.hpp"
 #include "barretenberg/ultra_honk/ultra_prover.hpp"
 
-using namespace proof_system::honk;
+using namespace bb::honk;
 
 namespace test_ultra_honk_composer {
 
@@ -49,12 +49,12 @@ class DataBusComposerTests : public ::testing::Test {
  */
 TEST_F(DataBusComposerTests, CallDataRead)
 {
-    auto op_queue = std::make_shared<proof_system::ECCOpQueue>();
+    auto op_queue = std::make_shared<bb::ECCOpQueue>();
 
     // Add mock data to op queue to simulate interaction with a previous circuit
     op_queue->populate_with_mock_initital_data();
 
-    auto builder = proof_system::GoblinUltraCircuitBuilder{ op_queue };
+    auto builder = bb::GoblinUltraCircuitBuilder{ op_queue };
 
     // Create a general test circuit
     generate_test_circuit(builder);
diff --git a/barretenberg/cpp/src/barretenberg/ultra_honk/goblin_ultra_composer.test.cpp b/barretenberg/cpp/src/barretenberg/ultra_honk/goblin_ultra_composer.test.cpp
index 23941c0b1bb6..96512d75f106 100644
--- a/barretenberg/cpp/src/barretenberg/ultra_honk/goblin_ultra_composer.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/ultra_honk/goblin_ultra_composer.test.cpp
@@ -8,7 +8,7 @@
 #include "barretenberg/ultra_honk/ultra_composer.hpp"
 #include "barretenberg/ultra_honk/ultra_prover.hpp"
 
-using namespace proof_system::honk;
+using namespace bb::honk;
 
 namespace test_ultra_honk_composer {
 
@@ -94,12 +94,12 @@ class GoblinUltraHonkComposerTests : public ::testing::Test {
  */
 TEST_F(GoblinUltraHonkComposerTests, SingleCircuit)
 {
-    auto op_queue = std::make_shared<proof_system::ECCOpQueue>();
+    auto op_queue = std::make_shared<bb::ECCOpQueue>();
 
     // Add mock data to op queue to simulate interaction with a previous circuit
     op_queue->populate_with_mock_initital_data();
 
-    auto builder = proof_system::GoblinUltraCircuitBuilder{ op_queue };
+    auto builder = bb::GoblinUltraCircuitBuilder{ op_queue };
 
     generate_test_circuit(builder);
 
@@ -122,7 +122,7 @@ TEST_F(GoblinUltraHonkComposerTests, SingleCircuit)
 TEST_F(GoblinUltraHonkComposerTests, MultipleCircuitsMergeOnly)
 {
     // Instantiate EccOpQueue. This will be shared across all circuits in the series
-    auto op_queue = std::make_shared<proof_system::ECCOpQueue>();
+    auto op_queue = std::make_shared<bb::ECCOpQueue>();
 
     // Add mock data to op queue to simulate interaction with a previous circuit
     op_queue->populate_with_mock_initital_data();
@@ -130,7 +130,7 @@ TEST_F(GoblinUltraHonkComposerTests, MultipleCircuitsMergeOnly)
     // Construct multiple test circuits that share an ECC op queue. Generate and verify a proof for each.
     size_t NUM_CIRCUITS = 3;
     for (size_t i = 0; i < NUM_CIRCUITS; ++i) {
-        auto builder = proof_system::GoblinUltraCircuitBuilder{ op_queue };
+        auto builder = bb::GoblinUltraCircuitBuilder{ op_queue };
 
         generate_test_circuit(builder);
 
@@ -150,7 +150,7 @@ TEST_F(GoblinUltraHonkComposerTests, MultipleCircuitsMergeOnly)
 TEST_F(GoblinUltraHonkComposerTests, MultipleCircuitsHonkOnly)
 {
     // Instantiate EccOpQueue. This will be shared across all circuits in the series
-    auto op_queue = std::make_shared<proof_system::ECCOpQueue>();
+    auto op_queue = std::make_shared<bb::ECCOpQueue>();
 
     // Add mock data to op queue to simulate interaction with a previous circuit
     op_queue->populate_with_mock_initital_data();
@@ -158,7 +158,7 @@ TEST_F(GoblinUltraHonkComposerTests, MultipleCircuitsHonkOnly)
     // Construct multiple test circuits that share an ECC op queue. Generate and verify a proof for each.
     size_t NUM_CIRCUITS = 3;
     for (size_t i = 0; i < NUM_CIRCUITS; ++i) {
-        auto builder = proof_system::GoblinUltraCircuitBuilder{ op_queue };
+        auto builder = bb::GoblinUltraCircuitBuilder{ op_queue };
 
         generate_test_circuit(builder);
 
@@ -178,7 +178,7 @@ TEST_F(GoblinUltraHonkComposerTests, MultipleCircuitsHonkOnly)
 TEST_F(GoblinUltraHonkComposerTests, MultipleCircuitsHonkAndMerge)
 {
     // Instantiate EccOpQueue. This will be shared across all circuits in the series
-    auto op_queue = std::make_shared<proof_system::ECCOpQueue>();
+    auto op_queue = std::make_shared<bb::ECCOpQueue>();
 
     // Add mock data to op queue to simulate interaction with a previous circuit
     op_queue->populate_with_mock_initital_data();
@@ -186,7 +186,7 @@ TEST_F(GoblinUltraHonkComposerTests, MultipleCircuitsHonkAndMerge)
     // Construct multiple test circuits that share an ECC op queue. Generate and verify a proof for each.
     size_t NUM_CIRCUITS = 3;
     for (size_t i = 0; i < NUM_CIRCUITS; ++i) {
-        auto builder = proof_system::GoblinUltraCircuitBuilder{ op_queue };
+        auto builder = bb::GoblinUltraCircuitBuilder{ op_queue };
 
         generate_test_circuit(builder);
 
diff --git a/barretenberg/cpp/src/barretenberg/ultra_honk/goblin_ultra_transcript.test.cpp b/barretenberg/cpp/src/barretenberg/ultra_honk/goblin_ultra_transcript.test.cpp
index 5d2b327d0654..3eceba80cf37 100644
--- a/barretenberg/cpp/src/barretenberg/ultra_honk/goblin_ultra_transcript.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/ultra_honk/goblin_ultra_transcript.test.cpp
@@ -6,13 +6,13 @@
 #include "barretenberg/ultra_honk/ultra_composer.hpp"
 #include <gtest/gtest.h>
 
-using namespace proof_system::honk;
+using namespace bb::honk;
 
 class GoblinUltraTranscriptTests : public ::testing::Test {
   public:
     static void SetUpTestSuite() { bb::srs::init_crs_factory("../srs_db/ignition"); }
 
-    using Flavor = proof_system::honk::flavor::GoblinUltra;
+    using Flavor = bb::honk::flavor::GoblinUltra;
     using FF = Flavor::FF;
 
     /**
diff --git a/barretenberg/cpp/src/barretenberg/ultra_honk/merge_prover.cpp b/barretenberg/cpp/src/barretenberg/ultra_honk/merge_prover.cpp
index 671634a3073c..f0f603f276ad 100644
--- a/barretenberg/cpp/src/barretenberg/ultra_honk/merge_prover.cpp
+++ b/barretenberg/cpp/src/barretenberg/ultra_honk/merge_prover.cpp
@@ -1,6 +1,6 @@
 #include "merge_prover.hpp"
 
-namespace proof_system::honk {
+namespace bb::honk {
 
 /**
  * Create MergeProver_
@@ -119,4 +119,4 @@ template <typename Flavor> plonk::proof& MergeProver_<Flavor>::construct_proof()
 template class MergeProver_<honk::flavor::Ultra>;
 template class MergeProver_<honk::flavor::GoblinUltra>;
 
-} // namespace proof_system::honk
\ No newline at end of file
+} // namespace bb::honk
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/ultra_honk/merge_prover.hpp b/barretenberg/cpp/src/barretenberg/ultra_honk/merge_prover.hpp
index 41175302612a..ab16e7fcc2b1 100644
--- a/barretenberg/cpp/src/barretenberg/ultra_honk/merge_prover.hpp
+++ b/barretenberg/cpp/src/barretenberg/ultra_honk/merge_prover.hpp
@@ -7,7 +7,7 @@
 #include "barretenberg/proof_system/op_queue/ecc_op_queue.hpp"
 #include "barretenberg/transcript/transcript.hpp"
 
-namespace proof_system::honk {
+namespace bb::honk {
 
 /**
  * @brief Prover class for the Goblin ECC op queue transcript merge protocol
@@ -39,4 +39,4 @@ template <typename Flavor> class MergeProver_ {
     plonk::proof proof;
 };
 
-} // namespace proof_system::honk
+} // namespace bb::honk
diff --git a/barretenberg/cpp/src/barretenberg/ultra_honk/merge_verifier.cpp b/barretenberg/cpp/src/barretenberg/ultra_honk/merge_verifier.cpp
index a0788340ec72..33ec28e80b6b 100644
--- a/barretenberg/cpp/src/barretenberg/ultra_honk/merge_verifier.cpp
+++ b/barretenberg/cpp/src/barretenberg/ultra_honk/merge_verifier.cpp
@@ -1,6 +1,6 @@
 #include "merge_verifier.hpp"
 
-namespace proof_system::honk {
+namespace bb::honk {
 
 template <typename Flavor>
 MergeVerifier_<Flavor>::MergeVerifier_()
@@ -82,4 +82,4 @@ template <typename Flavor> bool MergeVerifier_<Flavor>::verify_proof(const plonk
 template class MergeVerifier_<honk::flavor::Ultra>;
 template class MergeVerifier_<honk::flavor::GoblinUltra>;
 
-} // namespace proof_system::honk
\ No newline at end of file
+} // namespace bb::honk
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/ultra_honk/merge_verifier.hpp b/barretenberg/cpp/src/barretenberg/ultra_honk/merge_verifier.hpp
index f0d70d3e937d..87abe72d49e6 100644
--- a/barretenberg/cpp/src/barretenberg/ultra_honk/merge_verifier.hpp
+++ b/barretenberg/cpp/src/barretenberg/ultra_honk/merge_verifier.hpp
@@ -8,7 +8,7 @@
 #include "barretenberg/srs/global_crs.hpp"
 #include "barretenberg/transcript/transcript.hpp"
 
-namespace proof_system::honk {
+namespace bb::honk {
 
 /**
  * @brief Verifier class for the Goblin ECC op queue transcript merge protocol
@@ -36,4 +36,4 @@ template <typename Flavor> class MergeVerifier_ {
     bool verify_proof(const plonk::proof& proof);
 };
 
-} // namespace proof_system::honk
+} // namespace bb::honk
diff --git a/barretenberg/cpp/src/barretenberg/ultra_honk/protogalaxy.test.cpp b/barretenberg/cpp/src/barretenberg/ultra_honk/protogalaxy.test.cpp
index bc4a694a924e..df9ff344fd4f 100644
--- a/barretenberg/cpp/src/barretenberg/ultra_honk/protogalaxy.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/ultra_honk/protogalaxy.test.cpp
@@ -3,7 +3,7 @@
 #include "barretenberg/ultra_honk/ultra_composer.hpp"
 #include <gtest/gtest.h>
 
-using namespace proof_system::honk;
+using namespace bb::honk;
 
 using Flavor = flavor::Ultra;
 using VerificationKey = Flavor::VerificationKey;
@@ -16,7 +16,7 @@ using Projective = Flavor::GroupElement;
 using Builder = Flavor::CircuitBuilder;
 using Polynomial = typename Flavor::Polynomial;
 using ProverPolynomials = Flavor::ProverPolynomials;
-using RelationParameters = proof_system::RelationParameters<FF>;
+using RelationParameters = bb::RelationParameters<FF>;
 using WitnessCommitments = typename Flavor::WitnessCommitments;
 using CommitmentKey = Flavor::CommitmentKey;
 using PowPolynomial = bb::PowPolynomial<FF>;
@@ -149,7 +149,7 @@ TEST_F(ProtoGalaxyTests, PerturbatorPolynomial)
         poly = get_random_polynomial(instance_size);
     }
     auto full_polynomials = construct_ultra_full_polynomials(random_polynomials);
-    auto relation_parameters = proof_system::RelationParameters<FF>::get_random();
+    auto relation_parameters = bb::RelationParameters<FF>::get_random();
     RelationSeparator alphas;
     for (auto& alpha : alphas) {
         alpha = FF::random_element();
diff --git a/barretenberg/cpp/src/barretenberg/ultra_honk/relation_correctness.test.cpp b/barretenberg/cpp/src/barretenberg/ultra_honk/relation_correctness.test.cpp
index ee4f7a754fb3..7b86527e5883 100644
--- a/barretenberg/cpp/src/barretenberg/ultra_honk/relation_correctness.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/ultra_honk/relation_correctness.test.cpp
@@ -12,7 +12,7 @@
 #include "barretenberg/ultra_honk/ultra_composer.hpp"
 #include <gtest/gtest.h>
 
-using namespace proof_system::honk;
+using namespace bb::honk;
 
 namespace test_honk_relations {
 
@@ -226,7 +226,7 @@ template <typename Flavor> void create_some_ecc_op_queue_gates(auto& circuit_bui
 {
     using G1 = typename Flavor::Curve::Group;
     using FF = typename Flavor::FF;
-    static_assert(proof_system::IsGoblinFlavor<Flavor>);
+    static_assert(bb::IsGoblinFlavor<Flavor>);
     const size_t num_ecc_operations = 10; // arbitrary
     for (size_t i = 0; i < num_ecc_operations; ++i) {
         auto point = G1::affine_one * FF::random_element();
@@ -258,7 +258,7 @@ TEST_F(RelationCorrectnessTests, UltraRelationCorrectness)
 
     // Create a composer and then add an assortment of gates designed to ensure that the constraint(s) represented
     // by each relation are non-trivially exercised.
-    auto builder = proof_system::UltraCircuitBuilder();
+    auto builder = bb::UltraCircuitBuilder();
 
     // Create an assortment of representative gates
     create_some_add_gates<Flavor>(builder);
@@ -310,7 +310,7 @@ TEST_F(RelationCorrectnessTests, GoblinUltraRelationCorrectness)
 
     // Create a composer and then add an assortment of gates designed to ensure that the constraint(s) represented
     // by each relation are non-trivially exercised.
-    auto builder = proof_system::GoblinUltraCircuitBuilder();
+    auto builder = bb::GoblinUltraCircuitBuilder();
 
     // Create an assortment of representative gates
     create_some_add_gates<Flavor>(builder);
@@ -377,7 +377,7 @@ TEST_F(RelationCorrectnessTests, GoblinTranslatorPermutationRelationCorrectness)
     using FF = typename Flavor::FF;
     using ProverPolynomials = typename Flavor::ProverPolynomials;
     using Polynomial = bb::Polynomial<FF>;
-    using namespace proof_system::honk::permutation_library;
+    using namespace bb::honk::permutation_library;
     auto& engine = numeric::random::get_debug_engine();
     auto circuit_size = Flavor::MINI_CIRCUIT_SIZE * Flavor::CONCATENATION_INDEX;
 
@@ -385,7 +385,7 @@ TEST_F(RelationCorrectnessTests, GoblinTranslatorPermutationRelationCorrectness)
     FF gamma = FF::random_element();
 
     // Fill relation parameters
-    proof_system::RelationParameters<FF> params;
+    bb::RelationParameters<FF> params;
     params.gamma = gamma;
 
     // Create storage for polynomials
@@ -479,7 +479,7 @@ TEST_F(RelationCorrectnessTests, GoblinTranslatorPermutationRelationCorrectness)
     compute_concatenated_polynomials<Flavor>(&prover_polynomials);
 
     // Compute the grand product polynomial
-    grand_product_library::compute_grand_product<Flavor, proof_system::GoblinTranslatorPermutationRelation<FF>>(
+    grand_product_library::compute_grand_product<Flavor, bb::GoblinTranslatorPermutationRelation<FF>>(
         circuit_size, prover_polynomials, params);
     prover_polynomials.z_perm_shift = prover_polynomials.z_perm.shifted();
 
@@ -502,7 +502,7 @@ TEST_F(RelationCorrectnessTests, GoblinTranslatorGenPermSortRelationCorrectness)
     const auto max_value = (1 << Flavor::MICRO_LIMB_BITS) - 1;
 
     // No relation parameters are used in this relation
-    proof_system::RelationParameters<FF> params;
+    bb::RelationParameters<FF> params;
 
     ProverPolynomials prover_polynomials;
     // Allocate polynomials
@@ -583,7 +583,7 @@ TEST_F(RelationCorrectnessTests, GoblinTranslatorExtraRelationsCorrectness)
     auto mini_circuit_size = Flavor::MINI_CIRCUIT_SIZE;
 
     // We only use accumulated_result from relation parameters in this relation
-    proof_system::RelationParameters<FF> params;
+    bb::RelationParameters<FF> params;
     params.accumulated_result = {
         FF::random_element(), FF::random_element(), FF::random_element(), FF::random_element()
     };
@@ -684,7 +684,7 @@ TEST_F(RelationCorrectnessTests, GoblinTranslatorDecompositionRelationCorrectnes
     auto circuit_size = Flavor::FULL_CIRCUIT_SIZE;
 
     // Decomposition relation doesn't use any relation parameters
-    proof_system::RelationParameters<FF> params;
+    bb::RelationParameters<FF> params;
 
     // Create storage for polynomials
     ProverPolynomials prover_polynomials;
@@ -1060,7 +1060,7 @@ TEST_F(RelationCorrectnessTests, GoblinTranslatorNonNativeRelationCorrectness)
 
     auto& engine = numeric::random::get_debug_engine();
 
-    auto op_queue = std::make_shared<proof_system::ECCOpQueue>();
+    auto op_queue = std::make_shared<bb::ECCOpQueue>();
 
     // Generate random EccOpQueue actions
     for (size_t i = 0; i < ((Flavor::MINI_CIRCUIT_SIZE >> 1) - 1); i++) {
@@ -1083,11 +1083,10 @@ TEST_F(RelationCorrectnessTests, GoblinTranslatorNonNativeRelationCorrectness)
     const auto evaluation_input_x = BF::random_element(&engine);
 
     // Generating all the values is pretty tedious, so just use CircuitBuilder
-    auto circuit_builder =
-        proof_system::GoblinTranslatorCircuitBuilder(batching_challenge_v, evaluation_input_x, op_queue);
+    auto circuit_builder = bb::GoblinTranslatorCircuitBuilder(batching_challenge_v, evaluation_input_x, op_queue);
 
     // The non-native field relation uses limbs of evaluation_input_x and powers of batching_challenge_v as inputs
-    proof_system::RelationParameters<FF> params;
+    bb::RelationParameters<FF> params;
     auto v_power = BF::one();
     for (size_t i = 0; i < 4 /*Number of powers of v that we need {1,2,3,4}*/; i++) {
         v_power *= batching_challenge_v;
diff --git a/barretenberg/cpp/src/barretenberg/ultra_honk/sumcheck.test.cpp b/barretenberg/cpp/src/barretenberg/ultra_honk/sumcheck.test.cpp
index f26c426aa6f7..ab2cb1141cb2 100644
--- a/barretenberg/cpp/src/barretenberg/ultra_honk/sumcheck.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/ultra_honk/sumcheck.test.cpp
@@ -14,10 +14,10 @@
 
 #include <gtest/gtest.h>
 
-using namespace proof_system::honk;
-using namespace proof_system::honk::sumcheck;
+using namespace bb::honk;
+using namespace bb::honk::sumcheck;
 
-using Flavor = proof_system::honk::flavor::Ultra;
+using Flavor = bb::honk::flavor::Ultra;
 using FF = typename Flavor::FF;
 
 namespace test_sumcheck_round {
@@ -39,7 +39,7 @@ TEST_F(SumcheckTestsRealCircuit, Ultra)
     using RelationSeparator = typename Flavor::RelationSeparator;
 
     // Create a composer and a dummy circuit with a few gates
-    auto builder = proof_system::UltraCircuitBuilder();
+    auto builder = bb::UltraCircuitBuilder();
     FF a = FF::one();
 
     // Add some basic add gates, with a public input for good measure
diff --git a/barretenberg/cpp/src/barretenberg/ultra_honk/ultra_composer.cpp b/barretenberg/cpp/src/barretenberg/ultra_honk/ultra_composer.cpp
index 359c58b7949b..320c325827e1 100644
--- a/barretenberg/cpp/src/barretenberg/ultra_honk/ultra_composer.cpp
+++ b/barretenberg/cpp/src/barretenberg/ultra_honk/ultra_composer.cpp
@@ -4,7 +4,7 @@
 #include "barretenberg/proof_system/composer/permutation_lib.hpp"
 #include "barretenberg/proof_system/library/grand_product_library.hpp"
 
-namespace proof_system::honk {
+namespace bb::honk {
 
 /**
  * Compute verification key consisting of selector precommitments.
@@ -132,4 +132,4 @@ DeciderVerifier_<Flavor> UltraComposer_<Flavor>::create_decider_verifier(const s
 
 template class UltraComposer_<honk::flavor::Ultra>;
 template class UltraComposer_<honk::flavor::GoblinUltra>;
-} // namespace proof_system::honk
+} // namespace bb::honk
diff --git a/barretenberg/cpp/src/barretenberg/ultra_honk/ultra_composer.hpp b/barretenberg/cpp/src/barretenberg/ultra_honk/ultra_composer.hpp
index 1d2037fc5577..5d2a6a71ea26 100644
--- a/barretenberg/cpp/src/barretenberg/ultra_honk/ultra_composer.hpp
+++ b/barretenberg/cpp/src/barretenberg/ultra_honk/ultra_composer.hpp
@@ -12,7 +12,7 @@
 #include "barretenberg/ultra_honk/ultra_prover.hpp"
 #include "barretenberg/ultra_honk/ultra_verifier.hpp"
 
-namespace proof_system::honk {
+namespace bb::honk {
 template <UltraFlavor Flavor> class UltraComposer_ {
   public:
     using CircuitBuilder = typename Flavor::CircuitBuilder;
@@ -136,4 +136,4 @@ template <UltraFlavor Flavor> class UltraComposer_ {
 // TODO(#532): this pattern is weird; is this not instantiating the templates?
 using UltraComposer = UltraComposer_<honk::flavor::Ultra>;
 using GoblinUltraComposer = UltraComposer_<honk::flavor::GoblinUltra>;
-} // namespace proof_system::honk
+} // namespace bb::honk
diff --git a/barretenberg/cpp/src/barretenberg/ultra_honk/ultra_composer.test.cpp b/barretenberg/cpp/src/barretenberg/ultra_honk/ultra_composer.test.cpp
index 2d20c530f85e..3ab5595dcddb 100644
--- a/barretenberg/cpp/src/barretenberg/ultra_honk/ultra_composer.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/ultra_honk/ultra_composer.test.cpp
@@ -16,7 +16,7 @@
 #include <string>
 #include <vector>
 
-using namespace proof_system::honk;
+using namespace bb::honk;
 
 namespace test_ultra_honk_composer {
 
@@ -69,7 +69,7 @@ class UltraHonkComposerTests : public ::testing::Test {
  */
 TEST_F(UltraHonkComposerTests, ANonZeroPolynomialIsAGoodPolynomial)
 {
-    auto circuit_builder = proof_system::UltraCircuitBuilder();
+    auto circuit_builder = bb::UltraCircuitBuilder();
 
     auto composer = UltraComposer();
     auto instance = composer.create_instance(circuit_builder);
@@ -96,7 +96,7 @@ TEST_F(UltraHonkComposerTests, ANonZeroPolynomialIsAGoodPolynomial)
  */
 TEST_F(UltraHonkComposerTests, PublicInputs)
 {
-    auto builder = proof_system::UltraCircuitBuilder();
+    auto builder = bb::UltraCircuitBuilder();
     size_t num_gates = 10;
 
     // Add some arbitrary arithmetic gates that utilize public inputs
@@ -120,7 +120,7 @@ TEST_F(UltraHonkComposerTests, PublicInputs)
 
 TEST_F(UltraHonkComposerTests, XorConstraint)
 {
-    auto circuit_builder = proof_system::UltraCircuitBuilder();
+    auto circuit_builder = bb::UltraCircuitBuilder();
 
     uint32_t left_value = engine.get_random_uint32();
     uint32_t right_value = engine.get_random_uint32();
@@ -148,7 +148,7 @@ TEST_F(UltraHonkComposerTests, XorConstraint)
 
 TEST_F(UltraHonkComposerTests, create_gates_from_plookup_accumulators)
 {
-    auto circuit_builder = proof_system::UltraCircuitBuilder();
+    auto circuit_builder = bb::UltraCircuitBuilder();
 
     bb::fr input_value = fr::random_element();
     const fr input_lo = static_cast<uint256_t>(input_value).slice(0, plookup::fixed_base::table::BITS_PER_LO_SCALAR);
@@ -215,7 +215,7 @@ TEST_F(UltraHonkComposerTests, create_gates_from_plookup_accumulators)
 
 TEST_F(UltraHonkComposerTests, test_no_lookup_proof)
 {
-    auto circuit_builder = proof_system::UltraCircuitBuilder();
+    auto circuit_builder = bb::UltraCircuitBuilder();
 
     for (size_t i = 0; i < 16; ++i) {
         for (size_t j = 0; j < 16; ++j) {
@@ -240,7 +240,7 @@ TEST_F(UltraHonkComposerTests, test_elliptic_gate)
 {
     typedef grumpkin::g1::affine_element affine_element;
     typedef grumpkin::g1::element element;
-    auto circuit_builder = proof_system::UltraCircuitBuilder();
+    auto circuit_builder = bb::UltraCircuitBuilder();
 
     affine_element p1 = affine_element::random_element();
     affine_element p2 = affine_element::random_element();
@@ -272,7 +272,7 @@ TEST_F(UltraHonkComposerTests, test_elliptic_gate)
 
 TEST_F(UltraHonkComposerTests, non_trivial_tag_permutation)
 {
-    auto circuit_builder = proof_system::UltraCircuitBuilder();
+    auto circuit_builder = bb::UltraCircuitBuilder();
     fr a = fr::random_element();
     fr b = -a;
 
@@ -300,7 +300,7 @@ TEST_F(UltraHonkComposerTests, non_trivial_tag_permutation)
 
 TEST_F(UltraHonkComposerTests, non_trivial_tag_permutation_and_cycles)
 {
-    auto circuit_builder = proof_system::UltraCircuitBuilder();
+    auto circuit_builder = bb::UltraCircuitBuilder();
     fr a = fr::random_element();
     fr c = -a;
 
@@ -339,7 +339,7 @@ TEST_F(UltraHonkComposerTests, non_trivial_tag_permutation_and_cycles)
 TEST_F(UltraHonkComposerTests, bad_tag_permutation)
 {
     {
-        auto circuit_builder = proof_system::UltraCircuitBuilder();
+        auto circuit_builder = bb::UltraCircuitBuilder();
         fr a = fr::random_element();
         fr b = -a;
 
@@ -364,7 +364,7 @@ TEST_F(UltraHonkComposerTests, bad_tag_permutation)
     }
     // Same as above but without tag creation to check reason of failure is really tag mismatch
     {
-        auto circuit_builder = proof_system::UltraCircuitBuilder();
+        auto circuit_builder = bb::UltraCircuitBuilder();
         fr a = fr::random_element();
         fr b = -a;
 
@@ -384,7 +384,7 @@ TEST_F(UltraHonkComposerTests, bad_tag_permutation)
 
 TEST_F(UltraHonkComposerTests, sort_widget)
 {
-    auto circuit_builder = proof_system::UltraCircuitBuilder();
+    auto circuit_builder = bb::UltraCircuitBuilder();
     fr a = fr::one();
     fr b = fr(2);
     fr c = fr(3);
@@ -412,7 +412,7 @@ TEST_F(UltraHonkComposerTests, sort_with_edges_gate)
     fr h = fr(8);
 
     {
-        auto circuit_builder = proof_system::UltraCircuitBuilder();
+        auto circuit_builder = bb::UltraCircuitBuilder();
         auto a_idx = circuit_builder.add_variable(a);
         auto b_idx = circuit_builder.add_variable(b);
         auto c_idx = circuit_builder.add_variable(c);
@@ -429,7 +429,7 @@ TEST_F(UltraHonkComposerTests, sort_with_edges_gate)
     }
 
     {
-        auto circuit_builder = proof_system::UltraCircuitBuilder();
+        auto circuit_builder = bb::UltraCircuitBuilder();
         auto a_idx = circuit_builder.add_variable(a);
         auto b_idx = circuit_builder.add_variable(b);
         auto c_idx = circuit_builder.add_variable(c);
@@ -445,7 +445,7 @@ TEST_F(UltraHonkComposerTests, sort_with_edges_gate)
         prove_and_verify(circuit_builder, composer, /*expected_result=*/false);
     }
     {
-        auto circuit_builder = proof_system::UltraCircuitBuilder();
+        auto circuit_builder = bb::UltraCircuitBuilder();
         auto a_idx = circuit_builder.add_variable(a);
         auto b_idx = circuit_builder.add_variable(b);
         auto c_idx = circuit_builder.add_variable(c);
@@ -461,7 +461,7 @@ TEST_F(UltraHonkComposerTests, sort_with_edges_gate)
         prove_and_verify(circuit_builder, composer, /*expected_result=*/false);
     }
     {
-        auto circuit_builder = proof_system::UltraCircuitBuilder();
+        auto circuit_builder = bb::UltraCircuitBuilder();
         auto a_idx = circuit_builder.add_variable(a);
         auto c_idx = circuit_builder.add_variable(c);
         auto d_idx = circuit_builder.add_variable(d);
@@ -477,7 +477,7 @@ TEST_F(UltraHonkComposerTests, sort_with_edges_gate)
         prove_and_verify(circuit_builder, composer, /*expected_result=*/false);
     }
     {
-        auto circuit_builder = proof_system::UltraCircuitBuilder();
+        auto circuit_builder = bb::UltraCircuitBuilder();
         auto idx = add_variables(circuit_builder, { 1,  2,  5,  6,  7,  10, 11, 13, 16, 17, 20, 22, 22, 25,
                                                     26, 29, 29, 32, 32, 33, 35, 38, 39, 39, 42, 42, 43, 45 });
         circuit_builder.create_sort_constraint_with_edges(idx, 1, 45);
@@ -486,7 +486,7 @@ TEST_F(UltraHonkComposerTests, sort_with_edges_gate)
         prove_and_verify(circuit_builder, composer, /*expected_result=*/true);
     }
     {
-        auto circuit_builder = proof_system::UltraCircuitBuilder();
+        auto circuit_builder = bb::UltraCircuitBuilder();
         auto idx = add_variables(circuit_builder, { 1,  2,  5,  6,  7,  10, 11, 13, 16, 17, 20, 22, 22, 25,
                                                     26, 29, 29, 32, 32, 33, 35, 38, 39, 39, 42, 42, 43, 45 });
         circuit_builder.create_sort_constraint_with_edges(idx, 1, 29);
@@ -499,7 +499,7 @@ TEST_F(UltraHonkComposerTests, sort_with_edges_gate)
 TEST_F(UltraHonkComposerTests, range_constraint)
 {
     {
-        auto circuit_builder = proof_system::UltraCircuitBuilder();
+        auto circuit_builder = bb::UltraCircuitBuilder();
         auto indices = add_variables(circuit_builder, { 1, 2, 3, 4, 5, 6, 7, 8 });
         for (size_t i = 0; i < indices.size(); i++) {
             circuit_builder.create_new_range_constraint(indices[i], 8);
@@ -511,7 +511,7 @@ TEST_F(UltraHonkComposerTests, range_constraint)
         prove_and_verify(circuit_builder, composer, /*expected_result=*/true);
     }
     {
-        auto circuit_builder = proof_system::UltraCircuitBuilder();
+        auto circuit_builder = bb::UltraCircuitBuilder();
         auto indices = add_variables(circuit_builder, { 3 });
         for (size_t i = 0; i < indices.size(); i++) {
             circuit_builder.create_new_range_constraint(indices[i], 3);
@@ -523,7 +523,7 @@ TEST_F(UltraHonkComposerTests, range_constraint)
         prove_and_verify(circuit_builder, composer, /*expected_result=*/true);
     }
     {
-        auto circuit_builder = proof_system::UltraCircuitBuilder();
+        auto circuit_builder = bb::UltraCircuitBuilder();
         auto indices = add_variables(circuit_builder, { 1, 2, 3, 4, 5, 6, 8, 25 });
         for (size_t i = 0; i < indices.size(); i++) {
             circuit_builder.create_new_range_constraint(indices[i], 8);
@@ -534,7 +534,7 @@ TEST_F(UltraHonkComposerTests, range_constraint)
         prove_and_verify(circuit_builder, composer, /*expected_result=*/false);
     }
     {
-        auto circuit_builder = proof_system::UltraCircuitBuilder();
+        auto circuit_builder = bb::UltraCircuitBuilder();
         auto indices =
             add_variables(circuit_builder, { 1, 2, 3, 4, 5, 6, 10, 8, 15, 11, 32, 21, 42, 79, 16, 10, 3, 26, 19, 51 });
         for (size_t i = 0; i < indices.size(); i++) {
@@ -546,7 +546,7 @@ TEST_F(UltraHonkComposerTests, range_constraint)
         prove_and_verify(circuit_builder, composer, /*expected_result=*/true);
     }
     {
-        auto circuit_builder = proof_system::UltraCircuitBuilder();
+        auto circuit_builder = bb::UltraCircuitBuilder();
         auto indices =
             add_variables(circuit_builder, { 1, 2, 3, 80, 5, 6, 29, 8, 15, 11, 32, 21, 42, 79, 16, 10, 3, 26, 13, 14 });
         for (size_t i = 0; i < indices.size(); i++) {
@@ -558,7 +558,7 @@ TEST_F(UltraHonkComposerTests, range_constraint)
         prove_and_verify(circuit_builder, composer, /*expected_result=*/false);
     }
     {
-        auto circuit_builder = proof_system::UltraCircuitBuilder();
+        auto circuit_builder = bb::UltraCircuitBuilder();
         auto indices =
             add_variables(circuit_builder, { 1, 0, 3, 80, 5, 6, 29, 8, 15, 11, 32, 21, 42, 79, 16, 10, 3, 26, 13, 14 });
         for (size_t i = 0; i < indices.size(); i++) {
@@ -573,7 +573,7 @@ TEST_F(UltraHonkComposerTests, range_constraint)
 
 TEST_F(UltraHonkComposerTests, range_with_gates)
 {
-    auto circuit_builder = proof_system::UltraCircuitBuilder();
+    auto circuit_builder = bb::UltraCircuitBuilder();
     auto idx = add_variables(circuit_builder, { 1, 2, 3, 4, 5, 6, 7, 8 });
     for (size_t i = 0; i < idx.size(); i++) {
         circuit_builder.create_new_range_constraint(idx[i], 8);
@@ -592,7 +592,7 @@ TEST_F(UltraHonkComposerTests, range_with_gates)
 
 TEST_F(UltraHonkComposerTests, range_with_gates_where_range_is_not_a_power_of_two)
 {
-    auto circuit_builder = proof_system::UltraCircuitBuilder();
+    auto circuit_builder = bb::UltraCircuitBuilder();
     auto idx = add_variables(circuit_builder, { 1, 2, 3, 4, 5, 6, 7, 8 });
     for (size_t i = 0; i < idx.size(); i++) {
         circuit_builder.create_new_range_constraint(idx[i], 12);
@@ -613,7 +613,7 @@ TEST_F(UltraHonkComposerTests, sort_widget_complex)
 {
     {
 
-        auto circuit_builder = proof_system::UltraCircuitBuilder();
+        auto circuit_builder = bb::UltraCircuitBuilder();
         std::vector<fr> a = { 1, 3, 4, 7, 7, 8, 11, 14, 15, 15, 18, 19, 21, 21, 24, 25, 26, 27, 30, 32 };
         std::vector<uint32_t> ind;
         for (size_t i = 0; i < a.size(); i++)
@@ -625,7 +625,7 @@ TEST_F(UltraHonkComposerTests, sort_widget_complex)
     }
     {
 
-        auto circuit_builder = proof_system::UltraCircuitBuilder();
+        auto circuit_builder = bb::UltraCircuitBuilder();
         std::vector<fr> a = { 1, 3, 4, 7, 7, 8, 16, 14, 15, 15, 18, 19, 21, 21, 24, 25, 26, 27, 30, 32 };
         std::vector<uint32_t> ind;
         for (size_t i = 0; i < a.size(); i++)
@@ -639,7 +639,7 @@ TEST_F(UltraHonkComposerTests, sort_widget_complex)
 
 TEST_F(UltraHonkComposerTests, sort_widget_neg)
 {
-    auto circuit_builder = proof_system::UltraCircuitBuilder();
+    auto circuit_builder = bb::UltraCircuitBuilder();
     fr a = fr::one();
     fr b = fr(2);
     fr c = fr(3);
@@ -657,7 +657,7 @@ TEST_F(UltraHonkComposerTests, sort_widget_neg)
 
 TEST_F(UltraHonkComposerTests, composed_range_constraint)
 {
-    auto circuit_builder = proof_system::UltraCircuitBuilder();
+    auto circuit_builder = bb::UltraCircuitBuilder();
     auto c = fr::random_element();
     auto d = uint256_t(c).slice(0, 133);
     auto e = fr(d);
@@ -672,7 +672,7 @@ TEST_F(UltraHonkComposerTests, composed_range_constraint)
 TEST_F(UltraHonkComposerTests, non_native_field_multiplication)
 {
     using fq = bb::fq;
-    auto circuit_builder = proof_system::UltraCircuitBuilder();
+    auto circuit_builder = bb::UltraCircuitBuilder();
 
     fq a = fq::random_element();
     fq b = fq::random_element();
@@ -716,7 +716,7 @@ TEST_F(UltraHonkComposerTests, non_native_field_multiplication)
     const auto q_indices = get_limb_witness_indices(split_into_limbs(uint256_t(q)));
     const auto r_indices = get_limb_witness_indices(split_into_limbs(uint256_t(r)));
 
-    proof_system::non_native_field_witnesses<fr> inputs{
+    bb::non_native_field_witnesses<fr> inputs{
         a_indices, b_indices, q_indices, r_indices, modulus_limbs, fr(uint256_t(modulus)),
     };
     const auto [lo_1_idx, hi_1_idx] = circuit_builder.evaluate_non_native_field_multiplication(inputs);
@@ -728,7 +728,7 @@ TEST_F(UltraHonkComposerTests, non_native_field_multiplication)
 
 TEST_F(UltraHonkComposerTests, rom)
 {
-    auto circuit_builder = proof_system::UltraCircuitBuilder();
+    auto circuit_builder = bb::UltraCircuitBuilder();
 
     uint32_t rom_values[8]{
         circuit_builder.add_variable(fr::random_element()), circuit_builder.add_variable(fr::random_element()),
@@ -770,7 +770,7 @@ TEST_F(UltraHonkComposerTests, rom)
 
 TEST_F(UltraHonkComposerTests, ram)
 {
-    auto circuit_builder = proof_system::UltraCircuitBuilder();
+    auto circuit_builder = bb::UltraCircuitBuilder();
 
     uint32_t ram_values[8]{
         circuit_builder.add_variable(fr::random_element()), circuit_builder.add_variable(fr::random_element()),
@@ -834,7 +834,7 @@ TEST_F(UltraHonkComposerTests, ram)
 
 TEST_F(UltraHonkComposerTests, range_checks_on_duplicates)
 {
-    auto circuit_builder = proof_system::UltraCircuitBuilder();
+    auto circuit_builder = bb::UltraCircuitBuilder();
 
     uint32_t a = circuit_builder.add_variable(100);
     uint32_t b = circuit_builder.add_variable(100);
@@ -874,7 +874,7 @@ TEST_F(UltraHonkComposerTests, range_checks_on_duplicates)
 // before range constraints are applied to it.
 TEST_F(UltraHonkComposerTests, range_constraint_small_variable)
 {
-    auto circuit_builder = proof_system::UltraCircuitBuilder();
+    auto circuit_builder = bb::UltraCircuitBuilder();
 
     uint16_t mask = (1 << 8) - 1;
     int a = engine.get_random_uint16() & mask;
diff --git a/barretenberg/cpp/src/barretenberg/ultra_honk/ultra_prover.cpp b/barretenberg/cpp/src/barretenberg/ultra_honk/ultra_prover.cpp
index 44b95ce6bf47..2622a247fc4e 100644
--- a/barretenberg/cpp/src/barretenberg/ultra_honk/ultra_prover.cpp
+++ b/barretenberg/cpp/src/barretenberg/ultra_honk/ultra_prover.cpp
@@ -1,7 +1,7 @@
 #include "ultra_prover.hpp"
 #include "barretenberg/sumcheck/sumcheck.hpp"
 
-namespace proof_system::honk {
+namespace bb::honk {
 
 /**
  * Create UltraProver_ from an instance.
@@ -215,4 +215,4 @@ template <UltraFlavor Flavor> plonk::proof& UltraProver_<Flavor>::construct_proo
 template class UltraProver_<honk::flavor::Ultra>;
 template class UltraProver_<honk::flavor::GoblinUltra>;
 
-} // namespace proof_system::honk
+} // namespace bb::honk
diff --git a/barretenberg/cpp/src/barretenberg/ultra_honk/ultra_prover.hpp b/barretenberg/cpp/src/barretenberg/ultra_honk/ultra_prover.hpp
index 3da6f2be8ecc..ba73af941250 100644
--- a/barretenberg/cpp/src/barretenberg/ultra_honk/ultra_prover.hpp
+++ b/barretenberg/cpp/src/barretenberg/ultra_honk/ultra_prover.hpp
@@ -8,7 +8,7 @@
 #include "barretenberg/sumcheck/sumcheck_output.hpp"
 #include "barretenberg/transcript/transcript.hpp"
 
-namespace proof_system::honk {
+namespace bb::honk {
 
 template <UltraFlavor Flavor> class UltraProver_ {
     using FF = typename Flavor::FF;
@@ -42,7 +42,7 @@ template <UltraFlavor Flavor> class UltraProver_ {
 
     std::shared_ptr<Transcript> transcript;
 
-    proof_system::RelationParameters<FF> relation_parameters;
+    bb::RelationParameters<FF> relation_parameters;
 
     CommitmentLabels commitment_labels;
 
@@ -61,4 +61,4 @@ template <UltraFlavor Flavor> class UltraProver_ {
 using UltraProver = UltraProver_<honk::flavor::Ultra>;
 using GoblinUltraProver = UltraProver_<honk::flavor::GoblinUltra>;
 
-} // namespace proof_system::honk
+} // namespace bb::honk
diff --git a/barretenberg/cpp/src/barretenberg/ultra_honk/ultra_transcript.test.cpp b/barretenberg/cpp/src/barretenberg/ultra_honk/ultra_transcript.test.cpp
index 6a4c689de2b3..2c5c6ccb1dce 100644
--- a/barretenberg/cpp/src/barretenberg/ultra_honk/ultra_transcript.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/ultra_honk/ultra_transcript.test.cpp
@@ -6,13 +6,13 @@
 #include "barretenberg/ultra_honk/ultra_composer.hpp"
 #include <gtest/gtest.h>
 
-using namespace proof_system::honk;
+using namespace bb::honk;
 
 class UltraTranscriptTests : public ::testing::Test {
   public:
     static void SetUpTestSuite() { bb::srs::init_crs_factory("../srs_db/ignition"); }
 
-    using Flavor = proof_system::honk::flavor::Ultra;
+    using Flavor = bb::honk::flavor::Ultra;
     using FF = Flavor::FF;
 
     /**
diff --git a/barretenberg/cpp/src/barretenberg/ultra_honk/ultra_verifier.cpp b/barretenberg/cpp/src/barretenberg/ultra_honk/ultra_verifier.cpp
index 3ed94a016070..36c25477e4c4 100644
--- a/barretenberg/cpp/src/barretenberg/ultra_honk/ultra_verifier.cpp
+++ b/barretenberg/cpp/src/barretenberg/ultra_honk/ultra_verifier.cpp
@@ -4,9 +4,9 @@
 #include "barretenberg/transcript/transcript.hpp"
 
 using namespace bb;
-using namespace proof_system::honk::sumcheck;
+using namespace bb::honk::sumcheck;
 
-namespace proof_system::honk {
+namespace bb::honk {
 template <typename Flavor>
 UltraVerifier_<Flavor>::UltraVerifier_(const std::shared_ptr<Transcript>& transcript,
                                        const std::shared_ptr<VerificationKey>& verifier_key)
@@ -54,7 +54,7 @@ template <typename Flavor> bool UltraVerifier_<Flavor>::verify_proof(const plonk
     using VerifierCommitments = typename Flavor::VerifierCommitments;
     using CommitmentLabels = typename Flavor::CommitmentLabels;
 
-    proof_system::RelationParameters<FF> relation_parameters;
+    bb::RelationParameters<FF> relation_parameters;
 
     transcript = std::make_shared<Transcript>(proof.proof_data);
 
@@ -166,4 +166,4 @@ template <typename Flavor> bool UltraVerifier_<Flavor>::verify_proof(const plonk
 template class UltraVerifier_<honk::flavor::Ultra>;
 template class UltraVerifier_<honk::flavor::GoblinUltra>;
 
-} // namespace proof_system::honk
+} // namespace bb::honk
diff --git a/barretenberg/cpp/src/barretenberg/ultra_honk/ultra_verifier.hpp b/barretenberg/cpp/src/barretenberg/ultra_honk/ultra_verifier.hpp
index 4b8812ff00fa..77a770a8f930 100644
--- a/barretenberg/cpp/src/barretenberg/ultra_honk/ultra_verifier.hpp
+++ b/barretenberg/cpp/src/barretenberg/ultra_honk/ultra_verifier.hpp
@@ -5,7 +5,7 @@
 #include "barretenberg/srs/global_crs.hpp"
 #include "barretenberg/sumcheck/sumcheck.hpp"
 
-namespace proof_system::honk {
+namespace bb::honk {
 template <typename Flavor> class UltraVerifier_ {
     using FF = typename Flavor::FF;
     using Commitment = typename Flavor::Commitment;
@@ -35,4 +35,4 @@ template <typename Flavor> class UltraVerifier_ {
 using UltraVerifier = UltraVerifier_<honk::flavor::Ultra>;
 using GoblinUltraVerifier = UltraVerifier_<honk::flavor::GoblinUltra>;
 
-} // namespace proof_system::honk
+} // namespace bb::honk
diff --git a/barretenberg/cpp/src/barretenberg/vm/avm_trace/AvmMini_common.hpp b/barretenberg/cpp/src/barretenberg/vm/avm_trace/AvmMini_common.hpp
index 8d18b0a354b6..8588b632b87c 100644
--- a/barretenberg/cpp/src/barretenberg/vm/avm_trace/AvmMini_common.hpp
+++ b/barretenberg/cpp/src/barretenberg/vm/avm_trace/AvmMini_common.hpp
@@ -3,9 +3,9 @@
 #include "barretenberg/proof_system/circuit_builder/circuit_builder_base.hpp"
 #include "barretenberg/proof_system/circuit_builder/generated/AvmMini_circuit_builder.hpp"
 
-using Flavor = proof_system::honk::flavor::AvmMiniFlavor;
+using Flavor = bb::honk::flavor::AvmMiniFlavor;
 using FF = Flavor::FF;
-using Row = proof_system::AvmMiniFullRow<bb::fr>;
+using Row = bb::AvmMiniFullRow<bb::fr>;
 
 namespace avm_trace {
 
diff --git a/barretenberg/cpp/src/barretenberg/vm/generated/AvmMini_composer.cpp b/barretenberg/cpp/src/barretenberg/vm/generated/AvmMini_composer.cpp
index 3493608cf754..a948d5a2a458 100644
--- a/barretenberg/cpp/src/barretenberg/vm/generated/AvmMini_composer.cpp
+++ b/barretenberg/cpp/src/barretenberg/vm/generated/AvmMini_composer.cpp
@@ -6,7 +6,7 @@
 #include "barretenberg/proof_system/composer/permutation_lib.hpp"
 #include "barretenberg/vm/generated/AvmMini_verifier.hpp"
 
-namespace proof_system::honk {
+namespace bb::honk {
 
 using Flavor = honk::flavor::AvmMiniFlavor;
 void AvmMiniComposer::compute_witness(CircuitConstructor& circuit)
@@ -83,4 +83,4 @@ std::shared_ptr<Flavor::VerificationKey> AvmMiniComposer::compute_verification_k
     return verification_key;
 }
 
-} // namespace proof_system::honk
+} // namespace bb::honk
diff --git a/barretenberg/cpp/src/barretenberg/vm/generated/AvmMini_composer.hpp b/barretenberg/cpp/src/barretenberg/vm/generated/AvmMini_composer.hpp
index ccb2c16fbc15..17299dff8e7c 100644
--- a/barretenberg/cpp/src/barretenberg/vm/generated/AvmMini_composer.hpp
+++ b/barretenberg/cpp/src/barretenberg/vm/generated/AvmMini_composer.hpp
@@ -8,7 +8,7 @@
 #include "barretenberg/vm/generated/AvmMini_prover.hpp"
 #include "barretenberg/vm/generated/AvmMini_verifier.hpp"
 
-namespace proof_system::honk {
+namespace bb::honk {
 class AvmMiniComposer {
   public:
     using Flavor = honk::flavor::AvmMiniFlavor;
@@ -66,4 +66,4 @@ class AvmMiniComposer {
     };
 };
 
-} // namespace proof_system::honk
+} // namespace bb::honk
diff --git a/barretenberg/cpp/src/barretenberg/vm/generated/AvmMini_prover.cpp b/barretenberg/cpp/src/barretenberg/vm/generated/AvmMini_prover.cpp
index a4931f5cf900..aec530be7578 100644
--- a/barretenberg/cpp/src/barretenberg/vm/generated/AvmMini_prover.cpp
+++ b/barretenberg/cpp/src/barretenberg/vm/generated/AvmMini_prover.cpp
@@ -11,7 +11,7 @@
 #include "barretenberg/relations/permutation_relation.hpp"
 #include "barretenberg/sumcheck/sumcheck.hpp"
 
-namespace proof_system::honk {
+namespace bb::honk {
 
 using Flavor = honk::flavor::AvmMiniFlavor;
 
@@ -29,13 +29,12 @@ AvmMiniProver::AvmMiniProver(std::shared_ptr<Flavor::ProvingKey> input_key,
     , commitment_key(commitment_key)
 {
     for (auto [prover_poly, key_poly] : zip_view(prover_polynomials.get_unshifted(), key->get_all())) {
-        ASSERT(proof_system::flavor_get_label(prover_polynomials, prover_poly) ==
-               proof_system::flavor_get_label(*key, key_poly));
+        ASSERT(bb::flavor_get_label(prover_polynomials, prover_poly) == bb::flavor_get_label(*key, key_poly));
         prover_poly = key_poly.share();
     }
     for (auto [prover_poly, key_poly] : zip_view(prover_polynomials.get_shifted(), key->get_to_be_shifted())) {
-        ASSERT(proof_system::flavor_get_label(prover_polynomials, prover_poly) ==
-               proof_system::flavor_get_label(*key, key_poly) + "_shift");
+        ASSERT(bb::flavor_get_label(prover_polynomials, prover_poly) ==
+               bb::flavor_get_label(*key, key_poly) + "_shift");
         prover_poly = key_poly.shifted();
     }
 }
@@ -130,4 +129,4 @@ plonk::proof& AvmMiniProver::construct_proof()
     return export_proof();
 }
 
-} // namespace proof_system::honk
+} // namespace bb::honk
diff --git a/barretenberg/cpp/src/barretenberg/vm/generated/AvmMini_prover.hpp b/barretenberg/cpp/src/barretenberg/vm/generated/AvmMini_prover.hpp
index 4a08b1fb8fa1..42b89a228f2b 100644
--- a/barretenberg/cpp/src/barretenberg/vm/generated/AvmMini_prover.hpp
+++ b/barretenberg/cpp/src/barretenberg/vm/generated/AvmMini_prover.hpp
@@ -8,7 +8,7 @@
 #include "barretenberg/sumcheck/sumcheck_output.hpp"
 #include "barretenberg/transcript/transcript.hpp"
 
-namespace proof_system::honk {
+namespace bb::honk {
 
 class AvmMiniProver {
 
@@ -38,7 +38,7 @@ class AvmMiniProver {
 
     std::vector<FF> public_inputs;
 
-    proof_system::RelationParameters<FF> relation_parameters;
+    bb::RelationParameters<FF> relation_parameters;
 
     std::shared_ptr<ProvingKey> key;
 
@@ -59,4 +59,4 @@ class AvmMiniProver {
     plonk::proof proof;
 };
 
-} // namespace proof_system::honk
+} // namespace bb::honk
diff --git a/barretenberg/cpp/src/barretenberg/vm/generated/AvmMini_verifier.cpp b/barretenberg/cpp/src/barretenberg/vm/generated/AvmMini_verifier.cpp
index 8a3d126e37e6..2da2112a9b38 100644
--- a/barretenberg/cpp/src/barretenberg/vm/generated/AvmMini_verifier.cpp
+++ b/barretenberg/cpp/src/barretenberg/vm/generated/AvmMini_verifier.cpp
@@ -6,9 +6,9 @@
 #include "barretenberg/transcript/transcript.hpp"
 
 using namespace bb;
-using namespace proof_system::honk::sumcheck;
+using namespace bb::honk::sumcheck;
 
-namespace proof_system::honk {
+namespace bb::honk {
 AvmMiniVerifier::AvmMiniVerifier(std::shared_ptr<Flavor::VerificationKey> verifier_key)
     : key(verifier_key)
 {}
@@ -147,4 +147,4 @@ bool AvmMiniVerifier::verify_proof(const plonk::proof& proof)
     return sumcheck_verified.value();
 }
 
-} // namespace proof_system::honk
+} // namespace bb::honk
diff --git a/barretenberg/cpp/src/barretenberg/vm/generated/AvmMini_verifier.hpp b/barretenberg/cpp/src/barretenberg/vm/generated/AvmMini_verifier.hpp
index 55f30477f6e8..31b04749640f 100644
--- a/barretenberg/cpp/src/barretenberg/vm/generated/AvmMini_verifier.hpp
+++ b/barretenberg/cpp/src/barretenberg/vm/generated/AvmMini_verifier.hpp
@@ -5,7 +5,7 @@
 #include "barretenberg/plonk/proof_system/types/proof.hpp"
 #include "barretenberg/sumcheck/sumcheck.hpp"
 
-namespace proof_system::honk {
+namespace bb::honk {
 class AvmMiniVerifier {
     using Flavor = honk::flavor::AvmMiniFlavor;
     using FF = Flavor::FF;
@@ -30,4 +30,4 @@ class AvmMiniVerifier {
     std::shared_ptr<Transcript> transcript;
 };
 
-} // namespace proof_system::honk
+} // namespace bb::honk
diff --git a/barretenberg/cpp/src/barretenberg/vm/generated/Toy_composer.cpp b/barretenberg/cpp/src/barretenberg/vm/generated/Toy_composer.cpp
index c74903fb6353..3f311d163111 100644
--- a/barretenberg/cpp/src/barretenberg/vm/generated/Toy_composer.cpp
+++ b/barretenberg/cpp/src/barretenberg/vm/generated/Toy_composer.cpp
@@ -6,7 +6,7 @@
 #include "barretenberg/proof_system/composer/permutation_lib.hpp"
 #include "barretenberg/vm/generated/Toy_verifier.hpp"
 
-namespace proof_system::honk {
+namespace bb::honk {
 
 using Flavor = honk::flavor::ToyFlavor;
 void ToyComposer::compute_witness(CircuitConstructor& circuit)
@@ -82,4 +82,4 @@ std::shared_ptr<Flavor::VerificationKey> ToyComposer::compute_verification_key(C
     return verification_key;
 }
 
-} // namespace proof_system::honk
+} // namespace bb::honk
diff --git a/barretenberg/cpp/src/barretenberg/vm/generated/Toy_composer.hpp b/barretenberg/cpp/src/barretenberg/vm/generated/Toy_composer.hpp
index 5c6cb4535088..8cbbda8b7123 100644
--- a/barretenberg/cpp/src/barretenberg/vm/generated/Toy_composer.hpp
+++ b/barretenberg/cpp/src/barretenberg/vm/generated/Toy_composer.hpp
@@ -8,7 +8,7 @@
 #include "barretenberg/vm/generated/Toy_prover.hpp"
 #include "barretenberg/vm/generated/Toy_verifier.hpp"
 
-namespace proof_system::honk {
+namespace bb::honk {
 class ToyComposer {
   public:
     using Flavor = honk::flavor::ToyFlavor;
@@ -66,4 +66,4 @@ class ToyComposer {
     };
 };
 
-} // namespace proof_system::honk
+} // namespace bb::honk
diff --git a/barretenberg/cpp/src/barretenberg/vm/generated/Toy_prover.cpp b/barretenberg/cpp/src/barretenberg/vm/generated/Toy_prover.cpp
index 9a210d2c7ede..df3c11482164 100644
--- a/barretenberg/cpp/src/barretenberg/vm/generated/Toy_prover.cpp
+++ b/barretenberg/cpp/src/barretenberg/vm/generated/Toy_prover.cpp
@@ -11,7 +11,7 @@
 #include "barretenberg/relations/permutation_relation.hpp"
 #include "barretenberg/sumcheck/sumcheck.hpp"
 
-namespace proof_system::honk {
+namespace bb::honk {
 
 using Flavor = honk::flavor::ToyFlavor;
 
@@ -28,13 +28,12 @@ ToyProver::ToyProver(std::shared_ptr<Flavor::ProvingKey> input_key, std::shared_
     , commitment_key(commitment_key)
 {
     for (auto [prover_poly, key_poly] : zip_view(prover_polynomials.get_unshifted(), key->get_all())) {
-        ASSERT(proof_system::flavor_get_label(prover_polynomials, prover_poly) ==
-               proof_system::flavor_get_label(*key, key_poly));
+        ASSERT(bb::flavor_get_label(prover_polynomials, prover_poly) == bb::flavor_get_label(*key, key_poly));
         prover_poly = key_poly.share();
     }
     for (auto [prover_poly, key_poly] : zip_view(prover_polynomials.get_shifted(), key->get_to_be_shifted())) {
-        ASSERT(proof_system::flavor_get_label(prover_polynomials, prover_poly) ==
-               proof_system::flavor_get_label(*key, key_poly) + "_shift");
+        ASSERT(bb::flavor_get_label(prover_polynomials, prover_poly) ==
+               bb::flavor_get_label(*key, key_poly) + "_shift");
         prover_poly = key_poly.shifted();
     }
 }
@@ -128,4 +127,4 @@ plonk::proof& ToyProver::construct_proof()
     return export_proof();
 }
 
-} // namespace proof_system::honk
+} // namespace bb::honk
diff --git a/barretenberg/cpp/src/barretenberg/vm/generated/Toy_prover.hpp b/barretenberg/cpp/src/barretenberg/vm/generated/Toy_prover.hpp
index bfd4db05ba6b..292c29f5d500 100644
--- a/barretenberg/cpp/src/barretenberg/vm/generated/Toy_prover.hpp
+++ b/barretenberg/cpp/src/barretenberg/vm/generated/Toy_prover.hpp
@@ -8,7 +8,7 @@
 #include "barretenberg/sumcheck/sumcheck_output.hpp"
 #include "barretenberg/transcript/transcript.hpp"
 
-namespace proof_system::honk {
+namespace bb::honk {
 
 class ToyProver {
 
@@ -38,7 +38,7 @@ class ToyProver {
 
     std::vector<FF> public_inputs;
 
-    proof_system::RelationParameters<FF> relation_parameters;
+    bb::RelationParameters<FF> relation_parameters;
 
     std::shared_ptr<ProvingKey> key;
 
@@ -59,4 +59,4 @@ class ToyProver {
     plonk::proof proof;
 };
 
-} // namespace proof_system::honk
+} // namespace bb::honk
diff --git a/barretenberg/cpp/src/barretenberg/vm/generated/Toy_verifier.cpp b/barretenberg/cpp/src/barretenberg/vm/generated/Toy_verifier.cpp
index 65b389eaede3..f2711e8316e5 100644
--- a/barretenberg/cpp/src/barretenberg/vm/generated/Toy_verifier.cpp
+++ b/barretenberg/cpp/src/barretenberg/vm/generated/Toy_verifier.cpp
@@ -6,9 +6,9 @@
 #include "barretenberg/transcript/transcript.hpp"
 
 using namespace bb;
-using namespace proof_system::honk::sumcheck;
+using namespace bb::honk::sumcheck;
 
-namespace proof_system::honk {
+namespace bb::honk {
 ToyVerifier::ToyVerifier(std::shared_ptr<Flavor::VerificationKey> verifier_key)
     : key(verifier_key)
 {}
@@ -113,4 +113,4 @@ bool ToyVerifier::verify_proof(const plonk::proof& proof)
     return sumcheck_verified.value();
 }
 
-} // namespace proof_system::honk
+} // namespace bb::honk
diff --git a/barretenberg/cpp/src/barretenberg/vm/generated/Toy_verifier.hpp b/barretenberg/cpp/src/barretenberg/vm/generated/Toy_verifier.hpp
index 30b5e78e5c83..f69e6996f709 100644
--- a/barretenberg/cpp/src/barretenberg/vm/generated/Toy_verifier.hpp
+++ b/barretenberg/cpp/src/barretenberg/vm/generated/Toy_verifier.hpp
@@ -5,7 +5,7 @@
 #include "barretenberg/plonk/proof_system/types/proof.hpp"
 #include "barretenberg/sumcheck/sumcheck.hpp"
 
-namespace proof_system::honk {
+namespace bb::honk {
 class ToyVerifier {
     using Flavor = honk::flavor::ToyFlavor;
     using FF = Flavor::FF;
@@ -30,4 +30,4 @@ class ToyVerifier {
     std::shared_ptr<Transcript> transcript;
 };
 
-} // namespace proof_system::honk
+} // namespace bb::honk
diff --git a/barretenberg/cpp/src/barretenberg/vm/tests/helpers.test.cpp b/barretenberg/cpp/src/barretenberg/vm/tests/helpers.test.cpp
index 2a761b69a471..8257b93eec89 100644
--- a/barretenberg/cpp/src/barretenberg/vm/tests/helpers.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/vm/tests/helpers.test.cpp
@@ -15,12 +15,12 @@ using namespace avm_trace;
  */
 void validate_trace_proof(std::vector<Row>&& trace)
 {
-    auto circuit_builder = proof_system::AvmMiniCircuitBuilder();
+    auto circuit_builder = bb::AvmMiniCircuitBuilder();
     circuit_builder.set_trace(std::move(trace));
 
     EXPECT_TRUE(circuit_builder.check_circuit());
 
-    auto composer = proof_system::honk::AvmMiniComposer();
+    auto composer = bb::honk::AvmMiniComposer();
     auto prover = composer.create_prover(circuit_builder);
     auto proof = prover.construct_proof();
 
diff --git a/build_manifest.yml b/build_manifest.yml
index 8924d81aa80e..ea8880f74d07 100644
--- a/build_manifest.yml
+++ b/build_manifest.yml
@@ -201,7 +201,6 @@ docs:
     - ^.*.hpp$
     - ^.*.ts$
     - ^.release-please-manifest.json$
-    - ^.*/noir-version.json$
     - ^.*.nr$
   dependencies:
     - yarn-project
diff --git a/docs/README.md b/docs/README.md
index d07cc7f39814..f1fae6d86ce5 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -133,14 +133,3 @@ Alternatively, you can also use the `AztecPackagesVersion()` js function, which
 import { AztecPackagesVersion } from "@site/src/components/Version";
 <>{AztecPackagesVersion()}</>
 ```
-
- ### `#include_noir_version`
-
-This macros will be replaced inline with the required nargo version, which is `0.11.1-aztec.0` at the time of these writing. This value is sourced from `yarn-project/noir-compiler/src/noir-version.json`.
-
-Alternatively, you can also use the `NoirVersion()` js function, which you need to import explicitly:
-
-```
-import { NoirVersion } from "@site/src/components/Version";
-<>{NoirVersion()}</>
-```
diff --git a/docs/docs/dev_docs/cli/cli-commands.md b/docs/docs/dev_docs/cli/cli-commands.md
index 922cc5124470..080dd071ab5b 100644
--- a/docs/docs/dev_docs/cli/cli-commands.md
+++ b/docs/docs/dev_docs/cli/cli-commands.md
@@ -13,28 +13,6 @@ Here you will find a reference to the commands available in the Aztec CLI.
 
 The CLI will be installed automatically via Docker by running the command to install and start the sandbox, [instructions here](./sandbox-reference.md#with-docker).
 
-:::info
-
-The `@aztec/aztec-sandbox` and `@aztec/cli` packages published to npm **should not be used**, in favor of Docker. If you've installed the sandbox or the CLI via NPM, **uninstall** them and remove them from your project dependencies and [install via Docker](./sandbox-reference.md#with-docker).
-
-<Tabs>
-  <TabItem value="yarn" label="yarn" default>
-    
-<code>
-yarn global remove @aztec/aztec-sandbox @aztec/cli
-</code>
-
-  </TabItem>
-  <TabItem value="npm" label="npm">
-
-<code>
-npm -g uninstall @aztec/aztec-sandbox @aztec/cli
-</code>
-
-   </TabItem>
-</Tabs>
-:::
-
 ## Update
 
 The CLI comes with an update command.
diff --git a/docs/docs/dev_docs/contracts/layout.md b/docs/docs/dev_docs/contracts/layout.md
index d1fa4a7254a3..084a3a9c1fcf 100644
--- a/docs/docs/dev_docs/contracts/layout.md
+++ b/docs/docs/dev_docs/contracts/layout.md
@@ -20,7 +20,7 @@ contract MyContract {
 }
 ```
 :::info A note for vanilla Noir devs
-There is no [`main()`](https://noir-lang.org/docs/getting_started/breakdown/#mainnr) function within a Noir `contract` scope. More than one function can be an entrypoint.
+There is no [`main()`](https://noir-lang.org/docs/getting_started/project_breakdown/#mainnr) function within a Noir `contract` scope. More than one function can be an entrypoint.
 :::
 
 ## Directory structure
@@ -34,5 +34,5 @@ Here's a common layout for a basic Aztec.nr Contract project:
        └── Nargo.toml          <-- package and dependency management
 ```
 
-- See the vanilla Noir docs for [more info on packages](https://noir-lang.org/docs/modules_packages_crates/crates_and_packages).
+- See the vanilla Noir docs for [more info on packages](https://noir-lang.org/docs/noir/modules_packages_crates/crates_and_packages).
 - You can review the structure of a complete contract in the token contract tutorial [here](../tutorials/writing_token_contract.md).
diff --git a/docs/docs/dev_docs/contracts/main.md b/docs/docs/dev_docs/contracts/main.md
index d95211b3cd8f..40f7a53af9d8 100644
--- a/docs/docs/dev_docs/contracts/main.md
+++ b/docs/docs/dev_docs/contracts/main.md
@@ -20,19 +20,23 @@ An **Aztec smart contract** is a smart contract with **private** state variables
 
 ## Install aztec-nargo
 
-To write an Aztec.nr contract, you need to write Noir, `aztec-nargo` comes with a built-in compiler for Aztec contracts written in Noir. See install instructions [here](../cli/sandbox-reference.md).
+To write an Aztec.nr contract, you need to the compiler, `aztec-nargo` which is installed when you install the sandbox. See install instructions [here](../cli/sandbox-reference.md).
 
 :::info
 For those coming from vanilla Noir, the version used for aztec.nr is tracked separately to nargo for vanilla Noir. Be sure to use `aztec-nargo` to compile your contracts.
 :::
 
-## Install `nargo` (recommended)
+## Install Noir LSP (recommended)
 
-`aztec-nargo` comes with the Noir compiler, so installing `nargo` is not required, however it is recommended as it provides a better developer experience for writing contracts. You will need nargo installed to take advantage of the [Noir Language Server](https://noir-lang.org/docs/nargo/language_server), which provides syntax highlighting and formatting for your Aztec contracts.
+Install the [Noir Language Support extension](https://marketplace.visualstudio.com/items?itemName=noir-lang.vscode-noir) to get syntax highlighting, syntax error detection and go-to definitions for your Aztec contracts.
 
-You can install `nargo` with the following commands:
+Once the extension is installed, go to your VSCode settings, search for "noir" and update the `Noir: Nargo Path` field to point to your `aztec-nargo` executable.
 
-<InstallNargoInstructions />
+You can print the path of your `aztec-nargo` executable by running:
+
+```bash
+which aztec-nargo
+```
 
 ## Install Noir tooling
 
diff --git a/docs/docs/dev_docs/contracts/syntax/functions.md b/docs/docs/dev_docs/contracts/syntax/functions.md
index 4a2cfdf753ff..aa1edecb35f7 100644
--- a/docs/docs/dev_docs/contracts/syntax/functions.md
+++ b/docs/docs/dev_docs/contracts/syntax/functions.md
@@ -81,7 +81,7 @@ As alluded to earlier, a private function operates on private information, and i
 
 ## `unconstrained` functions
 
-Unconstrained functions are an underlying part of Noir - a deeper explanation can be found [here](https://noir-lang.org/docs/language_concepts/unconstrained). But in short, they are functions which are not directly constrained and therefore should be seen as untrusted! That they are untrusted means that, for security, the developer must make sure to constrain them when used!
+Unconstrained functions are an underlying part of Noir - a deeper explanation can be found [here](https://noir-lang.org/docs/noir/syntax/unconstrained). But in short, they are functions which are not directly constrained and therefore should be seen as untrusted! That they are untrusted means that, for security, the developer must make sure to constrain them when used!
 
 Beyond using them inside your other functions, they are convenient for providing an interface that reads storage, applies logic and returns values to a UI or test. Below is a snippet from exposing the `balance_of_private` function from a token implementation, which allows a user to easily read their balance, similar to the `balanceOf` function in the ERC20 standard.
 
diff --git a/docs/docs/dev_docs/contracts/syntax/main.md b/docs/docs/dev_docs/contracts/syntax/main.md
index cf30952f2902..7157b46764c8 100644
--- a/docs/docs/dev_docs/contracts/syntax/main.md
+++ b/docs/docs/dev_docs/contracts/syntax/main.md
@@ -5,7 +5,7 @@ import { AztecPackagesVersion } from "@site/src/components/Version";
 
 [Noir](https://noir-lang.org/) is a language which is agnostic to proof systems and use cases. Rather than baking Aztec-specific keywords and smart contract types directly into Noir (which would break this agnosticism), we have developed a framework -- written in Noir -- whose types and methods provide rich smart contract semantics.
 
-On top of [Noir's stdlib](https://noir-lang.org/docs/standard_library/cryptographic_primitives/), we provide [Aztec.nr](https://github.com/AztecProtocol/aztec-packages/tree/master/yarn-project/aztec-nr) for writing contracts on Aztec.
+On top of [Noir's stdlib](https://noir-lang.org/docs/noir/standard_library/cryptographic_primitives), we provide [Aztec.nr](https://github.com/AztecProtocol/aztec-packages/tree/master/yarn-project/aztec-nr) for writing contracts on Aztec.
 
 Aztec.nr contains abstractions which remove the need to understand the low-level Aztec protocol. Notably, it provides:
 
diff --git a/docs/docs/dev_docs/contracts/workflow.md b/docs/docs/dev_docs/contracts/workflow.md
index 60c6ab024615..bfce487749d4 100644
--- a/docs/docs/dev_docs/contracts/workflow.md
+++ b/docs/docs/dev_docs/contracts/workflow.md
@@ -15,7 +15,7 @@ title: Contract Workflow
 
 ## Unit Tests
 
-[Test individual noir functions](https://noir-lang.org/docs/nargo/testing).
+[Test individual noir functions](https://noir-lang.org/docs/getting_started/tooling/testing).
 
 ## Deploy
 
diff --git a/docs/docs/dev_docs/debugging/aztecnr-errors.md b/docs/docs/dev_docs/debugging/aztecnr-errors.md
index 91f2c103f07d..5d7e14aea2a7 100644
--- a/docs/docs/dev_docs/debugging/aztecnr-errors.md
+++ b/docs/docs/dev_docs/debugging/aztecnr-errors.md
@@ -59,7 +59,7 @@ To execute a transaction, the PXE needs to know the complete address of a contra
 
 To address the error, add the contract to the PXE by calling [`pxe.addContracts(...)`](../../apis/pxe/interfaces/PXE#addcontracts).
 
-`Simulation error: No public key registered for address 0x0. Register it by calling pxe.registerRecipient(...) or pxe.registerAccount(...)`
+#### `Simulation error: No public key registered for address 0x0. Register it by calling pxe.registerRecipient(...) or pxe.registerAccount(...)`
 
 This error occurs when your contract is trying to get a public key via the `get_public_key` oracle call, but the PXE does not have the Complete Address (Complete Address contains the public key).
 
diff --git a/docs/docs/dev_docs/getting_started/aztecjs-getting-started.md b/docs/docs/dev_docs/getting_started/aztecjs-getting-started.md
index db038a695925..637da709e60e 100644
--- a/docs/docs/dev_docs/getting_started/aztecjs-getting-started.md
+++ b/docs/docs/dev_docs/getting_started/aztecjs-getting-started.md
@@ -122,7 +122,6 @@ A successful run should show something like this:
 ```
   token Aztec Sandbox Info  {
   token   sandboxVersion: '#include_aztec_short_version',
-  token   compatibleNargoVersion: '#include_noir_version',
   token   chainId: 31337,
   token   protocolVersion: 1,
   token   l1ContractAddresses: {
@@ -140,9 +139,6 @@ A successful run should show something like this:
   token     },
   token     contractDeploymentEmitterAddress: EthAddress {
   token       buffer: <Buffer 5f c8 d3 26 90 cc 91 d4 c3 9d 9d 3a bc bd 16 98 9f 87 57 07>
-  token     },
-  token     decoderHelperAddress: EthAddress {
-  token       buffer: <Buffer 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00>
   token     }
   token   }
   token } +0ms
@@ -171,7 +167,6 @@ Now that we have our accounts loaded, let's move on to deploy our pre-compiled t
 ```
   token Aztec Sandbox Info  {
   token   sandboxVersion: '#include_aztec_short_version',
-  token   compatibleNargoVersion: '#include_noir_version',
   token   chainId: 31337,
   token   protocolVersion: 1,
   token   l1ContractAddresses: {
@@ -189,9 +184,6 @@ Now that we have our accounts loaded, let's move on to deploy our pre-compiled t
   token     },
   token     contractDeploymentEmitterAddress: EthAddress {
   token       buffer: <Buffer 5f c8 d3 26 90 cc 91 d4 c3 9d 9d 3a bc bd 16 98 9f 87 57 07>
-  token     },
-  token     decoderHelperAddress: EthAddress {
-  token       buffer: <Buffer 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00>
   token     }
   token   }
   token } +0ms
@@ -226,7 +218,6 @@ Running now should yield output:
 ```
   token Aztec Sandbox Info  {
   token   sandboxVersion: '#include_aztec_short_version',
-  token   compatibleNargoVersion: '#include_noir_version',
   token   chainId: 31337,
   token   protocolVersion: 1,
   token   l1ContractAddresses: {
@@ -244,9 +235,6 @@ Running now should yield output:
   token     },
   token     contractDeploymentEmitterAddress: EthAddress {
   token       buffer: <Buffer 5f c8 d3 26 90 cc 91 d4 c3 9d 9d 3a bc bd 16 98 9f 87 57 07>
-  token     },
-  token     decoderHelperAddress: EthAddress {
-  token       buffer: <Buffer 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00>
   token     }
   token   }
   token } +0ms
@@ -291,7 +279,6 @@ Our output should now look like this:
 ```
   token Aztec Sandbox Info  {
   token   sandboxVersion: '#include_aztec_short_version',
-  token   compatibleNargoVersion: '#include_noir_version',
   token   chainId: 31337,
   token   protocolVersion: 1,
   token   l1ContractAddresses: {
@@ -309,9 +296,6 @@ Our output should now look like this:
   token     },
   token     contractDeploymentEmitterAddress: EthAddress {
   token       buffer: <Buffer 5f c8 d3 26 90 cc 91 d4 c3 9d 9d 3a bc bd 16 98 9f 87 57 07>
-  token     },
-  token     decoderHelperAddress: EthAddress {
-  token       buffer: <Buffer 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00>
   token     }
   token   }
   token } +0ms
@@ -351,7 +335,6 @@ Our complete output should now be something like:
 ```
   token Aztec Sandbox Info  {
   token   sandboxVersion: '#include_aztec_short_version',
-  token   compatibleNargoVersion: '#include_noir_version',
   token   chainId: 31337,
   token   protocolVersion: 1,
   token   l1ContractAddresses: {
@@ -369,9 +352,6 @@ Our complete output should now be something like:
   token     },
   token     contractDeploymentEmitterAddress: EthAddress {
   token       buffer: <Buffer 5f c8 d3 26 90 cc 91 d4 c3 9d 9d 3a bc bd 16 98 9f 87 57 07>
-  token     },
-  token     decoderHelperAddress: EthAddress {
-  token       buffer: <Buffer 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00>
   token     }
   token   }
   token } +0ms
diff --git a/docs/docs/dev_docs/getting_started/aztecnr-getting-started.md b/docs/docs/dev_docs/getting_started/aztecnr-getting-started.md
index 954d60ff2b1c..27357e5640e6 100644
--- a/docs/docs/dev_docs/getting_started/aztecnr-getting-started.md
+++ b/docs/docs/dev_docs/getting_started/aztecnr-getting-started.md
@@ -205,15 +205,17 @@ You can also test the functions by applying what you learned in the [quickstart]
 
 Congratulations, you have now written, compiled, and deployed your first Aztec.nr smart contract!
 
-## Install `nargo` (recommended)
+## Install Noir LSP (recommended)
 
-The CLI comes with the Noir compiler, so installing `nargo` is not required, however it is recommended as it provides a better developer experience for writing contracts. You will need nargo installed to take advantage of the [Noir Language Server](https://noir-lang.org/docs/nargo/language_server), which provides syntax highlighting and formatting for your Aztec contracts.
+Install the [Noir Language Support extension](https://marketplace.visualstudio.com/items?itemName=noir-lang.vscode-noir) to get syntax highlighting, syntax error detection and go-to definitions for your Aztec contracts.
 
-You will also need `nargo` if you want to run unit tests in Noir.
+Once the extension is installed, go to your VSCode settings, search for "noir" and update the `Noir: Nargo Path` field to point to your `aztec-nargo` executable.
 
-You can install `nargo` with the following commands:
+You can print the path of your `aztec-nargo` executable by running:
 
-<InstallNargoInstructions />
+```bash
+which aztec-nargo
+```
 
 ## What's next?
 
diff --git a/docs/docs/dev_docs/tutorials/writing_dapp/contract_deployment.md b/docs/docs/dev_docs/tutorials/writing_dapp/contract_deployment.md
index 7459287af518..10906728034d 100644
--- a/docs/docs/dev_docs/tutorials/writing_dapp/contract_deployment.md
+++ b/docs/docs/dev_docs/tutorials/writing_dapp/contract_deployment.md
@@ -3,7 +3,7 @@
 To add contracts to your application, we'll start by creating a new `aztec-nargo` project. We'll then compile the contracts, and write a simple script to deploy them to our Sandbox.
 
 :::info
-Follow the instructions [here](../../contracts/setup.md) to install `nargo` if you haven't done so already.
+Follow the instructions [here](../../cli/sandbox-reference.md) to install `aztec-nargo` if you haven't done so already.
 :::
 
 ## Initialize Aztec project
diff --git a/docs/docs/dev_docs/updating.md b/docs/docs/dev_docs/updating.md
index 690f3fe27e2d..e9f0b54abcc7 100644
--- a/docs/docs/dev_docs/updating.md
+++ b/docs/docs/dev_docs/updating.md
@@ -2,34 +2,12 @@
 title: Updating
 ---
 
-:::info
-The `@aztec/aztec-sandbox` and `@aztec/cli` packages published to npm **should not be used**, in favor of Docker. If you've installed the sandbox or the CLI via NPM, **uninstall** them and remove them from your project dependencies and [install via Docker](./cli/sandbox-reference.md#with-docker).
-
-<Tabs>
-  <TabItem value="yarn" label="yarn" default>
-    
-<code>
-yarn global remove @aztec/aztec-sandbox @aztec/cli
-</code>
-
-  </TabItem>
-  <TabItem value="npm" label="npm">
-
-<code>
-npm -g uninstall @aztec/aztec-sandbox @aztec/cli
-</code>
-
-   </TabItem>
-</Tabs>
-
-:::
-
 ## TL;DR
 
 1. Updating the sandbox and CLI:
 
 ```shell
-aztec-up latest
+aztec-up
 ```
 
 2. Updating aztec-nr and individual @aztec dependencies:
@@ -47,13 +25,15 @@ The sandbox must be running for the update command to work. Make sure it is [ins
 
 ---
 
-There are three components whose versions need to be kept compatible:
+There are four components whose versions need to be kept compatible:
 
 1. Aztec Sandbox
 2. Aztec CLI
-3. `Aztec.nr`, the Noir framework for writing Aztec contracts
+3. aztec-nargo
+4. `Aztec.nr`, the Noir framework for writing Aztec contracts
 
-All three are using the same versioning scheme and their versions must match. Docker ensures that the sandbox and CLI are always compatible, but you need to update Aztec.nr manually or using `aztec-cli update`.
+First three are packaged together in docker and are kept compatible by running `aztec-up`.
+But you need to update your Aztec.nr version manually or using `aztec-cli update`.
 
 ## Updating Aztec.nr packages
 
@@ -91,5 +71,5 @@ If the dependencies fail to resolve ensure that the tag matches a tag in the [az
 `aztec-nargo` is updated by running:
 
 ```bash
-aztec-up latest
+aztec-up
 ```
diff --git a/docs/docs/dev_docs/wallets/writing_an_account_contract.md b/docs/docs/dev_docs/wallets/writing_an_account_contract.md
index adce1fbe0fd5..058a02fb349a 100644
--- a/docs/docs/dev_docs/wallets/writing_an_account_contract.md
+++ b/docs/docs/dev_docs/wallets/writing_an_account_contract.md
@@ -76,7 +76,7 @@ As you can see in the snippet above, to fill in this base class, we need to defi
 In our case, the auth witness will be generated by Schnorr-signing over the message identifier using the hardcoded key. To do this, we are using the `Schnorr` signer from the `@aztec/circuits.js` package to sign over the payload hash. This signer maps to exactly the same signing scheme that Noir's standard library expects in `schnorr::verify_signature`.
 
 :::info
-More signing schemes are available in case you want to experiment with other types of keys. Check out Noir's [documentation on cryptographic primitives](https://noir-lang.org/docs/standard_library/cryptographic_primitives).
+More signing schemes are available in case you want to experiment with other types of keys. Check out Noir's [documentation on cryptographic primitives](https://noir-lang.org/docs/noir/standard_library/cryptographic_primitives).
 :::
 
 ## Trying it out
diff --git a/docs/docusaurus.config.js b/docs/docusaurus.config.js
index 5f19cd0a574d..efe1271187e8 100644
--- a/docs/docusaurus.config.js
+++ b/docs/docusaurus.config.js
@@ -82,13 +82,6 @@ const config = {
         name: "load-versions",
         async loadContent() {
           try {
-            const noirVersionPath = path.resolve(
-              __dirname,
-              "../yarn-project/noir-compiler/src/noir-version.json"
-            );
-            const noirVersion = JSON.parse(
-              fs.readFileSync(noirVersionPath).toString()
-            ).tag;
             const aztecVersionPath = path.resolve(
               __dirname,
               "../.release-please-manifest.json"
@@ -97,12 +90,11 @@ const config = {
               fs.readFileSync(aztecVersionPath).toString()
             )["."];
             return {
-              noir: noirVersion,
               "aztec-packages": `aztec-packages-v${aztecVersion}`,
             };
           } catch (err) {
             throw new Error(
-              `Error loading Noir version from noir-compiler in docusaurus build. Check load-versions in docusaurus.config.js.\n${err}`
+              `Error loading versions in docusaurus build. Check load-versions in docusaurus.config.js.\n${err}`
             );
           }
         },
diff --git a/docs/src/components/InstallNargoInstructions/index.js b/docs/src/components/InstallNargoInstructions/index.js
deleted file mode 100644
index 2ee7437259b1..000000000000
--- a/docs/src/components/InstallNargoInstructions/index.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import React from "react";
-import CodeBlock from "@theme/CodeBlock";
-import { NoirVersion } from "@site/src/components/Version";
-
-export default function InstallNargoInstructions() {
-  return (
-    <CodeBlock language="bash">
-      {`curl -L https://raw.githubusercontent.com/noir-lang/noirup/main/install | bash
-noirup -v ${NoirVersion()}`}
-    </CodeBlock>
-  );
-}
diff --git a/docs/src/components/Version/index.js b/docs/src/components/Version/index.js
index 01bf315f2221..36599d90c82d 100644
--- a/docs/src/components/Version/index.js
+++ b/docs/src/components/Version/index.js
@@ -7,5 +7,4 @@ export default function Version({ what }) {
   return Versions()[what];
 }
 
-export const NoirVersion = () => Versions()["noir"];
 export const AztecPackagesVersion = () => Versions()["aztec-packages"];
\ No newline at end of file
diff --git a/docs/src/preprocess/include_version.js b/docs/src/preprocess/include_version.js
index afa372e0a047..529e93d0adbe 100644
--- a/docs/src/preprocess/include_version.js
+++ b/docs/src/preprocess/include_version.js
@@ -7,13 +7,6 @@ let versions;
 async function getVersions() {
   if (!versions) {
     try {
-      const noirVersionPath = path.resolve(
-        __dirname,
-        "../../../yarn-project/noir-compiler/src/noir-version.json"
-      );
-      const noirVersion = JSON.parse(
-        fs.readFileSync(noirVersionPath).toString()
-      ).tag;
       const aztecVersionPath = path.resolve(
         __dirname,
         "../../../.release-please-manifest.json"
@@ -22,7 +15,6 @@ async function getVersions() {
         fs.readFileSync(aztecVersionPath).toString()
       )["."];
       versions = {
-        noir: noirVersion,
         aztec: `aztec-packages-v${aztecVersion}`,
         aztec_short: aztecVersion,
       };
diff --git a/docs/src/theme/MDXComponents.js b/docs/src/theme/MDXComponents.js
index 4593ab51e685..28e247751f40 100644
--- a/docs/src/theme/MDXComponents.js
+++ b/docs/src/theme/MDXComponents.js
@@ -1,18 +1,12 @@
 import React from "react";
 import MDXComponents from "@theme-original/MDXComponents";
-import Version, {
-  NoirVersion,
-  AztecPackagesVersion,
-} from "@site/src/components/Version";
-import InstallNargoInstructions from "@site/src/components/InstallNargoInstructions";
+import Version, { AztecPackagesVersion } from "@site/src/components/Version";
 import CodeBlock from "@theme/CodeBlock";
 
 // https://docusaurus.io/docs/markdown-features/react#mdx-component-scope
 export default {
   ...MDXComponents,
   Version,
-  NoirVersion,
   AztecPackagesVersion,
-  InstallNargoInstructions,
   CodeBlock,
 };
diff --git a/l1-contracts/src/core/Rollup.sol b/l1-contracts/src/core/Rollup.sol
index 82db79ada62f..036868528727 100644
--- a/l1-contracts/src/core/Rollup.sol
+++ b/l1-contracts/src/core/Rollup.sol
@@ -4,91 +4,83 @@ pragma solidity >=0.8.18;
 
 // Interfaces
 import {IRollup} from "./interfaces/IRollup.sol";
+import {IAvailabilityOracle} from "./interfaces/IAvailabilityOracle.sol";
 import {IInbox} from "./interfaces/messagebridge/IInbox.sol";
 import {IOutbox} from "./interfaces/messagebridge/IOutbox.sol";
 import {IRegistry} from "./interfaces/messagebridge/IRegistry.sol";
 
 // Libraries
-import {HeaderDecoder} from "./libraries/decoders/HeaderDecoder.sol";
+import {HeaderLib} from "./libraries/HeaderLib.sol";
 import {MessagesDecoder} from "./libraries/decoders/MessagesDecoder.sol";
 import {Hash} from "./libraries/Hash.sol";
 import {Errors} from "./libraries/Errors.sol";
 
 // Contracts
 import {MockVerifier} from "../mock/MockVerifier.sol";
-import {AvailabilityOracle} from "./availability_oracle/AvailabilityOracle.sol";
 
 /**
  * @title Rollup
  * @author Aztec Labs
- * @notice Rollup contract that are concerned about readability and velocity of development
+ * @notice Rollup contract that is concerned about readability and velocity of development
  * not giving a damn about gas costs.
  */
 contract Rollup is IRollup {
   MockVerifier public immutable VERIFIER;
   IRegistry public immutable REGISTRY;
+  IAvailabilityOracle public immutable AVAILABILITY_ORACLE;
   uint256 public immutable VERSION;
-  AvailabilityOracle public immutable AVAILABILITY_ORACLE;
 
-  bytes32 public rollupStateHash;
+  bytes32 public archive; // Root of the archive tree
   uint256 public lastBlockTs;
   // Tracks the last time time was warped on L2 ("warp" is the testing cheatcode).
   // See https://github.com/AztecProtocol/aztec-packages/issues/1614
   uint256 public lastWarpedBlockTs;
 
-  constructor(IRegistry _registry) {
+  constructor(IRegistry _registry, IAvailabilityOracle _availabilityOracle) {
     VERIFIER = new MockVerifier();
-    AVAILABILITY_ORACLE = new AvailabilityOracle();
     REGISTRY = _registry;
+    AVAILABILITY_ORACLE = _availabilityOracle;
     VERSION = 1;
   }
 
   /**
-   * @notice Process an incoming L2Block and progress the state
+   * @notice Process an incoming L2 block and progress the state
+   * @param _header - The L2 block header
+   * @param _archive - A root of the archive tree after the L2 block is applied
+   * @param _txsHash - Transactions hash.
+   * @param _body - The L2 block body
    * @param _proof - The proof of correct execution
-   * @param _l2Block - The L2Block data, formatted as outlined in `Decoder.sol`
    */
-  function process(bytes memory _proof, bytes calldata _l2Block) external override(IRollup) {
-    _constrainGlobals(_l2Block);
-
-    // Decode the header
-    (uint256 l2BlockNumber, bytes32 oldStateHash, bytes32 newStateHash) =
-      HeaderDecoder.decode(_l2Block[:HeaderDecoder.BLOCK_HEADER_SIZE]);
+  function process(
+    bytes calldata _header,
+    bytes32 _archive,
+    bytes32 _txsHash, // TODO(#3938) Update this to be actual txs hash and not the old block calldata hash.
+    bytes calldata _body, // TODO(#3938) Update this to pass in only th messages and not the whole body.
+    bytes memory _proof
+  ) external override(IRollup) {
+    // Decode and validate header
+    HeaderLib.Header memory header = HeaderLib.decode(_header);
+    HeaderLib.validate(header, VERSION, lastBlockTs, archive);
 
     // Check if the data is available using availability oracle (change availability oracle if you want a different DA layer)
-    bytes32 txsHash;
-    {
-      // @todo @LHerskind Hack such that the node is unchanged for now.
-      // should be removed when we have a proper block publication.
-      txsHash = AVAILABILITY_ORACLE.publish(_l2Block[HeaderDecoder.BLOCK_HEADER_SIZE:]);
-    }
-
-    if (!AVAILABILITY_ORACLE.isAvailable(txsHash)) {
-      // @todo @LHerskind Impossible to hit with above hack.
-      revert Errors.Rollup__UnavailableTxs(txsHash);
+    if (!AVAILABILITY_ORACLE.isAvailable(_txsHash)) {
+      revert Errors.Rollup__UnavailableTxs(_txsHash);
     }
 
     // Decode the cross-chain messages
     (bytes32 inHash,, bytes32[] memory l1ToL2Msgs, bytes32[] memory l2ToL1Msgs) =
-      MessagesDecoder.decode(_l2Block[HeaderDecoder.BLOCK_HEADER_SIZE:]);
-
-    bytes32 publicInputHash =
-      _computePublicInputHash(_l2Block[:HeaderDecoder.BLOCK_HEADER_SIZE], txsHash, inHash);
-
-    // @todo @LHerskind Proper genesis state. If the state is empty, we allow anything for now.
-    // TODO(#3936): Temporarily disabling this because L2Block encoding has not yet been updated.
-    // if (rollupStateHash != bytes32(0) && rollupStateHash != oldStateHash) {
-    //   revert Errors.Rollup__InvalidStateHash(rollupStateHash, oldStateHash);
-    // }
+      MessagesDecoder.decode(_body);
 
     bytes32[] memory publicInputs = new bytes32[](1);
-    publicInputs[0] = publicInputHash;
+    publicInputs[0] = _computePublicInputHash(_header, _txsHash, inHash);
 
+    // @todo @benesjan We will need `nextAvailableLeafIndex` of archive to verify the proof. This value is equal to
+    // current block number which is stored in the header (header.globalVariables.blockNumber).
     if (!VERIFIER.verify(_proof, publicInputs)) {
       revert Errors.Rollup__InvalidProof();
     }
 
-    rollupStateHash = newStateHash;
+    archive = _archive;
     lastBlockTs = block.timestamp;
 
     // @todo (issue #605) handle fee collector
@@ -98,34 +90,7 @@ contract Rollup is IRollup {
     IOutbox outbox = REGISTRY.getOutbox();
     outbox.sendL1Messages(l2ToL1Msgs);
 
-    emit L2BlockProcessed(l2BlockNumber);
-  }
-
-  function _constrainGlobals(bytes calldata _header) internal view {
-    uint256 chainId = uint256(bytes32(_header[:0x20]));
-    uint256 version = uint256(bytes32(_header[0x20:0x40]));
-    uint256 ts = uint256(bytes32(_header[0x60:0x80]));
-    // block number already constrained by start state hash
-
-    if (block.chainid != chainId) {
-      revert Errors.Rollup__InvalidChainId(chainId, block.chainid);
-    }
-
-    if (version != VERSION) {
-      revert Errors.Rollup__InvalidVersion(version, VERSION);
-    }
-
-    if (ts > block.timestamp) {
-      revert Errors.Rollup__TimestampInFuture();
-    }
-
-    // @todo @LHerskind consider if this is too strict
-    // This will make multiple l2 blocks in the same l1 block impractical.
-    // e.g., the first block will update timestamp which will make the second fail.
-    // Could possibly allow multiple blocks if in same l1 block
-    if (ts < lastBlockTs) {
-      revert Errors.Rollup__TimestampTooOld();
-    }
+    emit L2BlockProcessed(header.globalVariables.blockNumber);
   }
 
   function _computePublicInputHash(bytes calldata _header, bytes32 _txsHash, bytes32 _inHash)
diff --git a/l1-contracts/src/core/availability_oracle/AvailabilityOracle.sol b/l1-contracts/src/core/availability_oracle/AvailabilityOracle.sol
index 0f4041d16d25..7695e508807a 100644
--- a/l1-contracts/src/core/availability_oracle/AvailabilityOracle.sol
+++ b/l1-contracts/src/core/availability_oracle/AvailabilityOracle.sol
@@ -18,12 +18,15 @@ contract AvailabilityOracle is IAvailabilityOracle {
 
   /**
    * @notice Publishes transactions and marks its commitment, the TxsHash, as available
-   * @param _body - The L1 calldata
+   * @param _body - The block body
    * @return txsHash - The TxsHash
    */
   function publish(bytes calldata _body) external override(IAvailabilityOracle) returns (bytes32) {
     bytes32 _txsHash = TxsDecoder.decode(_body);
     isAvailable[_txsHash] = true;
+
+    emit TxsPublished(_txsHash);
+
     return _txsHash;
   }
 }
diff --git a/l1-contracts/src/core/interfaces/IAvailabilityOracle.sol b/l1-contracts/src/core/interfaces/IAvailabilityOracle.sol
index 302f6dbc0e5d..38f5176596c9 100644
--- a/l1-contracts/src/core/interfaces/IAvailabilityOracle.sol
+++ b/l1-contracts/src/core/interfaces/IAvailabilityOracle.sol
@@ -3,6 +3,8 @@
 pragma solidity >=0.8.18;
 
 interface IAvailabilityOracle {
+  event TxsPublished(bytes32 txsHash);
+
   function publish(bytes calldata _body) external returns (bytes32);
 
   function isAvailable(bytes32 _txsHash) external view returns (bool);
diff --git a/l1-contracts/src/core/interfaces/IRollup.sol b/l1-contracts/src/core/interfaces/IRollup.sol
index ab2fca20e181..804e3bf13e98 100644
--- a/l1-contracts/src/core/interfaces/IRollup.sol
+++ b/l1-contracts/src/core/interfaces/IRollup.sol
@@ -3,7 +3,13 @@
 pragma solidity >=0.8.18;
 
 interface IRollup {
-  event L2BlockProcessed(uint256 indexed blockNum);
+  event L2BlockProcessed(uint256 indexed blockNumber);
 
-  function process(bytes memory _proof, bytes calldata _l2Block) external;
+  function process(
+    bytes calldata _header,
+    bytes32 _archive,
+    bytes32 _txsHash,
+    bytes calldata _body,
+    bytes memory _proof
+  ) external;
 }
diff --git a/l1-contracts/src/core/libraries/Errors.sol b/l1-contracts/src/core/libraries/Errors.sol
index e8d6785f1833..39ec6a692bc2 100644
--- a/l1-contracts/src/core/libraries/Errors.sol
+++ b/l1-contracts/src/core/libraries/Errors.sol
@@ -48,7 +48,7 @@ library Errors {
   ); // 0x5e789f34
 
   // Rollup
-  error Rollup__InvalidStateHash(bytes32 expected, bytes32 actual); // 0xa3cfaab3
+  error Rollup__InvalidArchive(bytes32 expected, bytes32 actual); // 0xb682a40e
   error Rollup__InvalidProof(); // 0xa5b2ba17
   error Rollup__InvalidChainId(uint256 expected, uint256 actual); // 0x37b5bc12
   error Rollup__InvalidVersion(uint256 expected, uint256 actual); // 0x9ef30794
diff --git a/l1-contracts/src/core/libraries/HeaderLib.sol b/l1-contracts/src/core/libraries/HeaderLib.sol
new file mode 100644
index 000000000000..894cd91ac6ab
--- /dev/null
+++ b/l1-contracts/src/core/libraries/HeaderLib.sol
@@ -0,0 +1,154 @@
+// SPDX-License-Identifier: Apache-2.0
+// Copyright 2023 Aztec Labs.
+pragma solidity >=0.8.18;
+
+// Libraries
+import {Errors} from "./Errors.sol";
+import {Constants} from "./ConstantsGen.sol";
+import {Hash} from "./Hash.sol";
+
+/**
+ * @title Header Library
+ * @author Aztec Labs
+ * @notice Decoding and validating an L2 block header
+ * Concerned with readability and velocity of development not giving a damn about gas costs.
+ *
+ * -------------------
+ * You can use https://gist.github.com/LHerskind/724a7e362c97e8ac2902c6b961d36830 to generate the below outline.
+ * -------------------
+ * L2 Block Header specification
+ * -------------------
+ *
+ *  | byte start                                                                       | num bytes    | name
+ *  | ---                                                                              | ---          | ---
+ *  |                                                                                  |              | Header {
+ *  |                                                                                  |              |   GlobalVariables {
+ *  | 0x0000                                                                           | 0x20         |     chainId
+ *  | 0x0020                                                                           | 0x20         |     version
+ *  | 0x0040                                                                           | 0x20         |     blockNumber
+ *  | 0x0060                                                                           | 0x20         |     timestamp
+ *  |                                                                                  |              |   }
+ *  |                                                                                  |              |   StateReference {
+ *  | 0x0080                                                                           | 0x20         |     l1ToL2MessageTree.root
+ *  | 0x00a0                                                                           | 0x04         |     l1ToL2MessageTree.nextAvailableLeafIndex
+ *  |                                                                                  |              |     PartialStateReference {
+ *  | 0x00a4                                                                           | 0x20         |       noteHashTree.root
+ *  | 0x00c4                                                                           | 0x04         |       noteHashTree.nextAvailableLeafIndex
+ *  | 0x00c8                                                                           | 0x20         |       nullifierTree.root
+ *  | 0x00e8                                                                           | 0x04         |       nullifierTree.nextAvailableLeafIndex
+ *  | 0x00ec                                                                           | 0x20         |       contractTree.root
+ *  | 0x010c                                                                           | 0x04         |       contractTree.nextAvailableLeafIndex
+ *  | 0x0110                                                                           | 0x20         |       publicDataTree.root
+ *  | 0x0130                                                                           | 0x04         |       publicDataTree.nextAvailableLeafIndex
+ *  |                                                                                  |              |     }
+ *  |                                                                                  |              |   }
+ *  | 0x0134                                                                           | 0x20         |   lastArchive.root
+ *  | 0x0154                                                                           | 0x04         |   lastArchive.nextAvailableLeafIndex
+ *  | 0x0158                                                                           | 0x20         |   bodyHash
+ *  |                                                                                  |              | }
+ *  | ---                                                                              | ---          | ---
+ */
+library HeaderLib {
+  struct AppendOnlyTreeSnapshot {
+    bytes32 root;
+    uint32 nextAvailableLeafIndex;
+  }
+
+  struct GlobalVariables {
+    uint256 chainId;
+    uint256 version;
+    uint256 blockNumber;
+    uint256 timestamp;
+  }
+
+  struct PartialStateReference {
+    AppendOnlyTreeSnapshot noteHashTree;
+    AppendOnlyTreeSnapshot nullifierTree;
+    AppendOnlyTreeSnapshot contractTree;
+    AppendOnlyTreeSnapshot publicDataTree;
+  }
+
+  struct StateReference {
+    AppendOnlyTreeSnapshot l1ToL2MessageTree;
+    // Note: Can't use "partial" name here as in yellow paper because it is a reserved solidity keyword
+    PartialStateReference partialStateReference;
+  }
+
+  struct Header {
+    GlobalVariables globalVariables;
+    StateReference stateReference;
+    AppendOnlyTreeSnapshot lastArchive;
+    bytes32 bodyHash;
+  }
+
+  /**
+   * @notice Decodes the header
+   * @param _header - The header calldata
+   * @return The decoded header
+   */
+  function decode(bytes calldata _header) internal pure returns (Header memory) {
+    require(_header.length == 376, "Invalid header length");
+
+    Header memory header;
+
+    header.globalVariables.chainId = uint256(bytes32(_header[:0x20]));
+    header.globalVariables.version = uint256(bytes32(_header[0x20:0x40]));
+    header.globalVariables.blockNumber = uint256(bytes32(_header[0x40:0x60]));
+    header.globalVariables.timestamp = uint256(bytes32(_header[0x60:0x80]));
+    header.stateReference.l1ToL2MessageTree =
+      AppendOnlyTreeSnapshot(bytes32(_header[0x80:0xa0]), uint32(bytes4(_header[0xa0:0xa4])));
+    header.stateReference.partialStateReference.noteHashTree =
+      AppendOnlyTreeSnapshot(bytes32(_header[0xa4:0xc4]), uint32(bytes4(_header[0xc4:0xc8])));
+    header.stateReference.partialStateReference.nullifierTree =
+      AppendOnlyTreeSnapshot(bytes32(_header[0xc8:0xe8]), uint32(bytes4(_header[0xe8:0xec])));
+    header.stateReference.partialStateReference.contractTree =
+      AppendOnlyTreeSnapshot(bytes32(_header[0xec:0x10c]), uint32(bytes4(_header[0x10c:0x110])));
+    header.stateReference.partialStateReference.publicDataTree =
+      AppendOnlyTreeSnapshot(bytes32(_header[0x110:0x130]), uint32(bytes4(_header[0x130:0x134])));
+    header.lastArchive =
+      AppendOnlyTreeSnapshot(bytes32(_header[0x134:0x154]), uint32(bytes4(_header[0x154:0x158])));
+
+    header.bodyHash = bytes32(_header[0x158:0x178]);
+
+    return header;
+  }
+
+  /**
+   * @notice Validates the header
+   * @param _header - The decoded header
+   * @param _version - The expected version
+   * @param _lastBlockTs - The timestamp of the last block
+   * @param _archive - The expected archive root
+   */
+  function validate(Header memory _header, uint256 _version, uint256 _lastBlockTs, bytes32 _archive)
+    internal
+    view
+  {
+    if (block.chainid != _header.globalVariables.chainId) {
+      revert Errors.Rollup__InvalidChainId(_header.globalVariables.chainId, block.chainid);
+    }
+
+    if (_header.globalVariables.version != _version) {
+      revert Errors.Rollup__InvalidVersion(_header.globalVariables.version, _version);
+    }
+
+    // block number already constrained by archive root check
+
+    if (_header.globalVariables.timestamp > block.timestamp) {
+      revert Errors.Rollup__TimestampInFuture();
+    }
+
+    // @todo @LHerskind consider if this is too strict
+    // This will make multiple l2 blocks in the same l1 block impractical.
+    // e.g., the first block will update timestamp which will make the second fail.
+    // Could possibly allow multiple blocks if in same l1 block
+    if (_header.globalVariables.timestamp < _lastBlockTs) {
+      revert Errors.Rollup__TimestampTooOld();
+    }
+
+    // TODO(#4148) Proper genesis state. If the state is empty, we allow anything for now.
+    if (_archive != bytes32(0) && _archive != _header.lastArchive.root) {
+      revert Errors.Rollup__InvalidArchive(_archive, _header.lastArchive.root);
+    }
+  }
+}
diff --git a/l1-contracts/src/core/libraries/decoders/Decoder.sol b/l1-contracts/src/core/libraries/decoders/Decoder.sol
index 9a9863f5b1a8..39efa07f04d3 100644
--- a/l1-contracts/src/core/libraries/decoders/Decoder.sol
+++ b/l1-contracts/src/core/libraries/decoders/Decoder.sol
@@ -107,40 +107,6 @@ library Decoder {
   uint256 private constant BLOCK_HEADER_OFFSET =
     START_TREES_BLOCK_HEADER_OFFSET + 2 * TREES_BLOCK_HEADER_SIZE;
 
-  /**
-   * @notice Decodes the inputs and computes values to check state against
-   * @param _l2Block - The L2 block calldata.
-   * @return l2BlockNumber  - The L2 block number.
-   * @return startStateHash - The state hash expected prior the execution.
-   * @return endStateHash - The state hash expected after the execution.
-   * @return publicInputHash - The hash of the public inputs
-   * @return l2ToL1Msgs - The L2 to L1 messages
-   * @return l1ToL2Msgs - The L1 to L2 messages
-   */
-  function decode(bytes calldata _l2Block)
-    internal
-    pure
-    returns (
-      uint256 l2BlockNumber,
-      bytes32 startStateHash,
-      bytes32 endStateHash,
-      bytes32 publicInputHash,
-      bytes32[] memory l2ToL1Msgs,
-      bytes32[] memory l1ToL2Msgs
-    )
-  {
-    l2BlockNumber = getL2BlockNumber(_l2Block);
-    // Note, for startStateHash to match the storage, the l2 block number must be new - 1.
-    // Only jumping 1 block at a time.
-    startStateHash = computeStateHash(l2BlockNumber - 1, START_TREES_BLOCK_HEADER_OFFSET, _l2Block);
-    endStateHash = computeStateHash(l2BlockNumber, END_TREES_BLOCK_HEADER_OFFSET, _l2Block);
-
-    bytes32 diffRoot;
-    bytes32 l1ToL2MsgsHash;
-    (diffRoot, l1ToL2MsgsHash, l2ToL1Msgs, l1ToL2Msgs) = computeConsumables(_l2Block);
-    publicInputHash = computePublicInputHash(_l2Block, diffRoot, l1ToL2MsgsHash);
-  }
-
   /**
    * @notice Computes the public input hash
    * @dev Uses sha256 to field
@@ -189,13 +155,13 @@ library Decoder {
 
   /**
    * @notice Computes consumables for the block
-   * @param _l2Block - The L2 block calldata.
+   * @param _body - The L2 block body.
    * @return diffRoot - The root of the diff tree (new commitments, nullifiers etc)
    * @return l1ToL2MsgsHash - The hash of the L1 to L2 messages
    * @return l2ToL1Msgs - The L2 to L1 messages of the block
    * @return l1ToL2Msgs - The L1 to L2 messages of the block
    */
-  function computeConsumables(bytes calldata _l2Block)
+  function computeConsumables(bytes calldata _body)
     internal
     pure
     returns (bytes32, bytes32, bytes32[] memory, bytes32[] memory)
@@ -204,52 +170,53 @@ library Decoder {
     ConsumablesVars memory vars;
 
     {
-      uint256 offset = BLOCK_HEADER_OFFSET;
+      uint256 offset = 0;
 
       // Commitments
-      uint256 count = read4(_l2Block, offset);
+      uint256 count = read4(_body, offset);
       vars.baseLeaves = new bytes32[](count / Constants.MAX_NEW_COMMITMENTS_PER_TX);
-      offsets.commitment = BLOCK_HEADER_OFFSET + 0x4;
-      offset += 0x4 + count * 0x20;
+      offset += 0x4;
+      offsets.commitment = offset;
+      offset += count * 0x20;
       offsets.nullifier = offset + 0x4; // + 0x4 to offset by next read4
 
       // Nullifiers
-      count = read4(_l2Block, offset);
+      count = read4(_body, offset);
       offset += 0x4 + count * 0x20;
       offsets.publicData = offset + 0x4; // + 0x4 to offset by next read4
 
       // Public data writes
-      count = read4(_l2Block, offset);
+      count = read4(_body, offset);
       offset += 0x4 + count * 0x40;
       offsets.l2ToL1Msgs = offset + 0x4; // + 0x4 to offset by next read4
 
       // L2 to L1 messages
-      count = read4(_l2Block, offset);
+      count = read4(_body, offset);
       vars.l2ToL1Msgs = new bytes32[](count);
       assembly {
         // load the l2 to l1 msgs (done here as offset will be altered in loop)
         let l2ToL1Msgs := mload(add(vars, 0x20))
         calldatacopy(
-          add(l2ToL1Msgs, 0x20), add(_l2Block.offset, mload(add(offsets, 0x60))), mul(count, 0x20)
+          add(l2ToL1Msgs, 0x20), add(_body.offset, mload(add(offsets, 0x60))), mul(count, 0x20)
         )
       }
       offset += 0x4 + count * 0x20;
       offsets.contracts = offset + 0x4; // + 0x4 to offset by next read4
 
       // Contracts
-      count = read4(_l2Block, offset);
+      count = read4(_body, offset);
       offsets.contractData = offsets.contracts + count * 0x20;
       offset += 0x4 + count * 0x54;
       offsets.l1ToL2Msgs = offset + 0x4; // + 0x4 to offset by next read4
 
       // L1 to L2 messages
-      count = read4(_l2Block, offset);
+      count = read4(_body, offset);
       vars.l1Tol2MsgsCount = count;
       offset += 0x4 + count * 0x20;
       offsets.encryptedLogs = offset + 0x4; // + 0x4 to offset by next read4
 
       // Used as length in bytes down here
-      uint256 length = read4(_l2Block, offset);
+      uint256 length = read4(_body, offset);
       offsets.unencryptedLogs = offsets.encryptedLogs + 0x4 + length;
     }
 
@@ -278,26 +245,24 @@ library Decoder {
          * Note: will advance offsets by the number of bytes processed.
          */
         (vars.encryptedLogsHash, offsets.encryptedLogs) =
-          computeKernelLogsHash(offsets.encryptedLogs, _l2Block);
+          computeKernelLogsHash(offsets.encryptedLogs, _body);
 
         (vars.unencryptedLogsHash, offsets.unencryptedLogs) =
-          computeKernelLogsHash(offsets.unencryptedLogs, _l2Block);
+          computeKernelLogsHash(offsets.unencryptedLogs, _body);
 
         // Insertions are split into multiple `bytes.concat` to work around stack too deep.
         vars.baseLeaf = bytes.concat(
           bytes.concat(
-            slice(_l2Block, offsets.commitment, Constants.COMMITMENTS_NUM_BYTES_PER_BASE_ROLLUP),
-            slice(_l2Block, offsets.nullifier, Constants.NULLIFIERS_NUM_BYTES_PER_BASE_ROLLUP),
-            slice(
-              _l2Block, offsets.publicData, Constants.PUBLIC_DATA_WRITES_NUM_BYTES_PER_BASE_ROLLUP
-            ),
-            slice(_l2Block, offsets.l2ToL1Msgs, Constants.L2_TO_L1_MSGS_NUM_BYTES_PER_BASE_ROLLUP),
-            slice(_l2Block, offsets.contracts, Constants.CONTRACTS_NUM_BYTES_PER_BASE_ROLLUP)
+            slice(_body, offsets.commitment, Constants.COMMITMENTS_NUM_BYTES_PER_BASE_ROLLUP),
+            slice(_body, offsets.nullifier, Constants.NULLIFIERS_NUM_BYTES_PER_BASE_ROLLUP),
+            slice(_body, offsets.publicData, Constants.PUBLIC_DATA_WRITES_NUM_BYTES_PER_BASE_ROLLUP),
+            slice(_body, offsets.l2ToL1Msgs, Constants.L2_TO_L1_MSGS_NUM_BYTES_PER_BASE_ROLLUP),
+            slice(_body, offsets.contracts, Constants.CONTRACTS_NUM_BYTES_PER_BASE_ROLLUP)
           ),
           bytes.concat(
-            slice(_l2Block, offsets.contractData, 0x20), // newContractDataKernel.aztecAddress
+            slice(_body, offsets.contractData, 0x20), // newContractDataKernel.aztecAddress
             bytes12(0),
-            slice(_l2Block, offsets.contractData + 0x20, 0x14) // newContractDataKernel.ethAddress
+            slice(_body, offsets.contractData + 0x20, 0x14) // newContractDataKernel.ethAddress
           ),
           bytes.concat(vars.encryptedLogsHash, vars.unencryptedLogsHash)
         );
@@ -324,7 +289,7 @@ library Decoder {
       assembly {
         calldatacopy(
           add(l1ToL2Msgs, 0x20),
-          add(_l2Block.offset, mload(add(offsets, 0xc0))),
+          add(_body.offset, mload(add(offsets, 0xc0))),
           l1ToL2MsgsHashPreimageSize
         )
       }
@@ -420,6 +385,7 @@ library Decoder {
       for (uint256 j = 0; j < treeSize; j += 2) {
         _leafs[j / 2] = sha256(bytes.concat(_leafs[j], _leafs[j + 1]));
       }
+      treeSize /= 2;
     }
 
     return _leafs[0];
diff --git a/l1-contracts/src/core/libraries/decoders/HeaderDecoder.sol b/l1-contracts/src/core/libraries/decoders/HeaderDecoder.sol
deleted file mode 100644
index f2e7778e1f6c..000000000000
--- a/l1-contracts/src/core/libraries/decoders/HeaderDecoder.sol
+++ /dev/null
@@ -1,107 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-// Copyright 2023 Aztec Labs.
-pragma solidity >=0.8.18;
-
-// Libraries
-import {Constants} from "../ConstantsGen.sol";
-import {Hash} from "../Hash.sol";
-
-/**
- * @title Header Decoder Library
- * @author Aztec Labs
- * @notice Decoding a L2 header
- * Concerned with readability and velocity of development not giving a damn about gas costs.
- *
- * -------------------
- * You can use https://gist.github.com/LHerskind/724a7e362c97e8ac2902c6b961d36830 to generate the below outline.
- * -------------------
- * L2 Block Header specification
- * -------------------
- *
- *  | byte start                                                                       | num bytes    | name
- *  | ---                                                                              | ---          | ---
- *  | 0x0000                                                                           | 0x20         | chain-id
- *  | 0x0020                                                                           | 0x20         | version
- *  | 0x0040                                                                           | 0x20         | L2 block number
- *  | 0x0060                                                                           | 0x20         | L2 timestamp
- *  | 0x0080                                                                           | 0x20         | startNoteHashTreeSnapshot.root
- *  | 0x00a0                                                                           | 0x04         | startNoteHashTreeSnapshot.nextAvailableLeafIndex
- *  | 0x00a4                                                                           | 0x20         | startNullifierTreeSnapshot.root
- *  | 0x00c4                                                                           | 0x04         | startNullifierTreeSnapshot.nextAvailableLeafIndex
- *  | 0x00c8                                                                           | 0x20         | startContractTreeSnapshot.root
- *  | 0x00e8                                                                           | 0x04         | startContractTreeSnapshot.nextAvailableLeafIndex
- *  | 0x00ec                                                                           | 0x20         | startPublicDataTreeSnapshot.root
- *  | 0x010c                                                                           | 0x04         | startPublicDataTreeSnapshot.nextAvailableLeafIndex
- *  | 0x0110                                                                           | 0x20         | startL1ToL2MessageTreeSnapshot.root
- *  | 0x0130                                                                           | 0x04         | startL1ToL2MessageTreeSnapshot.nextAvailableLeafIndex
- *  | 0x0134                                                                           | 0x20         | startArchiveSnapshot.root
- *  | 0x0154                                                                           | 0x04         | startArchiveSnapshot.nextAvailableLeafIndex
- *  | 0x0158                                                                           | 0x20         | endNoteHashTreeSnapshot.root
- *  | 0x0178                                                                           | 0x04         | endNoteHashTreeSnapshot.nextAvailableLeafIndex
- *  | 0x017c                                                                           | 0x20         | endNullifierTreeSnapshot.root
- *  | 0x019c                                                                           | 0x04         | endNullifierTreeSnapshot.nextAvailableLeafIndex
- *  | 0x01a0                                                                           | 0x20         | endContractTreeSnapshot.root
- *  | 0x01c0                                                                           | 0x04         | endContractTreeSnapshot.nextAvailableLeafIndex
- *  | 0x01c4                                                                           | 0x20         | endPublicDataTreeSnapshot.root
- *  | 0x01e4                                                                           | 0x04         | endPublicDataTreeSnapshot.nextAvailableLeafIndex
- *  | 0x01e8                                                                           | 0x20         | endL1ToL2MessageTreeSnapshot.root
- *  | 0x0208                                                                           | 0x04         | endL1ToL2MessageTreeSnapshot.nextAvailableLeafIndex
- *  | 0x020c                                                                           | 0x20         | endArchiveSnapshot.root
- *  | 0x022c                                                                           | 0x04         | endArchiveSnapshot.nextAvailableLeafIndex
- *  | ---                                                                              | ---          | ---
- */
-library HeaderDecoder {
-  // DECODING OFFSET CONSTANTS
-  // Where the start of trees metadata begins in the block
-  uint256 private constant START_TREES_BLOCK_HEADER_OFFSET = 0x80;
-
-  // The size of the block header elements
-  uint256 private constant TREES_BLOCK_HEADER_SIZE = 0xd8;
-
-  // Where the end of trees metadata begins in the block
-  uint256 private constant END_TREES_BLOCK_HEADER_OFFSET =
-    START_TREES_BLOCK_HEADER_OFFSET + TREES_BLOCK_HEADER_SIZE;
-
-  // Where the metadata ends and the block data begins.
-  uint256 internal constant BLOCK_HEADER_SIZE =
-    START_TREES_BLOCK_HEADER_OFFSET + 2 * TREES_BLOCK_HEADER_SIZE;
-
-  /**
-   * @notice Decodes the header
-   * @param _header - The L2 block calldata.
-   * @return l2BlockNumber - The L2 block number
-   * @return startStateHash - The start state hash
-   * @return endStateHash - The end state hash
-   */
-  function decode(bytes calldata _header)
-    internal
-    pure
-    returns (uint256 l2BlockNumber, bytes32 startStateHash, bytes32 endStateHash)
-  {
-    l2BlockNumber = uint256(bytes32(_header[0x40:0x60]));
-    // Note, for startStateHash to match the storage, the l2 block number must be new - 1.
-    // Only jumping 1 block at a time.
-    startStateHash = computeStateHash(l2BlockNumber - 1, START_TREES_BLOCK_HEADER_OFFSET, _header);
-    endStateHash = computeStateHash(l2BlockNumber, END_TREES_BLOCK_HEADER_OFFSET, _header);
-  }
-
-  /**
-   * @notice Computes a state hash
-   * @param _l2BlockNumber - The L2 block number
-   * @param _offset - The offset into the data, 0x80 for start, 0x019c for end
-   * @param _header - The L2 block calldata.
-   * @return The state hash
-   * @dev The state hash is sha256 hash of block's header elements. For each block the header elements are
-   *      the block number, snapshots of all the trees and the root of the public data tree. This function
-   *      copies all of these to memory and then hashes them.
-   */
-  function computeStateHash(uint256 _l2BlockNumber, uint256 _offset, bytes calldata _header)
-    internal
-    pure
-    returns (bytes32)
-  {
-    return sha256(
-      bytes.concat(bytes32(_l2BlockNumber), _header[_offset:_offset + TREES_BLOCK_HEADER_SIZE])
-    );
-  }
-}
diff --git a/l1-contracts/src/core/libraries/decoders/TxsDecoder.sol b/l1-contracts/src/core/libraries/decoders/TxsDecoder.sol
index c58b10b377e8..93bb8d922d4f 100644
--- a/l1-contracts/src/core/libraries/decoders/TxsDecoder.sol
+++ b/l1-contracts/src/core/libraries/decoders/TxsDecoder.sol
@@ -268,6 +268,7 @@ library TxsDecoder {
       for (uint256 j = 0; j < treeSize; j += 2) {
         _leafs[j / 2] = sha256(bytes.concat(_leafs[j], _leafs[j + 1]));
       }
+      treeSize /= 2;
     }
 
     return _leafs[0];
diff --git a/l1-contracts/test/DecoderHelper.sol b/l1-contracts/test/DecoderHelper.sol
deleted file mode 100644
index aa1e9d326fae..000000000000
--- a/l1-contracts/test/DecoderHelper.sol
+++ /dev/null
@@ -1,33 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-// Copyright 2023 Aztec Labs.
-pragma solidity >=0.8.18;
-
-import {Decoder} from "../src/core/libraries/decoders/Decoder.sol";
-import {Rollup} from "../src/core/Rollup.sol";
-
-contract DecoderHelper {
-  function decode(bytes calldata _l2Block)
-    external
-    pure
-    returns (uint256, bytes32, bytes32, bytes32, bytes32[] memory, bytes32[] memory)
-  {
-    return Decoder.decode(_l2Block);
-  }
-
-  function computeDiffRootAndMessagesHash(bytes calldata _l2Block)
-    external
-    pure
-    returns (bytes32, bytes32)
-  {
-    (bytes32 diffRoot, bytes32 l1ToL2MessagesHash,,) = Decoder.computeConsumables(_l2Block);
-    return (diffRoot, l1ToL2MessagesHash);
-  }
-
-  function computeKernelLogsHash(bytes calldata _kernelLogs)
-    external
-    pure
-    returns (bytes32, uint256)
-  {
-    return Decoder.computeKernelLogsHash(0, _kernelLogs);
-  }
-}
diff --git a/l1-contracts/test/Rollup.t.sol b/l1-contracts/test/Rollup.t.sol
index 97c05292291a..387dcbac6a85 100644
--- a/l1-contracts/test/Rollup.t.sol
+++ b/l1-contracts/test/Rollup.t.sol
@@ -5,7 +5,7 @@ pragma solidity >=0.8.18;
 import {Test} from "forge-std/Test.sol";
 
 import {DecoderTest} from "./decoders/Decoder.t.sol";
-import {DecoderHelper} from "./DecoderHelper.sol";
+import {DecoderHelper} from "./decoders/helpers/DecoderHelper.sol";
 
 import {DecoderBase} from "./decoders/Base.sol";
 
@@ -16,6 +16,7 @@ import {Inbox} from "../src/core/messagebridge/Inbox.sol";
 import {Outbox} from "../src/core/messagebridge/Outbox.sol";
 import {Errors} from "../src/core/libraries/Errors.sol";
 import {Rollup} from "../src/core/Rollup.sol";
+import {AvailabilityOracle} from "../src/core/availability_oracle/AvailabilityOracle.sol";
 
 /**
  * Blocks are generated using the `integration_l1_publisher.test.ts` tests.
@@ -27,6 +28,7 @@ contract RollupTest is DecoderBase {
   Inbox internal inbox;
   Outbox internal outbox;
   Rollup internal rollup;
+  AvailabilityOracle internal availabilityOracle;
 
   function setUp() public virtual {
     helper = new DecoderHelper();
@@ -34,7 +36,8 @@ contract RollupTest is DecoderBase {
     registry = new Registry();
     inbox = new Inbox(address(registry));
     outbox = new Outbox(address(registry));
-    rollup = new Rollup(registry);
+    availabilityOracle = new AvailabilityOracle();
+    rollup = new Rollup(registry, availabilityOracle);
 
     registry.upgrade(address(rollup), address(inbox), address(outbox));
   }
@@ -58,53 +61,77 @@ contract RollupTest is DecoderBase {
   }
 
   function testRevertInvalidChainId() public {
-    bytes memory block_ = load("empty_block_0").block.body;
+    DecoderBase.Data memory data = load("empty_block_0").block;
+    bytes memory header = data.header;
+    bytes32 archive = data.archive;
+    bytes memory body = data.body;
 
     assembly {
-      mstore(add(block_, 0x20), 0x420)
+      mstore(add(header, 0x20), 0x420)
     }
 
+    bytes32 txsHash = availabilityOracle.publish(body);
+
     vm.expectRevert(abi.encodeWithSelector(Errors.Rollup__InvalidChainId.selector, 0x420, 31337));
-    rollup.process(bytes(""), block_);
+    rollup.process(header, archive, txsHash, body, bytes(""));
   }
 
   function testRevertInvalidVersion() public {
-    bytes memory block_ = load("empty_block_0").block.body;
+    DecoderBase.Data memory data = load("empty_block_0").block;
+    bytes memory header = data.header;
+    bytes32 archive = data.archive;
+    bytes memory body = data.body;
 
     assembly {
-      mstore(add(block_, 0x40), 0x420)
+      mstore(add(header, 0x40), 0x420)
     }
 
+    bytes32 txsHash = availabilityOracle.publish(body);
+
     vm.expectRevert(abi.encodeWithSelector(Errors.Rollup__InvalidVersion.selector, 0x420, 1));
-    rollup.process(bytes(""), block_);
+    rollup.process(header, archive, txsHash, body, bytes(""));
   }
 
   function testRevertTimestampInFuture() public {
-    bytes memory block_ = load("empty_block_0").block.body;
+    DecoderBase.Data memory data = load("empty_block_0").block;
+    bytes memory header = data.header;
+    bytes32 archive = data.archive;
+    bytes memory body = data.body;
 
     uint256 ts = block.timestamp + 1;
     assembly {
-      mstore(add(block_, 0x80), ts)
+      mstore(add(header, 0x80), ts)
     }
 
+    bytes32 txsHash = availabilityOracle.publish(body);
+
     vm.expectRevert(abi.encodeWithSelector(Errors.Rollup__TimestampInFuture.selector));
-    rollup.process(bytes(""), block_);
+    rollup.process(header, archive, txsHash, body, bytes(""));
   }
 
   function testRevertTimestampTooOld() public {
-    bytes memory block_ = load("empty_block_0").block.body;
+    DecoderBase.Data memory data = load("empty_block_0").block;
+    bytes memory header = data.header;
+    bytes32 archive = data.archive;
+    bytes memory body = data.body;
 
     // Overwrite in the rollup contract
     vm.store(address(rollup), bytes32(uint256(1)), bytes32(uint256(block.timestamp)));
 
+    bytes32 txsHash = availabilityOracle.publish(body);
+
     vm.expectRevert(abi.encodeWithSelector(Errors.Rollup__TimestampTooOld.selector));
-    rollup.process(bytes(""), block_);
+    rollup.process(header, archive, txsHash, body, bytes(""));
   }
 
   function _testBlock(string memory name) public {
     DecoderBase.Full memory full = load(name);
+    bytes memory header = full.block.header;
+    bytes32 archive = full.block.archive;
+    bytes memory body = full.block.body;
+
     // We jump to the time of the block.
-    vm.warp(full.block.timestamp);
+    vm.warp(full.block.decodedHeader.globalVariables.timestamp);
 
     _populateInbox(full.populate.sender, full.populate.recipient, full.populate.l1ToL2Content);
 
@@ -115,8 +142,10 @@ contract RollupTest is DecoderBase {
       assertTrue(inbox.contains(full.messages.l1ToL2Messages[i]), "msg not in inbox");
     }
 
+    bytes32 txsHash = availabilityOracle.publish(body);
+
     vm.record();
-    rollup.process(bytes(""), full.block.body);
+    rollup.process(header, archive, txsHash, body, bytes(""));
 
     (, bytes32[] memory inboxWrites) = vm.accesses(address(inbox));
     (, bytes32[] memory outboxWrites) = vm.accesses(address(outbox));
@@ -145,7 +174,7 @@ contract RollupTest is DecoderBase {
       assertEq(inboxWrites.length, count, "Invalid inbox writes");
     }
 
-    assertEq(rollup.rollupStateHash(), full.block.endStateHash, "Invalid rollup state hash");
+    assertEq(rollup.archive(), archive, "Invalid archive");
   }
 
   function _populateInbox(address _sender, bytes32 _recipient, bytes32[] memory _contents) internal {
diff --git a/l1-contracts/test/decoders/Base.sol b/l1-contracts/test/decoders/Base.sol
index ee95efe7a46f..c891194014df 100644
--- a/l1-contracts/test/decoders/Base.sol
+++ b/l1-contracts/test/decoders/Base.sol
@@ -5,7 +5,13 @@ pragma solidity >=0.8.18;
 import {Test} from "forge-std/Test.sol";
 
 contract DecoderBase is Test {
+  struct AppendOnlyTreeSnapshot {
+    uint32 nextAvailableLeafIndex;
+    bytes32 root;
+  }
+
   // When I had data and messages as one combined struct it failed, but I can have this top-layer and it works :shrug:
+  // Note: Members of the struct (and substructs) have to be in ALPHABETICAL order!
   struct Full {
     Data block;
     Messages messages;
@@ -24,14 +30,39 @@ contract DecoderBase is Test {
   }
 
   struct Data {
-    uint256 blockNumber;
+    bytes32 archive;
     bytes body;
     bytes32 calldataHash;
-    bytes32 endStateHash;
+    DecodedHeader decodedHeader;
+    bytes header;
     bytes32 l1ToL2MessagesHash;
     bytes32 publicInputsHash;
-    bytes32 startStateHash;
+  }
+
+  struct DecodedHeader {
+    bytes32 bodyHash;
+    GlobalVariables globalVariables;
+    AppendOnlyTreeSnapshot lastArchive;
+    StateReference stateReference;
+  }
+
+  struct GlobalVariables {
+    uint256 blockNumber;
+    uint256 chainId;
     uint256 timestamp;
+    uint256 version;
+  }
+
+  struct StateReference {
+    AppendOnlyTreeSnapshot l1ToL2MessageTree;
+    PartialStateReference partialStateReference;
+  }
+
+  struct PartialStateReference {
+    AppendOnlyTreeSnapshot contractTree;
+    AppendOnlyTreeSnapshot noteHashTree;
+    AppendOnlyTreeSnapshot nullifierTree;
+    AppendOnlyTreeSnapshot publicDataTree;
   }
 
   function load(string memory name) public view returns (Full memory) {
diff --git a/l1-contracts/test/decoders/Decoder.t.sol b/l1-contracts/test/decoders/Decoder.t.sol
index c846f12a29a1..e11586d30b43 100644
--- a/l1-contracts/test/decoders/Decoder.t.sol
+++ b/l1-contracts/test/decoders/Decoder.t.sol
@@ -6,49 +6,19 @@ import {DecoderBase} from "./Base.sol";
 
 import {Hash} from "../../src/core/libraries/Hash.sol";
 import {DataStructures} from "../../src/core/libraries/DataStructures.sol";
-import {DecoderHelper} from "../DecoderHelper.sol";
+
+import {DecoderHelper} from "./helpers/DecoderHelper.sol";
+import {HeaderDecoderHelper} from "./helpers/HeaderDecoderHelper.sol";
+import {MessagesDecoderHelper} from "./helpers/MessagesDecoderHelper.sol";
+import {TxsDecoderHelper} from "./helpers/TxsDecoderHelper.sol";
+import {HeaderLib} from "../../src/core/libraries/HeaderLib.sol";
 
 import {Decoder} from "../../src/core/libraries/decoders/Decoder.sol";
-import {HeaderDecoder} from "../../src/core/libraries/decoders/HeaderDecoder.sol";
 import {MessagesDecoder} from "../../src/core/libraries/decoders/MessagesDecoder.sol";
 import {TxsDecoder} from "../../src/core/libraries/decoders/TxsDecoder.sol";
 
 import {AvailabilityOracle} from "../../src/core/availability_oracle/AvailabilityOracle.sol";
 
-contract HeaderDecoderHelper {
-  // A wrapper used such that we get "calldata" and not memory
-  function decode(bytes calldata _header)
-    public
-    pure
-    returns (uint256 l2BlockNumber, bytes32 startStateHash, bytes32 endStateHash)
-  {
-    return HeaderDecoder.decode(_header);
-  }
-}
-
-contract MessagesDecoderHelper {
-  // A wrapper used such that we get "calldata" and not memory
-  function decode(bytes calldata _header)
-    public
-    pure
-    returns (
-      bytes32 l1ToL2MsgsHash,
-      bytes32 l2ToL1MsgsHash,
-      bytes32[] memory l1ToL2Msgs,
-      bytes32[] memory l2ToL1Msgs
-    )
-  {
-    return MessagesDecoder.decode(_header[HeaderDecoder.BLOCK_HEADER_SIZE:]);
-  }
-}
-
-contract TxsDecoderHelper {
-  // A wrapper used such that we get "calldata" and not memory
-  function decode(bytes calldata _header) public pure returns (bytes32 txsHash) {
-    return TxsDecoder.decode(_header[HeaderDecoder.BLOCK_HEADER_SIZE:]);
-  }
-}
-
 /**
  * Blocks are generated using the `integration_l1_publisher.test.ts` tests.
  * Main use of these test is shorter cycles when updating the decoder contract.
@@ -80,27 +50,109 @@ contract DecoderTest is DecoderBase {
 
     // Using the FULL decoder.
     (
-      uint256 l2BlockNumber,
-      bytes32 startStateHash,
-      bytes32 endStateHash,
-      bytes32 publicInputsHash,
+      bytes32 diffRoot,
+      bytes32 l1ToL2MessagesHash,
       bytes32[] memory l2ToL1Msgs,
       bytes32[] memory l1ToL2Msgs
-    ) = helper.decode(data.block.body);
-    (bytes32 diffRoot, bytes32 l1ToL2MessagesHash) =
-      helper.computeDiffRootAndMessagesHash(data.block.body);
+    ) = helper.computeConsumables(data.block.body);
 
     // Header
     {
-      (uint256 headerL2BlockNumber, bytes32 headerStartStateHash, bytes32 headerEndStateHash) =
-        headerHelper.decode(data.block.body);
-
-      assertEq(l2BlockNumber, data.block.blockNumber, "Invalid block number");
-      assertEq(headerL2BlockNumber, data.block.blockNumber, "Invalid block number");
-      assertEq(startStateHash, data.block.startStateHash, "Invalid start state hash");
-      assertEq(headerStartStateHash, data.block.startStateHash, "Invalid start state hash");
-      assertEq(endStateHash, data.block.endStateHash, "Invalid end state hash");
-      assertEq(headerEndStateHash, data.block.endStateHash, "Invalid end state hash");
+      DecoderBase.DecodedHeader memory referenceHeader = data.block.decodedHeader;
+      HeaderLib.Header memory header = headerHelper.decode(data.block.header);
+
+      // GlobalVariables
+      {
+        DecoderBase.GlobalVariables memory globalVariables = referenceHeader.globalVariables;
+
+        assertEq(
+          header.globalVariables.blockNumber, globalVariables.blockNumber, "Invalid block number"
+        );
+        assertEq(header.globalVariables.chainId, globalVariables.chainId, "Invalid chain Id");
+        assertEq(header.globalVariables.timestamp, globalVariables.timestamp, "Invalid timestamp");
+        assertEq(header.globalVariables.version, globalVariables.version, "Invalid version");
+      }
+
+      // StateReference
+      {
+        DecoderBase.StateReference memory stateReference = referenceHeader.stateReference;
+
+        // L1 -> L2 messages
+        assertEq(
+          header.stateReference.l1ToL2MessageTree.nextAvailableLeafIndex,
+          stateReference.l1ToL2MessageTree.nextAvailableLeafIndex,
+          "Invalid l1ToL2MessageTree.nextAvailableLeafIndex"
+        );
+        assertEq(
+          header.stateReference.l1ToL2MessageTree.root,
+          stateReference.l1ToL2MessageTree.root,
+          "Invalid l1ToL2MessageTree.root"
+        );
+
+        // PartialStateReference
+        {
+          DecoderBase.PartialStateReference memory partialStateReference =
+            referenceHeader.stateReference.partialStateReference;
+
+          // NoteHashTree
+          assertEq(
+            header.stateReference.partialStateReference.noteHashTree.nextAvailableLeafIndex,
+            partialStateReference.noteHashTree.nextAvailableLeafIndex,
+            "Invalid noteHashTree.nextAvailableLeafIndex"
+          );
+          assertEq(
+            header.stateReference.partialStateReference.noteHashTree.root,
+            partialStateReference.noteHashTree.root,
+            "Invalid noteHashTree.root"
+          );
+
+          // NullifierTree
+          assertEq(
+            header.stateReference.partialStateReference.nullifierTree.nextAvailableLeafIndex,
+            partialStateReference.nullifierTree.nextAvailableLeafIndex,
+            "Invalid nullifierTree.nextAvailableLeafIndex"
+          );
+          assertEq(
+            header.stateReference.partialStateReference.nullifierTree.root,
+            partialStateReference.nullifierTree.root,
+            "Invalid nullifierTree.root"
+          );
+
+          // ContractTree
+          assertEq(
+            header.stateReference.partialStateReference.contractTree.nextAvailableLeafIndex,
+            partialStateReference.contractTree.nextAvailableLeafIndex,
+            "Invalid contractTree.nextAvailableLeafIndex"
+          );
+          assertEq(
+            header.stateReference.partialStateReference.contractTree.root,
+            partialStateReference.contractTree.root,
+            "Invalid contractTree.root"
+          );
+
+          // PublicDataTree
+          assertEq(
+            header.stateReference.partialStateReference.publicDataTree.nextAvailableLeafIndex,
+            partialStateReference.publicDataTree.nextAvailableLeafIndex,
+            "Invalid publicDataTree.nextAvailableLeafIndex"
+          );
+          assertEq(
+            header.stateReference.partialStateReference.publicDataTree.root,
+            partialStateReference.publicDataTree.root,
+            "Invalid publicDataTree.root"
+          );
+        }
+      }
+
+      assertEq(
+        header.lastArchive.nextAvailableLeafIndex,
+        referenceHeader.lastArchive.nextAvailableLeafIndex,
+        "Invalid lastArchive.nextAvailableLeafIndex"
+      );
+      assertEq(
+        header.lastArchive.root, referenceHeader.lastArchive.root, "Invalid lastArchive.root"
+      );
+      assertEq(header.bodyHash, referenceHeader.bodyHash, "Invalid body hash");
     }
 
     // Messages
diff --git a/l1-contracts/test/decoders/helpers/DecoderHelper.sol b/l1-contracts/test/decoders/helpers/DecoderHelper.sol
new file mode 100644
index 000000000000..bdbc019545d9
--- /dev/null
+++ b/l1-contracts/test/decoders/helpers/DecoderHelper.sol
@@ -0,0 +1,24 @@
+// SPDX-License-Identifier: Apache-2.0
+// Copyright 2023 Aztec Labs.
+pragma solidity >=0.8.18;
+
+import {Decoder} from "../../../src/core/libraries/decoders/Decoder.sol";
+import {Rollup} from "../../../src/core/Rollup.sol";
+
+contract DecoderHelper {
+  function computeConsumables(bytes calldata _body)
+    external
+    pure
+    returns (bytes32, bytes32, bytes32[] memory, bytes32[] memory)
+  {
+    return Decoder.computeConsumables(_body);
+  }
+
+  function computeKernelLogsHash(bytes calldata _kernelLogs)
+    external
+    pure
+    returns (bytes32, uint256)
+  {
+    return Decoder.computeKernelLogsHash(0, _kernelLogs);
+  }
+}
diff --git a/l1-contracts/test/decoders/helpers/HeaderDecoderHelper.sol b/l1-contracts/test/decoders/helpers/HeaderDecoderHelper.sol
new file mode 100644
index 000000000000..5d78b620b2a2
--- /dev/null
+++ b/l1-contracts/test/decoders/helpers/HeaderDecoderHelper.sol
@@ -0,0 +1,12 @@
+// SPDX-License-Identifier: Apache-2.0
+// Copyright 2023 Aztec Labs.
+pragma solidity >=0.8.18;
+
+import {HeaderLib} from "../../../src/core/libraries/HeaderLib.sol";
+
+contract HeaderDecoderHelper {
+  // A wrapper used such that we get "calldata" and not memory
+  function decode(bytes calldata _header) public pure returns (HeaderLib.Header memory) {
+    return HeaderLib.decode(_header);
+  }
+}
diff --git a/l1-contracts/test/decoders/helpers/MessagesDecoderHelper.sol b/l1-contracts/test/decoders/helpers/MessagesDecoderHelper.sol
new file mode 100644
index 000000000000..ce8c866aea82
--- /dev/null
+++ b/l1-contracts/test/decoders/helpers/MessagesDecoderHelper.sol
@@ -0,0 +1,21 @@
+// SPDX-License-Identifier: Apache-2.0
+// Copyright 2023 Aztec Labs.
+pragma solidity >=0.8.18;
+
+import {MessagesDecoder} from "../../../src/core/libraries/decoders/MessagesDecoder.sol";
+
+contract MessagesDecoderHelper {
+  // A wrapper used such that we get "calldata" and not memory
+  function decode(bytes calldata _body)
+    public
+    pure
+    returns (
+      bytes32 l1ToL2MsgsHash,
+      bytes32 l2ToL1MsgsHash,
+      bytes32[] memory l1ToL2Msgs,
+      bytes32[] memory l2ToL1Msgs
+    )
+  {
+    return MessagesDecoder.decode(_body);
+  }
+}
diff --git a/l1-contracts/test/decoders/helpers/TxsDecoderHelper.sol b/l1-contracts/test/decoders/helpers/TxsDecoderHelper.sol
new file mode 100644
index 000000000000..aa7b5e5190d4
--- /dev/null
+++ b/l1-contracts/test/decoders/helpers/TxsDecoderHelper.sol
@@ -0,0 +1,12 @@
+// SPDX-License-Identifier: Apache-2.0
+// Copyright 2023 Aztec Labs.
+pragma solidity >=0.8.18;
+
+import {TxsDecoder} from "../../../src/core/libraries/decoders/TxsDecoder.sol";
+
+contract TxsDecoderHelper {
+  // A wrapper used such that we get "calldata" and not memory
+  function decode(bytes calldata _body) public pure returns (bytes32 txsHash) {
+    return TxsDecoder.decode(_body);
+  }
+}
diff --git a/l1-contracts/test/fixtures/empty_block_0.json b/l1-contracts/test/fixtures/empty_block_0.json
index 71278c67c1e4..69a1059fe905 100644
--- a/l1-contracts/test/fixtures/empty_block_0.json
+++ b/l1-contracts/test/fixtures/empty_block_0.json
@@ -35,13 +35,48 @@
     ]
   },
   "block": {
-    "blockNumber": 1,
-    "startStateHash": "0xc738d05d59876de0510b4270011e7f52341083568b9bafef2324af4d12eca533",
-    "endStateHash": "0x87bffdad8ab435bf2382a7a6cf54d95dbda6e43ff1d3810cc3d1a6a65aa85dd8",
-    "publicInputsHash": "0x2becbeeb3170f323bf0e30641b4b4da3dbf439caf5639a2eef139173a6693f8c",
+    "archive": "0x1a11e8b1d440a44deef8aa8e4eec8f476e780ee6eac2d7d64b09c66b8063ee11",
+    "body": "0x000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000001000000000000000000000000000000000",
     "calldataHash": "0x5b89af3c0d0bf66ac691697d317108e8f51bb8e3217d56f152b80867ad25d4a7",
+    "decodedHeader": {
+      "bodyHash": "0x5b89af3c0d0bf66ac691697d317108e8f51bb8e3217d56f152b80867ad25d4a7",
+      "globalVariables": {
+        "blockNumber": 1,
+        "chainId": 31337,
+        "timestamp": 0,
+        "version": 1
+      },
+      "lastArchive": {
+        "nextAvailableLeafIndex": 1,
+        "root": "0x1a005071a487e4891787073a91504fe6ea55280bc6f65a021fd6f7ca1f10aa02"
+      },
+      "stateReference": {
+        "l1ToL2MessageTree": {
+          "nextAvailableLeafIndex": 16,
+          "root": "0x1864fcdaa80ff2719154fa7c8a9050662972707168d69eac9db6fd3110829f80"
+        },
+        "partialStateReference": {
+          "contractTree": {
+            "nextAvailableLeafIndex": 4,
+            "root": "0x1864fcdaa80ff2719154fa7c8a9050662972707168d69eac9db6fd3110829f80"
+          },
+          "noteHashTree": {
+            "nextAvailableLeafIndex": 256,
+            "root": "0x16642d9ccd8346c403aa4c3fa451178b22534a27035cdaa6ec34ae53b29c50cb"
+          },
+          "nullifierTree": {
+            "nextAvailableLeafIndex": 384,
+            "root": "0x0bcfa3e9f1a8922ee92c6dc964d6595907c1804a86753774322b468f69d4f278"
+          },
+          "publicDataTree": {
+            "nextAvailableLeafIndex": 96,
+            "root": "0x1ed250ed73db6e70805c4efcf0056e8695b79cd3ba418e827c184dee6c6fb0e0"
+          }
+        }
+      }
+    },
+    "header": "0x0000000000000000000000000000000000000000000000000000000000007a690000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000001864fcdaa80ff2719154fa7c8a9050662972707168d69eac9db6fd3110829f800000001016642d9ccd8346c403aa4c3fa451178b22534a27035cdaa6ec34ae53b29c50cb000001000bcfa3e9f1a8922ee92c6dc964d6595907c1804a86753774322b468f69d4f278000001801864fcdaa80ff2719154fa7c8a9050662972707168d69eac9db6fd3110829f80000000041ed250ed73db6e70805c4efcf0056e8695b79cd3ba418e827c184dee6c6fb0e0000000601a005071a487e4891787073a91504fe6ea55280bc6f65a021fd6f7ca1f10aa02000000015b89af3c0d0bf66ac691697d317108e8f51bb8e3217d56f152b80867ad25d4a7",
     "l1ToL2MessagesHash": "0x076a27c79e5ace2a3d47f9dd2e83e4ff6ea8872b3c2218f66c92b89b55f36560",
-    "body": "0x0000000000000000000000000000000000000000000000000000000000007a6900000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000016642d9ccd8346c403aa4c3fa451178b22534a27035cdaa6ec34ae53b29c50cb000000000bcfa3e9f1a8922ee92c6dc964d6595907c1804a86753774322b468f69d4f278000000801864fcdaa80ff2719154fa7c8a9050662972707168d69eac9db6fd3110829f80000000001ed250ed73db6e70805c4efcf0056e8695b79cd3ba418e827c184dee6c6fb0e0000000201864fcdaa80ff2719154fa7c8a9050662972707168d69eac9db6fd3110829f80000000001a005071a487e4891787073a91504fe6ea55280bc6f65a021fd6f7ca1f10aa020000000116642d9ccd8346c403aa4c3fa451178b22534a27035cdaa6ec34ae53b29c50cb000001000bcfa3e9f1a8922ee92c6dc964d6595907c1804a86753774322b468f69d4f278000001801864fcdaa80ff2719154fa7c8a9050662972707168d69eac9db6fd3110829f80000000041ed250ed73db6e70805c4efcf0056e8695b79cd3ba418e827c184dee6c6fb0e0000000601864fcdaa80ff2719154fa7c8a9050662972707168d69eac9db6fd3110829f80000000101a11e8b1d440a44deef8aa8e4eec8f476e780ee6eac2d7d64b09c66b8063ee1100000002000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000001000000000000000000000000000000000",
-    "timestamp": 0
+    "publicInputsHash": "0x1476d6b0483d0d5fc4c9d3b04f50105d97a06bb01054ec7acccac3ff6c85f960"
   }
 }
\ No newline at end of file
diff --git a/l1-contracts/test/fixtures/empty_block_1.json b/l1-contracts/test/fixtures/empty_block_1.json
index d09682cffc1e..006b03407f57 100644
--- a/l1-contracts/test/fixtures/empty_block_1.json
+++ b/l1-contracts/test/fixtures/empty_block_1.json
@@ -35,13 +35,48 @@
     ]
   },
   "block": {
-    "blockNumber": 2,
-    "startStateHash": "0x87bffdad8ab435bf2382a7a6cf54d95dbda6e43ff1d3810cc3d1a6a65aa85dd8",
-    "endStateHash": "0xe6d5706f6089a53a07f19afc1f32f6491201c964430640256a526ce9155d4766",
-    "publicInputsHash": "0x12f4fc1761991304cfc810bfa9d4a2928b1a536c5ba2f0f6f943f16ed8163312",
+    "archive": "0x01a7192428c21e1c55be4d35e253b2f30a48c4d7fdb3f4048d208986707b7906",
+    "body": "0x000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000001000000000000000000000000000000000",
     "calldataHash": "0x5b89af3c0d0bf66ac691697d317108e8f51bb8e3217d56f152b80867ad25d4a7",
+    "decodedHeader": {
+      "bodyHash": "0x5b89af3c0d0bf66ac691697d317108e8f51bb8e3217d56f152b80867ad25d4a7",
+      "globalVariables": {
+        "blockNumber": 2,
+        "chainId": 31337,
+        "timestamp": 1705501940,
+        "version": 1
+      },
+      "lastArchive": {
+        "nextAvailableLeafIndex": 2,
+        "root": "0x1a11e8b1d440a44deef8aa8e4eec8f476e780ee6eac2d7d64b09c66b8063ee11"
+      },
+      "stateReference": {
+        "l1ToL2MessageTree": {
+          "nextAvailableLeafIndex": 32,
+          "root": "0x1864fcdaa80ff2719154fa7c8a9050662972707168d69eac9db6fd3110829f80"
+        },
+        "partialStateReference": {
+          "contractTree": {
+            "nextAvailableLeafIndex": 8,
+            "root": "0x1864fcdaa80ff2719154fa7c8a9050662972707168d69eac9db6fd3110829f80"
+          },
+          "noteHashTree": {
+            "nextAvailableLeafIndex": 512,
+            "root": "0x16642d9ccd8346c403aa4c3fa451178b22534a27035cdaa6ec34ae53b29c50cb"
+          },
+          "nullifierTree": {
+            "nextAvailableLeafIndex": 640,
+            "root": "0x0bcfa3e9f1a8922ee92c6dc964d6595907c1804a86753774322b468f69d4f278"
+          },
+          "publicDataTree": {
+            "nextAvailableLeafIndex": 160,
+            "root": "0x1ed250ed73db6e70805c4efcf0056e8695b79cd3ba418e827c184dee6c6fb0e0"
+          }
+        }
+      }
+    },
+    "header": "0x0000000000000000000000000000000000000000000000000000000000007a69000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000065a7e4f41864fcdaa80ff2719154fa7c8a9050662972707168d69eac9db6fd3110829f800000002016642d9ccd8346c403aa4c3fa451178b22534a27035cdaa6ec34ae53b29c50cb000002000bcfa3e9f1a8922ee92c6dc964d6595907c1804a86753774322b468f69d4f278000002801864fcdaa80ff2719154fa7c8a9050662972707168d69eac9db6fd3110829f80000000081ed250ed73db6e70805c4efcf0056e8695b79cd3ba418e827c184dee6c6fb0e0000000a01a11e8b1d440a44deef8aa8e4eec8f476e780ee6eac2d7d64b09c66b8063ee11000000025b89af3c0d0bf66ac691697d317108e8f51bb8e3217d56f152b80867ad25d4a7",
     "l1ToL2MessagesHash": "0x076a27c79e5ace2a3d47f9dd2e83e4ff6ea8872b3c2218f66c92b89b55f36560",
-    "body": "0x0000000000000000000000000000000000000000000000000000000000007a690000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000659eb26916642d9ccd8346c403aa4c3fa451178b22534a27035cdaa6ec34ae53b29c50cb000001000bcfa3e9f1a8922ee92c6dc964d6595907c1804a86753774322b468f69d4f278000001801864fcdaa80ff2719154fa7c8a9050662972707168d69eac9db6fd3110829f80000000041ed250ed73db6e70805c4efcf0056e8695b79cd3ba418e827c184dee6c6fb0e0000000601864fcdaa80ff2719154fa7c8a9050662972707168d69eac9db6fd3110829f80000000101a11e8b1d440a44deef8aa8e4eec8f476e780ee6eac2d7d64b09c66b8063ee110000000216642d9ccd8346c403aa4c3fa451178b22534a27035cdaa6ec34ae53b29c50cb000002000bcfa3e9f1a8922ee92c6dc964d6595907c1804a86753774322b468f69d4f278000002801864fcdaa80ff2719154fa7c8a9050662972707168d69eac9db6fd3110829f80000000081ed250ed73db6e70805c4efcf0056e8695b79cd3ba418e827c184dee6c6fb0e0000000a01864fcdaa80ff2719154fa7c8a9050662972707168d69eac9db6fd3110829f80000000201edec46da82748ab9159023272fe1c3d4a5533cd7f2bfb4aea950670ac42c7c900000003000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000001000000000000000000000000000000000",
-    "timestamp": 1704899177
+    "publicInputsHash": "0x0730fec86325dbb2c6cb108f50628cf32f22f526411f8ef8e48fd8be5f43f536"
   }
 }
\ No newline at end of file
diff --git a/l1-contracts/test/fixtures/mixed_block_0.json b/l1-contracts/test/fixtures/mixed_block_0.json
index 50ff83dd3acd..b9e7aea554e4 100644
--- a/l1-contracts/test/fixtures/mixed_block_0.json
+++ b/l1-contracts/test/fixtures/mixed_block_0.json
@@ -52,13 +52,48 @@
     ]
   },
   "block": {
-    "blockNumber": 1,
-    "startStateHash": "0xc738d05d59876de0510b4270011e7f52341083568b9bafef2324af4d12eca533",
-    "endStateHash": "0xed09b43d862f8628640ddc03012c80962c0bab9bf63c4962b7b1ef80e80db89e",
-    "publicInputsHash": "0x0dc5c55cd235083803f33a86381f9c1552213c0cb89d33d8fd35d9f1b617788f",
-    "calldataHash": "0x094b6884a31f1505b1f60a4f96a44b60b24647d3edcf532b4a30c242eb75a894",
+    "archive": "0x1f1de772c009f5b1660876343eb57b7a676a84c695b0c526de2f238c41810907",
+    "body": "0x000001000000000000000000000000000000000000000000000000000000000000000140000000000000000000000000000000000000000000000000000000000000014100000000000000000000000000000000000000000000000000000000000001420000000000000000000000000000000000000000000000000000000000000143000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000001450000000000000000000000000000000000000000000000000000000000000146000000000000000000000000000000000000000000000000000000000000014700000000000000000000000000000000000000000000000000000000000001480000000000000000000000000000000000000000000000000000000000000149000000000000000000000000000000000000000000000000000000000000014a000000000000000000000000000000000000000000000000000000000000014b000000000000000000000000000000000000000000000000000000000000014c000000000000000000000000000000000000000000000000000000000000014d000000000000000000000000000000000000000000000000000000000000014e000000000000000000000000000000000000000000000000000000000000014f0000000000000000000000000000000000000000000000000000000000000150000000000000000000000000000000000000000000000000000000000000015100000000000000000000000000000000000000000000000000000000000001520000000000000000000000000000000000000000000000000000000000000153000000000000000000000000000000000000000000000000000000000000015400000000000000000000000000000000000000000000000000000000000001550000000000000000000000000000000000000000000000000000000000000156000000000000000000000000000000000000000000000000000000000000015700000000000000000000000000000000000000000000000000000000000001580000000000000000000000000000000000000000000000000000000000000159000000000000000000000000000000000000000000000000000000000000015a000000000000000000000000000000000000000000000000000000000000015b000000000000000000000000000000000000000000000000000000000000015c000000000000000000000000000000000000000000000000000000000000015d000000000000000000000000000000000000000000000000000000000000015e000000000000000000000000000000000000000000000000000000000000015f0000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000001620000000000000000000000000000000000000000000000000000000000000163000000000000000000000000000000000000000000000000000000000000016400000000000000000000000000000000000000000000000000000000000001650000000000000000000000000000000000000000000000000000000000000166000000000000000000000000000000000000000000000000000000000000016700000000000000000000000000000000000000000000000000000000000001680000000000000000000000000000000000000000000000000000000000000169000000000000000000000000000000000000000000000000000000000000016a000000000000000000000000000000000000000000000000000000000000016b000000000000000000000000000000000000000000000000000000000000016c000000000000000000000000000000000000000000000000000000000000016d000000000000000000000000000000000000000000000000000000000000016e000000000000000000000000000000000000000000000000000000000000016f0000000000000000000000000000000000000000000000000000000000000170000000000000000000000000000000000000000000000000000000000000017100000000000000000000000000000000000000000000000000000000000001720000000000000000000000000000000000000000000000000000000000000173000000000000000000000000000000000000000000000000000000000000017400000000000000000000000000000000000000000000000000000000000001750000000000000000000000000000000000000000000000000000000000000176000000000000000000000000000000000000000000000000000000000000017700000000000000000000000000000000000000000000000000000000000001780000000000000000000000000000000000000000000000000000000000000179000000000000000000000000000000000000000000000000000000000000017a000000000000000000000000000000000000000000000000000000000000017b000000000000000000000000000000000000000000000000000000000000017c000000000000000000000000000000000000000000000000000000000000017d000000000000000000000000000000000000000000000000000000000000017e000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000000000000000000000000000000000000000000180000000000000000000000000000000000000000000000000000000000000018100000000000000000000000000000000000000000000000000000000000001820000000000000000000000000000000000000000000000000000000000000183000000000000000000000000000000000000000000000000000000000000018400000000000000000000000000000000000000000000000000000000000001850000000000000000000000000000000000000000000000000000000000000186000000000000000000000000000000000000000000000000000000000000018700000000000000000000000000000000000000000000000000000000000001880000000000000000000000000000000000000000000000000000000000000189000000000000000000000000000000000000000000000000000000000000018a000000000000000000000000000000000000000000000000000000000000018b000000000000000000000000000000000000000000000000000000000000018c000000000000000000000000000000000000000000000000000000000000018d000000000000000000000000000000000000000000000000000000000000018e000000000000000000000000000000000000000000000000000000000000018f0000000000000000000000000000000000000000000000000000000000000190000000000000000000000000000000000000000000000000000000000000019100000000000000000000000000000000000000000000000000000000000001920000000000000000000000000000000000000000000000000000000000000193000000000000000000000000000000000000000000000000000000000000019400000000000000000000000000000000000000000000000000000000000001950000000000000000000000000000000000000000000000000000000000000196000000000000000000000000000000000000000000000000000000000000019700000000000000000000000000000000000000000000000000000000000001980000000000000000000000000000000000000000000000000000000000000199000000000000000000000000000000000000000000000000000000000000019a000000000000000000000000000000000000000000000000000000000000019b000000000000000000000000000000000000000000000000000000000000019c000000000000000000000000000000000000000000000000000000000000019d000000000000000000000000000000000000000000000000000000000000019e000000000000000000000000000000000000000000000000000000000000019f00000000000000000000000000000000000000000000000000000000000001a000000000000000000000000000000000000000000000000000000000000001a100000000000000000000000000000000000000000000000000000000000001a200000000000000000000000000000000000000000000000000000000000001a300000000000000000000000000000000000000000000000000000000000001a400000000000000000000000000000000000000000000000000000000000001a500000000000000000000000000000000000000000000000000000000000001a600000000000000000000000000000000000000000000000000000000000001a700000000000000000000000000000000000000000000000000000000000001a800000000000000000000000000000000000000000000000000000000000001a900000000000000000000000000000000000000000000000000000000000001aa00000000000000000000000000000000000000000000000000000000000001ab00000000000000000000000000000000000000000000000000000000000001ac00000000000000000000000000000000000000000000000000000000000001ad00000000000000000000000000000000000000000000000000000000000001ae00000000000000000000000000000000000000000000000000000000000001af00000000000000000000000000000000000000000000000000000000000001b000000000000000000000000000000000000000000000000000000000000001b100000000000000000000000000000000000000000000000000000000000001b200000000000000000000000000000000000000000000000000000000000001b300000000000000000000000000000000000000000000000000000000000001b400000000000000000000000000000000000000000000000000000000000001b500000000000000000000000000000000000000000000000000000000000001b600000000000000000000000000000000000000000000000000000000000001b700000000000000000000000000000000000000000000000000000000000001b800000000000000000000000000000000000000000000000000000000000001b900000000000000000000000000000000000000000000000000000000000001ba00000000000000000000000000000000000000000000000000000000000001bb00000000000000000000000000000000000000000000000000000000000001bc00000000000000000000000000000000000000000000000000000000000001bd00000000000000000000000000000000000000000000000000000000000001be00000000000000000000000000000000000000000000000000000000000001bf00000000000000000000000000000000000000000000000000000000000001c000000000000000000000000000000000000000000000000000000000000001c100000000000000000000000000000000000000000000000000000000000001c200000000000000000000000000000000000000000000000000000000000001c300000000000000000000000000000000000000000000000000000000000001c400000000000000000000000000000000000000000000000000000000000001c500000000000000000000000000000000000000000000000000000000000001c600000000000000000000000000000000000000000000000000000000000001c700000000000000000000000000000000000000000000000000000000000001c800000000000000000000000000000000000000000000000000000000000001c900000000000000000000000000000000000000000000000000000000000001ca00000000000000000000000000000000000000000000000000000000000001cb00000000000000000000000000000000000000000000000000000000000001cc00000000000000000000000000000000000000000000000000000000000001cd00000000000000000000000000000000000000000000000000000000000001ce00000000000000000000000000000000000000000000000000000000000001cf00000000000000000000000000000000000000000000000000000000000001d000000000000000000000000000000000000000000000000000000000000001d100000000000000000000000000000000000000000000000000000000000001d200000000000000000000000000000000000000000000000000000000000001d300000000000000000000000000000000000000000000000000000000000001d400000000000000000000000000000000000000000000000000000000000001d500000000000000000000000000000000000000000000000000000000000001d600000000000000000000000000000000000000000000000000000000000001d700000000000000000000000000000000000000000000000000000000000001d800000000000000000000000000000000000000000000000000000000000001d900000000000000000000000000000000000000000000000000000000000001da00000000000000000000000000000000000000000000000000000000000001db00000000000000000000000000000000000000000000000000000000000001dc00000000000000000000000000000000000000000000000000000000000001dd00000000000000000000000000000000000000000000000000000000000001de00000000000000000000000000000000000000000000000000000000000001df00000000000000000000000000000000000000000000000000000000000001e000000000000000000000000000000000000000000000000000000000000001e100000000000000000000000000000000000000000000000000000000000001e200000000000000000000000000000000000000000000000000000000000001e300000000000000000000000000000000000000000000000000000000000001e400000000000000000000000000000000000000000000000000000000000001e500000000000000000000000000000000000000000000000000000000000001e600000000000000000000000000000000000000000000000000000000000001e700000000000000000000000000000000000000000000000000000000000001e800000000000000000000000000000000000000000000000000000000000001e900000000000000000000000000000000000000000000000000000000000001ea00000000000000000000000000000000000000000000000000000000000001eb00000000000000000000000000000000000000000000000000000000000001ec00000000000000000000000000000000000000000000000000000000000001ed00000000000000000000000000000000000000000000000000000000000001ee00000000000000000000000000000000000000000000000000000000000001ef00000000000000000000000000000000000000000000000000000000000001f000000000000000000000000000000000000000000000000000000000000001f100000000000000000000000000000000000000000000000000000000000001f200000000000000000000000000000000000000000000000000000000000001f300000000000000000000000000000000000000000000000000000000000001f400000000000000000000000000000000000000000000000000000000000001f500000000000000000000000000000000000000000000000000000000000001f600000000000000000000000000000000000000000000000000000000000001f700000000000000000000000000000000000000000000000000000000000001f800000000000000000000000000000000000000000000000000000000000001f900000000000000000000000000000000000000000000000000000000000001fa00000000000000000000000000000000000000000000000000000000000001fb00000000000000000000000000000000000000000000000000000000000001fc00000000000000000000000000000000000000000000000000000000000001fd00000000000000000000000000000000000000000000000000000000000001fe00000000000000000000000000000000000000000000000000000000000001ff0000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020100000000000000000000000000000000000000000000000000000000000002020000000000000000000000000000000000000000000000000000000000000203000000000000000000000000000000000000000000000000000000000000020400000000000000000000000000000000000000000000000000000000000002050000000000000000000000000000000000000000000000000000000000000206000000000000000000000000000000000000000000000000000000000000020700000000000000000000000000000000000000000000000000000000000002080000000000000000000000000000000000000000000000000000000000000209000000000000000000000000000000000000000000000000000000000000020a000000000000000000000000000000000000000000000000000000000000020b000000000000000000000000000000000000000000000000000000000000020c000000000000000000000000000000000000000000000000000000000000020d000000000000000000000000000000000000000000000000000000000000020e000000000000000000000000000000000000000000000000000000000000020f0000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000021100000000000000000000000000000000000000000000000000000000000002120000000000000000000000000000000000000000000000000000000000000213000000000000000000000000000000000000000000000000000000000000021400000000000000000000000000000000000000000000000000000000000002150000000000000000000000000000000000000000000000000000000000000216000000000000000000000000000000000000000000000000000000000000021700000000000000000000000000000000000000000000000000000000000002180000000000000000000000000000000000000000000000000000000000000219000000000000000000000000000000000000000000000000000000000000021a000000000000000000000000000000000000000000000000000000000000021b000000000000000000000000000000000000000000000000000000000000021c000000000000000000000000000000000000000000000000000000000000021d000000000000000000000000000000000000000000000000000000000000021e000000000000000000000000000000000000000000000000000000000000021f0000000000000000000000000000000000000000000000000000000000000220000000000000000000000000000000000000000000000000000000000000022100000000000000000000000000000000000000000000000000000000000002220000000000000000000000000000000000000000000000000000000000000223000000000000000000000000000000000000000000000000000000000000022400000000000000000000000000000000000000000000000000000000000002250000000000000000000000000000000000000000000000000000000000000226000000000000000000000000000000000000000000000000000000000000022700000000000000000000000000000000000000000000000000000000000002280000000000000000000000000000000000000000000000000000000000000229000000000000000000000000000000000000000000000000000000000000022a000000000000000000000000000000000000000000000000000000000000022b000000000000000000000000000000000000000000000000000000000000022c000000000000000000000000000000000000000000000000000000000000022d000000000000000000000000000000000000000000000000000000000000022e000000000000000000000000000000000000000000000000000000000000022f0000000000000000000000000000000000000000000000000000000000000230000000000000000000000000000000000000000000000000000000000000023100000000000000000000000000000000000000000000000000000000000002320000000000000000000000000000000000000000000000000000000000000233000000000000000000000000000000000000000000000000000000000000023400000000000000000000000000000000000000000000000000000000000002350000000000000000000000000000000000000000000000000000000000000236000000000000000000000000000000000000000000000000000000000000023700000000000000000000000000000000000000000000000000000000000002380000000000000000000000000000000000000000000000000000000000000239000000000000000000000000000000000000000000000000000000000000023a000000000000000000000000000000000000000000000000000000000000023b000000000000000000000000000000000000000000000000000000000000023c000000000000000000000000000000000000000000000000000000000000023d000000000000000000000000000000000000000000000000000000000000023e000000000000000000000000000000000000000000000000000000000000023f000001000000000000000000000000000000000000000000000000000000000000000240000000000000000000000000000000000000000000000000000000000000024100000000000000000000000000000000000000000000000000000000000002420000000000000000000000000000000000000000000000000000000000000243000000000000000000000000000000000000000000000000000000000000024400000000000000000000000000000000000000000000000000000000000002450000000000000000000000000000000000000000000000000000000000000246000000000000000000000000000000000000000000000000000000000000024700000000000000000000000000000000000000000000000000000000000002480000000000000000000000000000000000000000000000000000000000000249000000000000000000000000000000000000000000000000000000000000024a000000000000000000000000000000000000000000000000000000000000024b000000000000000000000000000000000000000000000000000000000000024c000000000000000000000000000000000000000000000000000000000000024d000000000000000000000000000000000000000000000000000000000000024e000000000000000000000000000000000000000000000000000000000000024f0000000000000000000000000000000000000000000000000000000000000250000000000000000000000000000000000000000000000000000000000000025100000000000000000000000000000000000000000000000000000000000002520000000000000000000000000000000000000000000000000000000000000253000000000000000000000000000000000000000000000000000000000000025400000000000000000000000000000000000000000000000000000000000002550000000000000000000000000000000000000000000000000000000000000256000000000000000000000000000000000000000000000000000000000000025700000000000000000000000000000000000000000000000000000000000002580000000000000000000000000000000000000000000000000000000000000259000000000000000000000000000000000000000000000000000000000000025a000000000000000000000000000000000000000000000000000000000000025b000000000000000000000000000000000000000000000000000000000000025c000000000000000000000000000000000000000000000000000000000000025d000000000000000000000000000000000000000000000000000000000000025e000000000000000000000000000000000000000000000000000000000000025f0000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000026100000000000000000000000000000000000000000000000000000000000002620000000000000000000000000000000000000000000000000000000000000263000000000000000000000000000000000000000000000000000000000000026400000000000000000000000000000000000000000000000000000000000002650000000000000000000000000000000000000000000000000000000000000266000000000000000000000000000000000000000000000000000000000000026700000000000000000000000000000000000000000000000000000000000002680000000000000000000000000000000000000000000000000000000000000269000000000000000000000000000000000000000000000000000000000000026a000000000000000000000000000000000000000000000000000000000000026b000000000000000000000000000000000000000000000000000000000000026c000000000000000000000000000000000000000000000000000000000000026d000000000000000000000000000000000000000000000000000000000000026e000000000000000000000000000000000000000000000000000000000000026f0000000000000000000000000000000000000000000000000000000000000270000000000000000000000000000000000000000000000000000000000000027100000000000000000000000000000000000000000000000000000000000002720000000000000000000000000000000000000000000000000000000000000273000000000000000000000000000000000000000000000000000000000000027400000000000000000000000000000000000000000000000000000000000002750000000000000000000000000000000000000000000000000000000000000276000000000000000000000000000000000000000000000000000000000000027700000000000000000000000000000000000000000000000000000000000002780000000000000000000000000000000000000000000000000000000000000279000000000000000000000000000000000000000000000000000000000000027a000000000000000000000000000000000000000000000000000000000000027b000000000000000000000000000000000000000000000000000000000000027c000000000000000000000000000000000000000000000000000000000000027d000000000000000000000000000000000000000000000000000000000000027e00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000280000000000000000000000000000000000000000000000000000000000000028100000000000000000000000000000000000000000000000000000000000002820000000000000000000000000000000000000000000000000000000000000283000000000000000000000000000000000000000000000000000000000000028400000000000000000000000000000000000000000000000000000000000002850000000000000000000000000000000000000000000000000000000000000286000000000000000000000000000000000000000000000000000000000000028700000000000000000000000000000000000000000000000000000000000002880000000000000000000000000000000000000000000000000000000000000289000000000000000000000000000000000000000000000000000000000000028a000000000000000000000000000000000000000000000000000000000000028b000000000000000000000000000000000000000000000000000000000000028c000000000000000000000000000000000000000000000000000000000000028d000000000000000000000000000000000000000000000000000000000000028e000000000000000000000000000000000000000000000000000000000000028f0000000000000000000000000000000000000000000000000000000000000290000000000000000000000000000000000000000000000000000000000000029100000000000000000000000000000000000000000000000000000000000002920000000000000000000000000000000000000000000000000000000000000293000000000000000000000000000000000000000000000000000000000000029400000000000000000000000000000000000000000000000000000000000002950000000000000000000000000000000000000000000000000000000000000296000000000000000000000000000000000000000000000000000000000000029700000000000000000000000000000000000000000000000000000000000002980000000000000000000000000000000000000000000000000000000000000299000000000000000000000000000000000000000000000000000000000000029a000000000000000000000000000000000000000000000000000000000000029b000000000000000000000000000000000000000000000000000000000000029c000000000000000000000000000000000000000000000000000000000000029d000000000000000000000000000000000000000000000000000000000000029e000000000000000000000000000000000000000000000000000000000000029f00000000000000000000000000000000000000000000000000000000000002a000000000000000000000000000000000000000000000000000000000000002a100000000000000000000000000000000000000000000000000000000000002a200000000000000000000000000000000000000000000000000000000000002a300000000000000000000000000000000000000000000000000000000000002a400000000000000000000000000000000000000000000000000000000000002a500000000000000000000000000000000000000000000000000000000000002a600000000000000000000000000000000000000000000000000000000000002a700000000000000000000000000000000000000000000000000000000000002a800000000000000000000000000000000000000000000000000000000000002a900000000000000000000000000000000000000000000000000000000000002aa00000000000000000000000000000000000000000000000000000000000002ab00000000000000000000000000000000000000000000000000000000000002ac00000000000000000000000000000000000000000000000000000000000002ad00000000000000000000000000000000000000000000000000000000000002ae00000000000000000000000000000000000000000000000000000000000002af00000000000000000000000000000000000000000000000000000000000002b000000000000000000000000000000000000000000000000000000000000002b100000000000000000000000000000000000000000000000000000000000002b200000000000000000000000000000000000000000000000000000000000002b300000000000000000000000000000000000000000000000000000000000002b400000000000000000000000000000000000000000000000000000000000002b500000000000000000000000000000000000000000000000000000000000002b600000000000000000000000000000000000000000000000000000000000002b700000000000000000000000000000000000000000000000000000000000002b800000000000000000000000000000000000000000000000000000000000002b900000000000000000000000000000000000000000000000000000000000002ba00000000000000000000000000000000000000000000000000000000000002bb00000000000000000000000000000000000000000000000000000000000002bc00000000000000000000000000000000000000000000000000000000000002bd00000000000000000000000000000000000000000000000000000000000002be000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002c000000000000000000000000000000000000000000000000000000000000002c100000000000000000000000000000000000000000000000000000000000002c200000000000000000000000000000000000000000000000000000000000002c300000000000000000000000000000000000000000000000000000000000002c400000000000000000000000000000000000000000000000000000000000002c500000000000000000000000000000000000000000000000000000000000002c600000000000000000000000000000000000000000000000000000000000002c700000000000000000000000000000000000000000000000000000000000002c800000000000000000000000000000000000000000000000000000000000002c900000000000000000000000000000000000000000000000000000000000002ca00000000000000000000000000000000000000000000000000000000000002cb00000000000000000000000000000000000000000000000000000000000002cc00000000000000000000000000000000000000000000000000000000000002cd00000000000000000000000000000000000000000000000000000000000002ce00000000000000000000000000000000000000000000000000000000000002cf00000000000000000000000000000000000000000000000000000000000002d000000000000000000000000000000000000000000000000000000000000002d100000000000000000000000000000000000000000000000000000000000002d200000000000000000000000000000000000000000000000000000000000002d300000000000000000000000000000000000000000000000000000000000002d400000000000000000000000000000000000000000000000000000000000002d500000000000000000000000000000000000000000000000000000000000002d600000000000000000000000000000000000000000000000000000000000002d700000000000000000000000000000000000000000000000000000000000002d800000000000000000000000000000000000000000000000000000000000002d900000000000000000000000000000000000000000000000000000000000002da00000000000000000000000000000000000000000000000000000000000002db00000000000000000000000000000000000000000000000000000000000002dc00000000000000000000000000000000000000000000000000000000000002dd00000000000000000000000000000000000000000000000000000000000002de00000000000000000000000000000000000000000000000000000000000002df00000000000000000000000000000000000000000000000000000000000002e000000000000000000000000000000000000000000000000000000000000002e100000000000000000000000000000000000000000000000000000000000002e200000000000000000000000000000000000000000000000000000000000002e300000000000000000000000000000000000000000000000000000000000002e400000000000000000000000000000000000000000000000000000000000002e500000000000000000000000000000000000000000000000000000000000002e600000000000000000000000000000000000000000000000000000000000002e700000000000000000000000000000000000000000000000000000000000002e800000000000000000000000000000000000000000000000000000000000002e900000000000000000000000000000000000000000000000000000000000002ea00000000000000000000000000000000000000000000000000000000000002eb00000000000000000000000000000000000000000000000000000000000002ec00000000000000000000000000000000000000000000000000000000000002ed00000000000000000000000000000000000000000000000000000000000002ee00000000000000000000000000000000000000000000000000000000000002ef00000000000000000000000000000000000000000000000000000000000002f000000000000000000000000000000000000000000000000000000000000002f100000000000000000000000000000000000000000000000000000000000002f200000000000000000000000000000000000000000000000000000000000002f300000000000000000000000000000000000000000000000000000000000002f400000000000000000000000000000000000000000000000000000000000002f500000000000000000000000000000000000000000000000000000000000002f600000000000000000000000000000000000000000000000000000000000002f700000000000000000000000000000000000000000000000000000000000002f800000000000000000000000000000000000000000000000000000000000002f900000000000000000000000000000000000000000000000000000000000002fa00000000000000000000000000000000000000000000000000000000000002fb00000000000000000000000000000000000000000000000000000000000002fc00000000000000000000000000000000000000000000000000000000000002fd00000000000000000000000000000000000000000000000000000000000002fe00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000030100000000000000000000000000000000000000000000000000000000000003020000000000000000000000000000000000000000000000000000000000000303000000000000000000000000000000000000000000000000000000000000030400000000000000000000000000000000000000000000000000000000000003050000000000000000000000000000000000000000000000000000000000000306000000000000000000000000000000000000000000000000000000000000030700000000000000000000000000000000000000000000000000000000000003080000000000000000000000000000000000000000000000000000000000000309000000000000000000000000000000000000000000000000000000000000030a000000000000000000000000000000000000000000000000000000000000030b000000000000000000000000000000000000000000000000000000000000030c000000000000000000000000000000000000000000000000000000000000030d000000000000000000000000000000000000000000000000000000000000030e000000000000000000000000000000000000000000000000000000000000030f0000000000000000000000000000000000000000000000000000000000000310000000000000000000000000000000000000000000000000000000000000031100000000000000000000000000000000000000000000000000000000000003120000000000000000000000000000000000000000000000000000000000000313000000000000000000000000000000000000000000000000000000000000031400000000000000000000000000000000000000000000000000000000000003150000000000000000000000000000000000000000000000000000000000000316000000000000000000000000000000000000000000000000000000000000031700000000000000000000000000000000000000000000000000000000000003180000000000000000000000000000000000000000000000000000000000000319000000000000000000000000000000000000000000000000000000000000031a000000000000000000000000000000000000000000000000000000000000031b000000000000000000000000000000000000000000000000000000000000031c000000000000000000000000000000000000000000000000000000000000031d000000000000000000000000000000000000000000000000000000000000031e000000000000000000000000000000000000000000000000000000000000031f0000000000000000000000000000000000000000000000000000000000000320000000000000000000000000000000000000000000000000000000000000032100000000000000000000000000000000000000000000000000000000000003220000000000000000000000000000000000000000000000000000000000000323000000000000000000000000000000000000000000000000000000000000032400000000000000000000000000000000000000000000000000000000000003250000000000000000000000000000000000000000000000000000000000000326000000000000000000000000000000000000000000000000000000000000032700000000000000000000000000000000000000000000000000000000000003280000000000000000000000000000000000000000000000000000000000000329000000000000000000000000000000000000000000000000000000000000032a000000000000000000000000000000000000000000000000000000000000032b000000000000000000000000000000000000000000000000000000000000032c000000000000000000000000000000000000000000000000000000000000032d000000000000000000000000000000000000000000000000000000000000032e000000000000000000000000000000000000000000000000000000000000032f0000000000000000000000000000000000000000000000000000000000000330000000000000000000000000000000000000000000000000000000000000033100000000000000000000000000000000000000000000000000000000000003320000000000000000000000000000000000000000000000000000000000000333000000000000000000000000000000000000000000000000000000000000033400000000000000000000000000000000000000000000000000000000000003350000000000000000000000000000000000000000000000000000000000000336000000000000000000000000000000000000000000000000000000000000033700000000000000000000000000000000000000000000000000000000000003380000000000000000000000000000000000000000000000000000000000000339000000000000000000000000000000000000000000000000000000000000033a000000000000000000000000000000000000000000000000000000000000033b000000000000000000000000000000000000000000000000000000000000033c000000000000000000000000000000000000000000000000000000000000033d000000000000000000000000000000000000000000000000000000000000033e0000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000540000000000000000000000000000000000000000000000000000000000000054a0000000000000000000000000000000000000000000000000000000000000541000000000000000000000000000000000000000000000000000000000000054b0000000000000000000000000000000000000000000000000000000000000542000000000000000000000000000000000000000000000000000000000000054c0000000000000000000000000000000000000000000000000000000000000543000000000000000000000000000000000000000000000000000000000000054d0000000000000000000000000000000000000000000000000000000000000544000000000000000000000000000000000000000000000000000000000000054e0000000000000000000000000000000000000000000000000000000000000545000000000000000000000000000000000000000000000000000000000000054f00000000000000000000000000000000000000000000000000000000000005460000000000000000000000000000000000000000000000000000000000000550000000000000000000000000000000000000000000000000000000000000054700000000000000000000000000000000000000000000000000000000000005510000000000000000000000000000000000000000000000000000000000000548000000000000000000000000000000000000000000000000000000000000055200000000000000000000000000000000000000000000000000000000000005490000000000000000000000000000000000000000000000000000000000000553000000000000000000000000000000000000000000000000000000000000054a0000000000000000000000000000000000000000000000000000000000000554000000000000000000000000000000000000000000000000000000000000054b0000000000000000000000000000000000000000000000000000000000000555000000000000000000000000000000000000000000000000000000000000054c0000000000000000000000000000000000000000000000000000000000000556000000000000000000000000000000000000000000000000000000000000054d0000000000000000000000000000000000000000000000000000000000000557000000000000000000000000000000000000000000000000000000000000054e0000000000000000000000000000000000000000000000000000000000000558000000000000000000000000000000000000000000000000000000000000054f00000000000000000000000000000000000000000000000000000000000005590000000000000000000000000000000000000000000000000000000000000580000000000000000000000000000000000000000000000000000000000000058a0000000000000000000000000000000000000000000000000000000000000581000000000000000000000000000000000000000000000000000000000000058b0000000000000000000000000000000000000000000000000000000000000582000000000000000000000000000000000000000000000000000000000000058c0000000000000000000000000000000000000000000000000000000000000583000000000000000000000000000000000000000000000000000000000000058d0000000000000000000000000000000000000000000000000000000000000584000000000000000000000000000000000000000000000000000000000000058e0000000000000000000000000000000000000000000000000000000000000585000000000000000000000000000000000000000000000000000000000000058f00000000000000000000000000000000000000000000000000000000000005860000000000000000000000000000000000000000000000000000000000000590000000000000000000000000000000000000000000000000000000000000058700000000000000000000000000000000000000000000000000000000000005910000000000000000000000000000000000000000000000000000000000000588000000000000000000000000000000000000000000000000000000000000059200000000000000000000000000000000000000000000000000000000000005890000000000000000000000000000000000000000000000000000000000000593000000000000000000000000000000000000000000000000000000000000058a0000000000000000000000000000000000000000000000000000000000000594000000000000000000000000000000000000000000000000000000000000058b0000000000000000000000000000000000000000000000000000000000000595000000000000000000000000000000000000000000000000000000000000058c0000000000000000000000000000000000000000000000000000000000000596000000000000000000000000000000000000000000000000000000000000058d0000000000000000000000000000000000000000000000000000000000000597000000000000000000000000000000000000000000000000000000000000058e0000000000000000000000000000000000000000000000000000000000000598000000000000000000000000000000000000000000000000000000000000058f000000000000000000000000000000000000000000000000000000000000059900000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000005ca00000000000000000000000000000000000000000000000000000000000005c100000000000000000000000000000000000000000000000000000000000005cb00000000000000000000000000000000000000000000000000000000000005c200000000000000000000000000000000000000000000000000000000000005cc00000000000000000000000000000000000000000000000000000000000005c300000000000000000000000000000000000000000000000000000000000005cd00000000000000000000000000000000000000000000000000000000000005c400000000000000000000000000000000000000000000000000000000000005ce00000000000000000000000000000000000000000000000000000000000005c500000000000000000000000000000000000000000000000000000000000005cf00000000000000000000000000000000000000000000000000000000000005c600000000000000000000000000000000000000000000000000000000000005d000000000000000000000000000000000000000000000000000000000000005c700000000000000000000000000000000000000000000000000000000000005d100000000000000000000000000000000000000000000000000000000000005c800000000000000000000000000000000000000000000000000000000000005d200000000000000000000000000000000000000000000000000000000000005c900000000000000000000000000000000000000000000000000000000000005d300000000000000000000000000000000000000000000000000000000000005ca00000000000000000000000000000000000000000000000000000000000005d400000000000000000000000000000000000000000000000000000000000005cb00000000000000000000000000000000000000000000000000000000000005d500000000000000000000000000000000000000000000000000000000000005cc00000000000000000000000000000000000000000000000000000000000005d600000000000000000000000000000000000000000000000000000000000005cd00000000000000000000000000000000000000000000000000000000000005d700000000000000000000000000000000000000000000000000000000000005ce00000000000000000000000000000000000000000000000000000000000005d800000000000000000000000000000000000000000000000000000000000005cf00000000000000000000000000000000000000000000000000000000000005d90000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000060a0000000000000000000000000000000000000000000000000000000000000601000000000000000000000000000000000000000000000000000000000000060b0000000000000000000000000000000000000000000000000000000000000602000000000000000000000000000000000000000000000000000000000000060c0000000000000000000000000000000000000000000000000000000000000603000000000000000000000000000000000000000000000000000000000000060d0000000000000000000000000000000000000000000000000000000000000604000000000000000000000000000000000000000000000000000000000000060e0000000000000000000000000000000000000000000000000000000000000605000000000000000000000000000000000000000000000000000000000000060f00000000000000000000000000000000000000000000000000000000000006060000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000060700000000000000000000000000000000000000000000000000000000000006110000000000000000000000000000000000000000000000000000000000000608000000000000000000000000000000000000000000000000000000000000061200000000000000000000000000000000000000000000000000000000000006090000000000000000000000000000000000000000000000000000000000000613000000000000000000000000000000000000000000000000000000000000060a0000000000000000000000000000000000000000000000000000000000000614000000000000000000000000000000000000000000000000000000000000060b0000000000000000000000000000000000000000000000000000000000000615000000000000000000000000000000000000000000000000000000000000060c0000000000000000000000000000000000000000000000000000000000000616000000000000000000000000000000000000000000000000000000000000060d0000000000000000000000000000000000000000000000000000000000000617000000000000000000000000000000000000000000000000000000000000060e0000000000000000000000000000000000000000000000000000000000000618000000000000000000000000000000000000000000000000000000000000060f000000000000000000000000000000000000000000000000000000000000061900000008000000000000000000000000000000000000000000000000000000000000034000000000000000000000000000000000000000000000000000000000000003410000000000000000000000000000000000000000000000000000000000000380000000000000000000000000000000000000000000000000000000000000038100000000000000000000000000000000000000000000000000000000000003c000000000000000000000000000000000000000000000000000000000000003c100000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000401000000041c72e330b60e0052863df88b19ebb482d412b0a7bbb2fabb9347be5e59453d10078d263242fac5a2ad544b5005bcea367ebc04e01ff7ca279650bc63d9488ac304ad4d395e21ea570da47bf574569c6526312c5c7ad63a6d248f694e5c81c2b60e12693b411d9eb8f564aa43f4aa14e3e30f8574425a6d6491416332b77d2709000000000000000000000000000000000000000000000000000000000000104041414141414141414141414141414141414141410000000000000000000000000000000000000000000000000000000000001080818181818181818181818181818181818181818100000000000000000000000000000000000000000000000000000000000010c0c1c1c1c1c1c1c1c1c1c1c1c1c1c1c1c1c1c1c1c10000000000000000000000000000000000000000000000000000000000001100010101010101010101010101010101010101010100000010151de48ca3efbae39f180fe00b8f472ec9f25be10b4f283a87c6d7839353703914c2ea9dedf77698d4afe23bc663263eed0bf9aa3a8b17d9b74812f185610f9e1570cc6641699e3ae87fa258d80a6d853f7b8ccb211dc244d017e2ca6530f8a12806c860af67e9cd50000378411b8c4c4db172ceb2daa862b259b689ccbdc1e005f140c7c95624c8006774279a01ec1ea88617999e4fe6997b6576c4e1c7395a22048b96b586596bd740d0402e15f5577f7ceb5496b65aafc6d89d7c3b34924b0c3f2d50d16279970d682cada30bfa6b29bc0bac0ee2389f6a0444853eccaa932b2a60561da46a58569d71044a84c639e7f88429826e5622581536eb906d9cdd25a2c0a76f7da6924e10751c755227d2535f4ad258b984e78f9f452a853c52300e212d8e2069e4254d81af07744bcbb81121a38f0e2dbed69a523d3fbf85b75c287ca6f33aadbac2e4f058e05924c140d7895a6ed167caf804b710d2ae3ba62b1b51297b3ea37637af6bd56cf33425d95cc5c96e9c2ee3077322fbec86a0c7f32c15d2a888c6cc122e99478c92470a1311635142d82ad7ae67410beeef4ae31f0902ba2fb964922a4610bb18901f7b923885c1d034da5769a48203ae6f0206a92855e2c01ddb3d6553386b5580d681b8230fa4062948668f834f23e0636eaff70aaa64519aafdf4b040bd2f9836e76b9dc13cfec8065dcdf2834d786e06260d10000381000000e00000001bc00000090083367367613e6307621401e0b943e65d00d94f7edba399d403da5d93b1a260922e76adec1b929ab590c851320486c68244084a7f9ea21e5ece1e5dfe99ed6069d12051b95f1210b468eb7a029d2b437107a5a246cc1ba5c8f590f4db407e035a353dc7913b80b52296e05af286de4e002586c55a0c4914e946268a214e0caa1f040bd17a9a93471faffd36dc9835a0e00000090ead4b0c12eaa3254338bbcb40631f1f09b696da71b404cbf7415a1ee3b767d9943920b1dc8deeafa855a44f74bc38c4a74537b01cbb09f8612e4256575c2931a98ec9fcc5892ec9da59eb4807ad5fc0613222acb0c141fe55ec8bca4afdef1de719ac262d7ffea40a4d8d5bfe4ca69c10f624cd3f2f922fd8f5a10a7f212bec0c876327251624bfd7d777ac8884b62ee000000908cd0590d2d18f1214ff5b03b6a1d4cfebfd3e463e1b8e98b81fef46a5ba1b0204686f7c57a65f0bc5ce8bbdfc658c1f6bf4e52b5494ea72f193706883d6f1e5949ecd47315b3e2d1e75208e1c1ac3ba2079c257743ca4a9a4fc96389cd96ec0116a35814f15543843d383818637698392b5d5c5e3851162f2f53df7777c1c45c48b8899ac511d2a97c4faa87b25d98c8000001bc000000903ef97e0c57a6f5834dd84e80e8140c989a97a42ceee35be251dbf29ca3b9f1d4ec53f628312fb024fb1fabf2fdae3c222cc6f52957adaf9197fc22aa824e9afd66b58f53765e2edfcaa1e09bea5d09822c7d1ab1c0cdcbc2839c0ddd4eec2435989bf25e9f105380068b77674cd555da0d171b7673337a53fc13bd94d037cb898889a1690494f98997d6ad6f7cc9395000000090a66537d78ef99d64dcbbc8ac804c985b57d0a15f66dc4e0718252c967ba90161684073a50b2de36c358c3b2d7695af8128ae6fa3b5de2ba491f0f33c4b79256ae780a6b2fa2b8985fcaf46f51b0fe08c1f0be001e5faf07671f50d5d3f3cce0a2b14d8e600356c2190c919f7d5e95826223e80c90c4a715ab25286ec0a8d7fa958a0921ea9df290fb3bd39d9bd779abd000000903b40d81778940a1fbf4b631c6ca7f3f36db907262f5b7c9dbf7ed4677be6b459fd5aa18aa47d58a769fbc70cefd0a14d95d33dc980cff26b234154eaa53ba2e3a301af3d81881091d9c478670d47d98e2b6d37e7a5f4c5fe019363217b64d95782a5619e4eb81582b1798faa5764b58405bed270e597925e8e6b29101e97594231cd55747be6725f19e7faa830aa719b000001bc000000903cabd8fd2d8cc1b863fd474708974e9a086456a8c87bb553bc3b2249a6e6d35cea1bd6cefe1469e8d0505d496da0ba43fa23d5f95c1c9ceacee8d86bc37408bf788a77cd803aee3e8e9ca6be0d5c94f228565b5fe9635fdaf5cb935db1c32ba2eb22e34967322d150bbbd7418be5b47d0214392be8237a660118ab42a43436e5ee08e251d72da69b1e79b1682ec7dc110000009073b2ff420af305f8d6e8877c931a27e634e0e02ad27bd07a221ad29898bd955d5110432c2d520e3e608d73f71db60a877a0cdac7023fe16e14894242fc69a6630ad88e96ed3d9d9076850ea7f2da60302a5103978eb03a24aeaa3ea100b61250b98b8430a42fa3b40d9835841dd01a160597bfd46679cb40dc21fe48f5bfd0d457b4d857ffa793eb3931b23b5a5575e000000090cae03a08acbe94f7daa500858bac74ee45668f7d8b8699c05d15b6c8e3a7cb8e68caa3b92fca659e8b2ff5e0a459d10de2d9faf8d23e5e7e52e7bb3ce821a8d1b23eb3e68b93f2792385210f1c7900e910f6892d878b639348529c87faa00be2522c1084fb1f660ade21c84b7193003e0742f05a45a89b327fad6d6d8c8c8d6d77a0721e688149b63867f7930eba8342000001bc000000909a9712eb2ca308f32883b79151fca031a8e418d19df5dd397ca5ea709cefe8a36855686415423dc2afa0115c7987cce0d69612d7b485e7350a63b4d83f9e2f227e0422dcc23e1f2322b8df45ec7a8853147f0a8ea06fea5cdab7b07659ee18c036b4decfcb5be193e05fda85b194f10f1725eb65e156b30c5a39806822af3fe584cf9d541723131a22a23d1400ec9df9000000901cc8c637db22248cb9ed2e7ed8b7818f01b2af67c16ec9d9808bfcdf8b3bd4e8e750f54a84f646cad8f17eabc164de05f97fd66eee2495a419762ce946f40feb5f703bf8a5f1df0c2f4ba03f641b79160b234176a75d19d6e8a48b4ddd7e03c1289b3ec09a79220ee291370d2113bdc504924683165fc5d275305e79c7cd7a99a36537b9cc94befe1a2373b55e3460f600000090b8bd36129be0f622298f580af1ce6cd694052bda2e07761d1260b253b9b58206071b8329586dee5c5acbeeb94eb02a3753ea4c9614f7f9b9a6345451df3e7fae190b6c494514aed8c7fb7af6145072ae192a9f383c5d48e6cdcad12db87adbace3e736819ce046fda81bbad9b08c0946070798e6b179878937fcd611638e83637ee32c0260e48e372d621c3424b0c66f000001bc00000090c1e5c80e7841d56f2fdc2e22252561986ac0bde8583467b7b7cee85533dd4e82db0023a4aa1280e62e82f1208c465d378c09fe6f571a5d6f540ce1575db5a430eea826342e1b3eb17edaeaba692b3b3c1a9b142508381f48759935787a260b1360cbeb6a3d6f84faf868faaabe86f9831cb84a0def9afcae01d13019e2f20fb0d7fd57755bf8cf337ebd61c5d8e2e2d1000000908e7f1fd37c67d43076831de6f05532cff7fdfb2e2f57e1a3a51bcd9192a40bed6bfaa130ce8cc5d174a14e78f3f269baf7afc9a54b07e71f87d9fade5b0b2c8bd1973b0660b2c0ea5c1323fce5b40eba1fffb76ec613395d3a59e1588c5ebd8fb0f6ab9758df61d991c68b94ea2374a120a570858b479f0603c36e2b9d71bf2e85275fb3bdfb8919ad81f34d106fff6500000090110542aebfe9f65c67402024cb573c20c15d4835724350ba9c4389777e540ed6046da159569ee140da387a7628e7bd71359b470625cfd22a2ef99b2bc9e3dbb60f92b901a1bd8cc7dd325010cd83dd2d2704a4a0e660466faac7a416bce77d91c55b9d2ecb1f8d9d9c627832be30f4312bf94f8a074a7f94a363430d73571d5436dd9ea9bb13d907965b62686edbc8c0000001bc00000090b1b087d7329b0e3a4eb671fde2368893708b601576f3229943a86385ce556707b1f3838287448c58240ce1053b0fc102928723780612640d14a06993d3cef135803ca465102ba0ce7b0180c1a2a5f86e167c4a9c29f4a1783f93e36e5da3246f2117272dd6ff9a2388c6e78bc68e79951b3b844bd1c9a08ee529a5d851df7571c8698b37674d4bdbebf416422b5b1b5d00000090adf29bb0ad8c624adc804c04eea5fcb04d0d9e1b1eb3dc13f09adf0af446ee7d63f60f79423311a40926cf93f4652f306ff72b0e1fdfb0fd2f9d40a278eb076fd4dcbdc2455eff29f08388609213113e17e430c2a54f0d542b2ed1e8bb4b3a66d1bd8dec420e19feba9c40a94d2fabec22e9e452ff8e1e062f4f6b3d71a71798edef1aabd9bc34cdfc86d357bfbc03300000009046114b8c401cb7a062546f00d9506462e8c59a34cbadbedee505f9964f0c00f91e76f232fb6d1fd6b23ac668095ffa7cbbe69eec9a1683483d117a18bd478c50d95cf7db543b69b47398a9d882cc043a2ce5032191bcb02027b0e1a588c0a78d89a09b56337027f328a9f37dac01b66d1d4f45d56e66a2d8909cd8907d5f538ea8be3e635885bd5cc5e018bead3c16f4000001bc00000090174d1d04ca93c9ca135a32a723bb8967a20200bbb988465a446ff902b77675377c405ef506bb6a52daa0caa3b92333d2d9ccf16c130455e0499af88f64ffa855fe93d68d285f3aa916a96e92f33dda572b67c99a667585f74f8cbed06a7baf5aa1891caaee8594d5ac241331a4a12db61d59c1418591a4b8e553d37f38ea41dd4f3af725857dd679a9ce2540a608b17600000090d51e3b5514ee11b26f48094e98382d9552ec78b1eb2a9ac3bf24c87050f31350bf027db86146b05b78fa04582e8e0f943cb18005e9bef42f5a26b27ac45ec5c186170367d36d64a1a15ae4ac30f960112934d6f501914dc3f8fe2081ac4a8be04649a8a23b1ce48a2e1e80d58ce1b67114fcc3214860532b0873915328c140ad663ea2a4c69225afe369c736ef6731df000000901a0614eebea2300dcd77bff3171ac89dbf10245ab35b0f66a6fbea6af09024d465895f491da812ce7b116ba1be3590d1b6ebb2650444187876eb87f9acae4344a12c9f26fef7b619512a82cc5e87392627172f181e622b76ad3c6eac337fbdaade012e6ce8ab235e9d7c457503f216961890422725c67cd84b0319edfefd35dd60d9d88a0c52cd76508cc077bf65c425000001bc0000009020daeae685b4a7d525fa9e7322887a1da77d1379c01593d06367e695e044247a30bc981149f091016a4fd7b65016c2d4dfb8d9356cd33cd741c1df7f139acddbdc94573f89a76f4f2884436d22eb69361a5f09304639dcb02feb179b2f1128f7336824922f4639d03a1227a7a60f55512d03ec183fa21321d4fa61963ba2c2e191d37f25e88eed06291961c155656641000000907745a1f472feba9a29b326cb944fe0478c26c54b6423025ebf12a03925bb30d949f46c0c6fa5ee8c58d86ee0d210f0c397bbd41fc5b1cf46147fbed121631e3dee48473eb6ea01ff20cbeac67c5489f10ce126c6c4e735d5c40e16f674941015e0ae8d94f896ae0d4cd703ec8d2a9b0f105422e72324726e8277939f7f59d1b4a77f17de58303017608e60747567da6e0000009019216981b066c88ed0b3b6f2df84132b0d272d72597ef14bb385b81685909118c95d3d92a73f4ba6af2dcec7c94ccd6ab630209146343d808060fed0df2efd837f54cb06c78bf253fa1b8b8a5d4d7a902218c7234feec00a4e7b214b06a598b4caa2649745402606220865f338d0db2408404192c99dcc6a7c2c06a4e10ac8c625e008aac57d9426770dc24a2c1d20cb00000e00000001bc0000009082d76487e6d930f670dd8294a3ff896e675b59871ddad13511d9452de5b45ffb84f14b9b13c30aa0a0e7a2e6c9104db67fabfefeb577d70b31b3c815903784d22857c61d6fdfb68b8ffb698d19b8b2573005f3cc1d8fc31d65e44e50ab9e5215e3afaac2f83077deea42491ceeb354be10fb78ba40256771f5bc72402ac5d4b95714b5cf2648c85e3e10ae89b7b9f90000000090bb455f351a243a89123ce2b0a85fc2b0d711f7cc0f2292d0d2a1244429b2c3a982fb23fcd8deddfca3feb7ff27f394eb53b99309a1c510314edfdc9df4c2fc3db95ea67739c2ebee9989354c7252b6271b6ca0c3f3fd42e89c43684e31a94631dd0c57d049f8447cea033c05ac25cd021cab485baf707fcbcabb7210161ed846e3ba40efa3fb4cbe746a1d5b446cc7be000000904a9c85c97e0d4c935ebc0fda0fd70e4fe7ba903bfe904e6b71be94b512c7d61c05945d369e0a354935013d1840c07e272f4f967e9da05693169c04a01d9c677b30e2c399e57415cd33f4703be42ce44d093d5355d2f3cd6545583eb4b716865564986ec13253b5d93bc537a0d8aef806031481898708631063bfbd047cc701e354bff464bbd7d936bb53e73f234f8a00000001bc0000009014068b8ada80fa69e69589488779f7c44a6996e8ac9b6d6a317eb1693f1d4e094e11b24717028489585be7ab499453c89138fadaf6ab6f0f571dfaff11355fb748cf3d829b36c5b972c698d2bca1d7c02b9acc9c15ff9e5666d7b37e627e590a4d8f1bb24109c7b44936ef647a72b4921b2fa2bfaf9714a3e51999d1e590dfc46ead80c91cebe32784ab654874f9ccb200000090139f1dd54b92b5547d2c96e6018cfc3db4cd7859058e4d041123221c165a25ee3bc757ebc93503777b5d42f01eae0869fca95ee005728e2613bc7c94d734bb49a1c349a8815b3f4161ade33090ac86b12431f06f0dde369efdbda3de50c7ba09a345e652984fe5bc561a96e4a9f53997163bd7f642a409dad474891b58100829aa3663d048dc8cac3598e9525044266c00000090cf0c8c78576cd3295e717b4e5f05a419b3b005ec6731ee5c9d2bf97aac15c9ad3e3d2a56da176bf638374539c02ab70fd4db47cf3d89747cc938490aca465a78421b773c7459e71210c785c9a5811cde2ad310b81aba16885cb3b5e0d976536f92dca42cd55128833f6488e8094141150ba86c4bd92381553af54a040a82e41ea12c9549f51975d49db10fdbed1e6b92000001bc00000090869ad8cac952854ed14124129718d6e67d0aef1434bc70a6f523c781db164fdeaf9ef954b4b994923752445d704b459614eb332b76cb1f4401ad3d9a92773640236b9c96bd671fd81e3ac76cddc49e5727524cc35190286d82784dafa03e4f5690d6ddb5bcd7de9cd0429b924959c327049ff8df11b688432454877b5300f2ccb1d2c4166845b4bfdbb1e8015088985c00000090764b4562eda203759b8b174aebe4238efa1cf2a3ec1768ef3ef7d929a31eda380ae130c452455f036b34ecffab440be6e961241c12d24fcf15ba47756302ae12270ca1cb3c6e2a23d21c280fba5bb5c20a89a3deb175ddc55662a85f0941034841b81e9573af1355bfb08f161c4a886209dde8bfc2be93463163c57f7fbf92d7817304992ec94aedfcd43c744db0f66700000090435820bd150fc3779fccdb6cacac156f434bc441728b17ae0eb9fb9bbadb141cd24f050f1a5311375c82114434ee817c375195e929d4411ac94b0e5f7022e2a09e37b8dade0019025709e19cc035a3100266e6e0900c661e8db4e2e70ab508242eb478fc07f5f0e9983d1c3aedcb5431055c9543450fe8915345472673b7afc4f61e856770030f0a00c3587d3400e4c5000001bc000000905cd2b1954b0b81b07042b62e868d1f803fa824c21c24f9ff64b38a74c6e023aab51893ed2f1919cdfdfef53c741bd7a3d97d4cfaff2bf9a4776a18ecf5c94972aff3b1373ba6fc9ab6855ac00a49584f15c065b44f611fcfe69a1a06e1b2e833e8a8ab6f2f3febde83a3f02e263c266b00062b01f9222887fce55e9c2f5e35f024e566da0f0edeebf252f5a6aa30e28300000090077def0c3f50b0b47c9eb48a6b9708044029c535f4b742f75df046315c8b526751863017e899cad6696ecbe1fb3fefb7490af911029372b3a5dd8e04ecc073264d1ae633b48619177d4b1db17ddb7ebc016982aceb8e234406b2609f32c96088b591224ecd84ac0b49eb013bff1d8d5b291f671a1d584d9a5fc1fc86c27358cc1e63a52bf6e2e3087ba362b90a8a092a000000907b5ad8c10d405a4b6d0dc2bceefc087363be47cc13fe5b70d847ece64c9b8fa6c9d2e2d87f0d3452f6be6e1b5195088a732c38f1c127b18ef1c3888e6dda60fe73d4701f6763e764b0fc9bc984c9ec3a1f30df8ce2d7da272b7a20478311e5cdb3d3e2cf782ccfc8fe24c004decb2a7426e6d5cf19e5721f943de5c6f775c7e3a3257ce201bad3a1e279c18e56a0c23c000001bc00000090758e63051bbb20bfa45a1d6f0cba49e3d77c527acc4c969b17681b95330155439f1461314934ed0a76e838cbe30c38ff040dd1b5c786649b5a517ee3fd2cf0526aaa05c171d6fcdd75625d816836abd50f9d14c4b76b00a4e4ec57f3d934d31ed81ef8796c250614fafef5e5110d4b3210bbd4ca38ef2d2a82d835c158e7b419282a6139393e4bd502799986a28f216600000090f0822b26f5f8593d654f9377df02f4d66fc3109e08c6972cd2d0b9a4502361768fc07cd12c3f7d9e01237a31e7eae18227f1330fbff7f21ab933d81787818fe2bb8c1c79aeed32572534bad3a38aa22e12b85f9e9561af15d644b48f3ba832886868a01ccbc1298bd746adc9f213bd0d29ca03ea706ebd3cd5265fcc4d06491974320235bbc43d71208378f376b4fec400000090ab54fe26c2aea2182626d92a98a27670005516c8043202d1802da90008c2cbd61b9d0196b091be8d8605189bbbc5539dcbc4624f4058cb1404091a0437c1870eb160b02a3e57857e850a1c28e34555e21bd4f7fe7cdecb230dd935647c8c3d446b57e65d7f67b2b208953ef2367734380a15526b29102a6aa922a3525d471403a51ac6eb08e1fdfd8679549128879a69000001bc000000905cc031b130a4e6e45e8ce9d099c29f465014f2bc45a18f4dcf79f0ddcfc715db888f9975780c5a716611e8f25b66fb2f9a7a312a4953b9c1f2d3b63f38c5d5c8353de7033cf40b691310617c130142542f59730adba1d58ba4a553df2a009de247673bbbdbd72182e094ae020b503cac044fca8434a01a10648174a643a28b7105c34b2e7e55115b1c63960cb0a79800000000901de3bfad3720f2c15f008e4a346d27ac6812c0af159d93142eef63722a1451bd0bc02c635ccb07d4fdaa341922ebb11628a53fac21606763dfbb7f42448a042973009752036499cf913554f3e7ff82bb0bc082e28ef31fb2ff685c7a6bfeff67e5863ab2aeaf0a5e62f95e36c42a50b70817798e1089cd140dc0a6c817a9c4294925e8cf6af4977fef8a27bfe3774e74000000909d3eb8dda8a7ca6c61442bb4314d7bdd4be33ff477a9cee2db9373648e3d45a3f19ecf8e875caa25358b24db34795ebbd20481ee4eba712572ee7b88d8b345b0c9b6f7795ebcc246c601aad9eea60ceb131b7cbd50c6abccf73ce8dc958b52230df1916828896785b5f9f2a4b994fc0b20b752bc028fd96f880ff96d0239dca3f27c2790a1efb3748db4beecbe9ecf40000001bc00000090abb3bd5e78230fbbdef5e44ff963d2ee5bb5481807d8ab24468db6c0b34afe6191a513d9fd3ce22327464d7d8f1df5d5f1d28a8c8dea8b121aceb6bb693b4b7c92f626038d83f7c850f8e24ca8f2baa30f728e519ff0afcfe0142b8b6c0a26853fbb3ed9a852b5ab5ba7c5ffc0fe2d210c595d34d74ca38dd455f4264e64c9a5bf10fd8fb6d04ea46f7c0fafa6fb726600000090c6058b3d921006949f8ea3925de7a5272a5d0f8b9623ff4d648896e377da63ce69d0107a9c9d5e6cf286859699e32997120d4365e8cad02ce48de0b7a6e1036bf7488f54a2e7ff4cb1c8f904725f03342891db41bb8bee35200212f942c1e2d891b112c9e356328e68101c24c255ab4a1ddfe14afa6679960eda155b3f4e748fba771b4cd4cfec51b13ab41a01441be800000090407a6f231eebc95b1fb372695287319677ad9c009c273b06c3bf083d312b38a478d64ba7502b00644d1300362d7b102b6361f4e79b42e100ca70226c16da7a3d8651cb4c6a5810b137e439496c6b88d00963eaba8e28200569e81317825b7680479af46afc14cc4835dcfd5f1bd1f1ce095018666da971e6824e9c161135939f8260f4869cfcb42321b5952a97845894000001bc000000902a2093271e5d9e426ca48258777ea1c9d9f4d529e8f66f017ab2f7606fe17873efaab862e6cdfe6bdb06b568546371bd19cc9deda883327fc3bb47b5051c564924b2324633d7d354922fc46b8d88fa9711d7d02d5026e036a46a8e15842b0000cf357fe04e93407514976c6e24fc77381537bb76946a6f83207d426683daf202a0dc88370208c44c039b9223a27ed54d00000090f3af40d79ef111be5c885f6e4ce6a5f39aab3dba6721b387f7c0e7ec51f04e0c52219bafe83d29ef4977936827f17ea5c7db377184f3c07f0964e02bea83b1bd4b5aed48e755b48c46aabb0e802e431f0dd313d1c7f55d62d6996e3865770291774110087ef643ad13ee2b0fc80ee30f29ba6c2563a69f4c62e092346f03b20dac17b845455065432cb0f86f4e8fed4d00000090e2feb74514cbc15cbbd4960c3c31c2c8b89f658742235547af39388a2dd4d1b8383cc3a59bfec0ae7416275726dbc85967b1bd89eb45167b0a983558f057c5b6cd12d793661c9763c4aee5f086523d951413571b25824c9dc659ee1dd0390a717306a72fd4372d07bc9bf00fe6a092fb2175106fb6df9581444b794fd86dcffe7b79b82256bf3ced5f46ed9391431f7b00000e00000001bc00000090d25e818b83b533e096a3defeb73fadfba836517df1b920df53e966d82e384cd71fcba7799a3eb1b3e89eee9d99983b3eee97a525e8ed6722ab1113178d97cbef9b71de73a4db75571bb8a0750d1379ab2b674cd571fa1cffdba43f4c3c087dccf894f758be2877070da819381290f7dc0b3fb34c35fe2dc4ac82a9b758d764bfd171578ff07f263de4bf0668fb99faa000000090c910ad0b7cb33399478c81403d65f247bd70bc2de4cd1a400cb789a080a5814050ca36bcda892be9191fe589893aa3cf769c45d17dc9bb2ae20c6c6e8ad4410be0b47c87a4ae9a4d254d6c9454bd39f80acc01d59dcb13bade04106012e4364de822e00028f194bc9445e678b5051d02001ea661773999576ecf326e520e9490f79cafadd121c7de3486ce095923b21300000090ee0f1163ee24e3082804800407605a7ff98a7e3fff5eb530931ca1c29bb90a2127e46c103ed2ba423f55819d97e3b8b7ae7c98b9246c3fa0edcee4f7f4dc752c7861629d7bfaed003b609edfa779b8c80dffadec2e3a8e1fb967d32760a160bec97c15c640303316887a3f4fc927cdc90129f6f2658826ab3281a930ab23726a41699ef2a9b9ada3616f9a09e330e43f000001bc00000090c162bc6a922d0a9677d94e12ef9d0fe3f23f904c40a302ae96691c70abda3f4bad695623640fee23a35e536ddeca6a424c4a910ab4f06566ab833e65b2a56567b118f2dba34dc1639d242349e1e26ebb008681d4393efc63b2fc03a5c9c349740248057f2e7e2954e143baf97d7fc28d2414463f0ccda16435554fc0b96ddec693f64631f8de020a860e823c03e4a95f000000901a4c06bc51205497c73afc915e848da896ccb3e5ba6d0a01e22ab7e90d7ec9e359b99944e6cef34eb776a36f8bfc89a937c00dda7aa3292e877bd2b0949055f224c995a4e3f36c21da9d5336d43b43d512e2fe707d0597dcb3f61dcbe5ace1856adb5735905df6290a1e97e7b3f56f68160afa94767c419399635df90ac7630be9ca9f2be7a08d47a796433e2fe69d0500000090e971760c54c672a7b46b18e36bb1f53e4458e05f8e8e831775a41da37fdc11b57ffe7a5b1cca585f1af6ee11ae31927aaa30305976134acc7686b180bc94f0669ac4536c2f1bd42e988fe2ab15206e411ab8eaf7bd290eedd0aa07d3a96c31f6f59a43e73a17ec768a58765db5cfb4e21a0b1c6ccbc23701ac6fe4e5bade56d8d185c19055e290f091bb8a83d7a103d0000001bc0000009064d04bc457031d3da99682e91f14951b019cee11f426459c1e0bd3a6cb760ad8f6990029ddc57c255ebf32f0b66a9b4861702c4d62af67177a3ce64185a938d80a000ac15fcf090ac0d353635b3b69700e88eae07b1cf387db29491ea0b26bdfddfe728e5742b16707cb9c3cecd374230ade489c5f5714a04fb6077eb065322cba1029c6cba5d519931cc6869b2a613a00000090607f54712a73cf264d806c1db0440bc36dfcdf33a637efbfa41ce7a184e1837cccb43a5ac09872684f960448c6176eb614f0b9332e71d654edcb400dfd823e026abecdd096e445294510c7ffa77e52b21063632c55f7b907fd2dad33e1008f18c18fea3240507d4438e52a59f873a50e0e6840de615959b9dfe9228457bf09db81b97714d1b9e378e23b16179a7aaffb000000905713c015fab8d31dfb3cce41c788026931fe246f12b4c6c52c039006225596edf9ae9e3f9ecb3ae1462c12b431c7451437de202ceaf85cd58749077fed1d2a1dd41aa4a8072e304084c64dd8f04033f7173882fbcf5dd1ed380f3a0b6cc2ae99c7e1ed3d3bc625e9f881678a77cef7762cf6029df8ac6d0ad629c871e7b2a5cbae474c1e3ec458f61a982a3ed305b4c0000001bc00000090c74e13893e14c051d1c4b0e63d962d6790b8d5b3221254396ce134865a88d2a78ab9462e03635c6f12246dda72a5daffd7e47302b4da183fffb6c6e416edf2d45759e90bea5d320dbf3848a2ddb921c20109c2c82f61d2d57d00d9e6b63d5d6f6191a71492d121ce32fabb01f1892e061403e7c92390f2f321d582fb543b6252fbd6bcd4c81fe99f6970a6bd2219b11e00000090f465624b9784a4a376a2bd668f0654e08538e17bcdd05dfd97f4a1e20541dcb5bcdc377794d0fa79d6a2e1734f1271dd6294473ac6396c21f93be03196931cf71fd9c6e2910465b909c91f14437e9bc92586d6a20aa42e5b0e2bfdb3a9dc831ed60f0901977a7a572bf9719164bf265616a1ef37492fa6624392a171f816c33cf8a6516f966f3efe7cb1b343dd4828f3000000908f18852bed214009ed57daf66d3d85ea2eadb39cb1fb37ce940841774fe966a3ea108b0d39c66bb821186fcb321582e69bdfe18e4a36fb684635060a0992dde083c2b0848a99af0c12421c13bb23a8c401092f5a8571708d7096255112c28c544f33e9dac7234da2cd1e84d6f632134e101487ba4bbfe2556902c61e2a569409e749997aba4b89e8fd7af8285e556bf9000001bc0000009011239b4be51760bd69b2219fb45593d6fc0fcb5559b9fe6ec804297b700a677591419ea725d3f521630ad34909b40eb7774927b6b7a5be63c95cac83c04100f07355ac23aa1dd18add27e82fb9abc8412f8b8117f97f579fd48fe738ffb520ab784e721a28b16acd13d9899f9fe9140c29b379f0b1e8f4f632f3b8ed59adea573af784e12d894cd8343d8a527547d744000000905ad7963a5a5863511f5bc0734bf79941f50f2c71cd0082bd957649599719396cb7ed0f6e63ed1b18f541ddcac71ca4e6d4fd1a802acadea6772e76fadc323f7a74c710bcfbd26fa6ef55f6b17d8a187f034e8b77a4ef4467264ae76ee333bd8d3c2de0de95b7a837dd5efde225c3892e2cfdb16f38a7b6430f047a1a3d14a1b25345dcb3b5470676a8eb6b719b555cb000000090f8e203401a6080ec384e8eda1d3f804aeca07981eba58134ed2cff57729e418586df1fa8efa3096d090a219ae521491c878c4247b0ad36c6c11b3d424b2aede8b97b27bbf497c86b2b93239793aac9d61a9c91fdd02a53fdf50cb8a6352f54fa2cf7024b6cc68d57fee4b95fd8e8d15c276a66b4c0111673dc1bb105ab2ca5813cfc9ead215177cdc3d78731b101a39a000001bc000000907427eefc8c32594e8c7a42ab96bb1fe860ea78fb6146bc1d2a73a1e8ff9c6991acc4d9a463ef73ff781c61368fb7aae00631940143d0d53203189392d82b26a576728336a42fe55bafc656d729212b9d07efaaf20bad1e66200b7b80b29c094c858128ea68f3ab9d3885a207417ac1700a223c722d62b480ad3d1793f05579691edabd5f0d873104b257245ee9083c870000009036f06594a53af8ffd4c69460aa230c8f42cfc808e661b74954492215d41af00a7904d4b103347162c8e73762f27bc659fbcdfb35dafd2ecb3d1adae51091de4f455b086b8239ee229c60fdff690df1620d2aaf0f30c9975c519119112bbefadc8123c10f6b1a9c49c4debb0bd7df203114490acdf70dd8dd6f8583dfd250e869a3035549607fc847b663de3b0aeabd8400000090bd0c1f7e5dab2d0cfa161cc54823cfd5f67bae6dc39ad643a094f7172768f234c760fa9d1610c894d255eb0c773abfc023a46b2a8c8eb1f889bf14303c184e065430426e862b1cc1147d2d12cca898f9100dc0c65470adccc7810f657ee6958c952c9a9df0630d717d0281e7a94d4a4b156fe400fbb4fb617ad65dea278490af66f573cb1f720c1ad6f131dc61db2c03000001bc00000090e668492f7d870f241143adc81620eb1174ea8cce9e28ae6e14f1b26864eb39fc4bb4870a0e53b9d244a0743c8ba9d7c8b7399293c41d3b4b6f5ccf0500b2d328ea2e95147f22c1e2477b547d4fb60951140f90f1987a319217467ab516b7b125b4a8cdcc414527263686e37fda2c2dd92c9eb14fe690ab3846f47f6c5558d4ef7ff71e65a1fca7d93b14868c7ef7decb000000909602d909cb30ba815ad08cedb8e5384092dcdacc76dffd3913f78076539cb24c63bd541d0365c94d523a3b999a8a22719719537dd7b5db9e2f9fc4f0a0eec725be2d0e3fbf03a27c9843eb7d43b376bc03f00892cd118a31db431634c3c88bf2af5d33021a2ae9f4f22350398900bbd30841f4f269178d18bf284f8400da53abffa6ef966954397133b84a7e4c4f60900000009044c029f4795c4eee24224ad795237e3e09e2a8ea64e27f5bdbcdbf32883355a5956a96a7f72bc092991dc90d1edbbeee20aee7a1eafeb032627dfee5cdfd9cd0443bb21ea956927600ee6f7e3451c962013baa93ea18c786700354bec36b38343c9bb35dd239dc06466f515b0470c5811d3616246a801b6f2963b965625d955fc87a3d9fb4ed8e1552b38e1aee41b8db000001bc000000900b3bc15271008bd69ba48695c6e6a808a21cd66b6eb861453158751d9eab45b78a1b8f11ab3c5d989ee68b8f3e1f51e1da4f19e3546341ba88d19665da99d06c618d0ef988f558e281a3c97c6c04bde50479198ec6735b58f738a2cab5f45950b770cb5f9d34ea4099872464ff342fea2865375e7e7bbbe5acd490670b759f74d4c66304543a5d0621bd345dd6b9a09b000000906450d9162ac8175e4061c9266bba9ab6593b92b04b863aa0a08c08be535ddf2993e2d2b541701b62f79954e26e9b832aa246566e55e3ee6b1af856484d659c4ea486f0ccf6cf564260fe2bcd2a6a804d2e49472e9871afe13083a141b541dfd434904556033db3806322f7bd5aa3cc5b1a4dc9311ea57e048418d1c36a8fb231bd9821303d29d30a29cc0389d5474ea60000009022988ca796fc0b91f78b4f4535869997b9017a5d6bb9bab63ec708ec270ec6afae9799c358f478dca2b537239a35e9f78aa260e764beb9d361592a5df720dac67916fd799e37bb36d93e0699df5b07b808dccab7c57bceb538a337bcc68cc8b536f2f8b50566acada0b67ea7eb632d54165bf73805460e1b5bb24200bea8ed8dc15f308b233678f053180ca8bc9996bd00000e00000001bc000000904fc89fc6be0e30f05d6f9f1f86ced7feaf57415a3edd0e487c271d504e0a6d10eaea3c02c5733ba7556e33dc3adc695899a576ae2aa5579d41bfd701f91a479cd72e191d26b55bf6fbb032e3b33bc4842a0aa44cebdefaa8579aff992dc220a3a0a32f84f1ef0f3cbe62b37f413ff8441b4e857d847d8560416e3c8394f9969ae23d8b82e3f86ad33359f5f425f5c7ac00000090a37467afea6c4cc97ee51691ef457d7492c7ed5a24502da13c29ef84ec446b88a3c7bd5e6fc66804208adb01299dbe84a9a1b6cbd17bef87fbd0fe0e1808f7e919dd9703e551951b52ca192d9cffff3317a33dc570b5e04f5aba1d43b2e1997ac5f000e28213956be344a50c4c2990d81197a51d8df67a8c9014672c8efaa8507e8d790953cc222a530daf446fd8c94d00000090ed2da66258960faee567fca3f48339c58fc1849f9ed6084a338ad10c69a03b3d5c8528b56dcb54ad2ff53b9e8de77c73d5278ba02a607d8687b94b439b705f798a8f5af5826be2768623bfbaa53fc330046cd30f364e74e2e1afca74a76e4958172cd3f48806044001939affd2cf387f2d21abaa6b077c4818bfe38178995c90021b3861963ce32c34441ab0c2711d53000001bc000000905778f813c2556620961d546a7fdf739f69a15c0f3d27e12a640b7b8e2450ba0c27bffa2ec747b18a73dec69e8fcdf2847b9536fbf843e13a3f2bc495b3f4e036a1f6e52d7d5de6ed92990db981383d792cd6ec169d75d02d70e427aded56ac741223ff81866f4cc71ff0dbe79189d42c108e7e77f8c6845752e5f92e3dfe9b0142c1bc367b7fc03849e74b4169034bfc000000902053096a3ac009b9625b26d351821fe95f33c92111c691e9f526b5441e63a51a7a56bc43a07d6a8d411968ce7f8cbd7071b4392cb5b8a578172dce794ba5022d0eb31706de647545e373f6ee847c0c1c1c542de88666b01e90f664188ca9aadb0d26958d6071b96488ee11ef7c4756b3223d713a0c0e006f4f7c4c5c90c648666f962e245b7c6bc249193cb6af0bb95f00000090d70e906e51410fa1baa9d2b96e43f8a3b88e3571595cd86413376e1b70eab33d3b6b4a2b37842c653e6a7f40d811eee11ee842a0417f0d1f98e2dfee81d9b0fb9ccd0d94c96c09c419e9485012d8e20c0c6a123eb6e1664a2fe3357bdd09b53bf71102b0014877ec5290018d9b3291ab14fe9217b28dad3f0a5ba42aba7001225de17a38be745d4dfee261d3fd70be02000001bc000000901a8a8b3a10b4ef755a584850b202ae137405e8b021d75f806e660d9f747f2ff22cf6e45472b475d431829838c2b28e59361b4c98efb3180cfb7bb9fe638fbef23531160fa1946aef0d243ddfdf8fd66105e05bc9bdccd6fa6e5abba6fbb161859a073bc4eb89dd1f89b7a9879f1bf60a08a4d3be53e4bab4a27bf94e67ef11eea454177537748f0dc2d0029a09cfce9a00000090458256074deb2432ebccca8774904b3d1f2ee4624ae1eb16b0650324c6e055247a0b7630c353507cd8778c19a74981019d8f07f700aa03cff73ffb9bbe2579ecfaf28a8b457c8ddd0dcb7cb821d2bc6b1f8c99301801c3cca6cce6c27d9b451fef4f66221f6fa7c97e53d41e09e2680228643905b2ef882a09f0b77ce6e15bb898ad015b4f7ca5798b11ecb5be57d81a000000901bd4801913d9124efe31cad632fa74842d90821b2fe9f8fec40586e634d8bfdd3b8bac35675795d5adba61418295439168e7df438eb9ef80cc0f394b49e3297c8b4763fb0e7fc473fbf48a8a58e580021c8857152729f39dcf184443da12567a8ebc9b08030d1b9bf19275d6dec49ad71e75202c608f21a387d18f20c5f97572ac8905d1cb373088ce1175b144fbbff7000001bc00000090cc857f9a85db1c472f109527d0abdf1eff9bcf0e020763f0f6dfcb45dfd089ee1a588e1625c0938210a0947cdf78e983dc0c76f58dbba18245df17d4139802530fbd43cdff064d771c411328ed27f6b314b5f0df2516820e61532d5752fee09a6a46d2dc6d851eebacb495e7522de8b2203583f680d03c44ec9b37ea8ce5f8562466e0d19d222240dd728561f7d5c64e000000903babe76f53fdf6bd620f7ce82713adc6390d32939d113075daf95374cf07964c3a6fb30975853f14cc02fb654326c397e560b3d93c56f286572a9221257030b55369b406d752c06901aa937b8a43ffc90fc03fe346168e874dfb5c5b871bac5b2f6ee285e71c7be70d666e630a5f8fc605f87b550eb6b634d98821aa218263eac28c1aae4bff00bee6fac0ba87b3a5fe0000009044ef97d041bb817cf165c54bdfceafe5b3e375456be5a60a20ebf4c0ebc775d19e3b6a05602fe0702205ac3bdad9fee5733dec31985a830d52d934d80f4c26de543ebbc35ce43f58d7effad1a5e2f1632fbdd7f09de729fbcd9c1e420234edc3e11a9fe07bacd69c9bbfbeb95b2926eb109265132a50e27802b43af6ea5007e60c18f2b9f196982942336596486d7b08000001bc0000009078caf7c571dbed7201223e0edf3a9df03b5a286408591b32aaa538b5183e2811ca60a01da9625a016598952794377029c3577b9c5150612a92fc18c8e278e9c3ff7e831c66027ba31121f404c6cc34680f705e4cc64f09e1b5677d8239852b252d5beb89f9b831ab52164f268f5563de26a79d31cf827cc8d665e00f9136de728218f6c52a27ffafc4230b18dd42ccc30000009000811d22230c9c813d548215837b76afeb757179f8353d6907a6651c52d93a20deb6397944d199ffd1f2fd09002f8ee736c8823b748147db1a3182eebe82b840efb49cd9dcf389883e7adb67130065a209457e1a541ae4169fc17c1da29999e55f62143ccb007e6d34dd718321b61d28280ba790996b51f19e7a9697e6032f0c999e9777f6fb1ece70904f4a5f2b776200000090fe245eda1c2973b1f88513a37daacb8d5f35f35893dd5eb250d1442ffd0ab34d9c41dd3cfe6a7926ff1ce27988b8609ffa0c8de6dc9baebd017b7319fbe9abd7f4227dc04aba4d161f31274bcd20193f20fc7cfe85e4b4bb5a724aef57f265c62d737844a517823404a13148abcbec4f08dbb0bfca4e69efd460fec8558024078cdfbc05a42bcd9bf5e971fdefd08d54000001bc000000900bd4a31bbaf363cf3fa57aca5f04adae8f5213a7694b99c466d3fd41fa6ff4935fd74b4ea26ddaa049ce4361475eb92ada4ea3a828da1e80c29eb7ac684239088ead4a38e2271ab5e719612e80f3a25426580088f7d3501ad3876a82b672f5908cc84d06322e5dc6b244bd5bba1b95fd16dd281ae9e19ea36ce6c401f1575cc588b83e498386a711db916626da44415700000090f0dcb0f94e77f9d78ac41eeb40a50a955b4109bbe410ff70224b742f3fe1254447aa7386f653bc98610a67a95ce8919f78514c4a4bf00097084f0cf3d7c1d2d33122b5722bcca75484ab7952fd55e5ba2a20b78242c1e4d2af3333d8cf40e73151e0946821ce53efa736b9a3c22c6a2e21ae0d781bb4d13cde7018868a29285e9fd659bfdb9149e6296addcb396d407700000090ef341d88ea4e7fd9fe6e4a22e4d5dc505d065110899400bcf7cc54766a7127d2c48e47d156d6cb12d20cd0314d9544be558999261a88f269ab19e5ca7270380658bd36a443c55f097783c769c53c6f4016515b5ab04e4bcdb7f6c4cf920e722ae83ae986a67eb316f3114db6b8af057c28659cdff4c0f7597c43c1a80b453d6dd57ce6970ff28a5277998451724f3f7e000001bc00000090a865c2a5ef808bf3a41075b24637dedb1b5e14a0175b6524bf7e6dea4a73bac95984aad6571e030ade342508e58288746e74ccef9a41db44feb83e74c6bc920a2cef3a46eb8e4699019f6b006b5715bd0fb7711ad7933cbcfea5081657135e6faa64852810ade19b319163c1f7bc5a52120cd34e23191db2caf0e3147e4620adbd9c65bb19f60850cbe2bb27b3226fa00000009040a53797ae7569bde81f43f32b91e826343bc0f14316c46c3a767c9a76f3c6f18a5f43883aab511608ed0def297a253745ebc8efcde6f17aad8b894bb8f2c56bb7a0311b86f7a77acf1d5905f1391aef189601ada92d92ee4831fd2f3f6587ab231751c127d25a790e71caadc150f9fe2da2329b5993f4557c85702e1d3f76350008198b0a53e5659b385013256521bc000000908359cabe7b56b8b199554d07c08ac7780ad87048b1c8517a32fc474dc2d77203ec99a1eba9c192a238479e651e0b5b822f750b92523e7f3cb0265a0ddc5adc0c52839067eae0ee372bd1077bb528a5d81e3728b0d47ecd7e359e89144b1ce2e11da0363cbec6d502ce996791d87876311714c6383edc8595bf0fb0ab115f8265dd47c0f13b2d277237fca8c303c25cd1000001bc0000009014d50b10091b00692c84ca9d89b378281586b784b97e31c635ee2f240f7fbfda52caa18d2ed45b30d8c57b9bdf0e90c17cfbf7cfd766fb6ef05cc6b0e9536010dc1f3c570a1e805fe295077a49074d2629f8e3aa398ad0017f483cb595eac860c94524a59cd99f8d6100eaa2880c37af10d95ecff8e7662fd1675a6b699e368b2becb6381b60245955daaef513eda493000000902fe053e6aebc719b33dc8f0484d6ae3b36da92f490fac91bc44457b10a10f05880ccdd4a02ad43595b08769bfd36d6c8ca6b56ddd3639fee1891606c98ef93aa4174ea438c200f742b7b9cdf0eab75f22086c2b7e9c56a469f8fe4778281ae5dcacfcff7c5e928d12b7286346e50994d1a0f76ef0d2ffd1b281aad6cd3dcbbe8a0ff597104cefc4861e35a8dbabe9ed100000090b9e43908601821a6c6af1e8f68f955a0222223622c949747ca6258e843759a02031bfe8181c7354bb6e4cffc40feb6b0ae8ac4c930727f95c3dd1255f72aecfc7f0145cbda6958e8943722c88cdc172d2ab4e685c0f94fe29a92d8eca001d07945fa654f115d67a6ad1bd9a9d11bc8e02b6764d5427b15702eba437a7379d05a34ba6353af0b3c9eda58949a5d744c75000033a000000ce40000012800000090d1267be4f9d271fef7ef72206cd0e9ea08c2a867ea83347a247a3db18c95a3de4d5d19b44a8847af1994aec028371d91817ea93be421bc88de0f7b9ae628440b5a401cd7fef4bdf68ec9cefdf5a61c43305a51e1aa4cc53cecaefad9c8627ef285ab0a648361206ad649249a976fae7814f39800949bef3ed19e7d9b21eb2c673ea392624f1d670d20f8d9065f201217000000902645822c672907e4d8c0829357baac264aefb6b4308489fe113b1ff1ab965e34ef829446287b3002bab3bafaa32ef13e2eafabcc5801bb482d5bd79d5df0ccb9df3ebd126dcfff9d99499f3b22ce9003016efe2dd628279f15a73a50ca7734617b45328cff2ed111388be15bb328b15a012c4e23c527c16343d5f1aa009ce9ebeed9d4d9953a56a5bed7e5d50e9ecac600000128000000903ec8e194dc39e13100ae37743d4261517845da492d394d40d0cc71520111f86e5a1e2f7c1873ba53a8ad917adcf7bd893d82168c00e6317d2aaffe02edb038e3a91cf667cacc0356411f24eebf401e11148eef7900cd61c234127c9938bd1368f2b794fc12e58707e1882cc3f4d21a0c1df957e9bc5b63c528b707f685dddbfdf84643d155b06eafadf2ac436e5fe997000000902605a31b9297ce4f4e026cd62b1f99e8ebee58d4275eb401f67d9d109b2b8b925a942f34d80a0844c74542fad7d28a0c01483f9a26311961ee99e574f7a03781d749d68e46d2634ee3f2f86cda4b9d5c080a3c309d16833d104081e3186f25e8c36fbff25cea36baec6d85359ba8c5ff282403cb327daf376cd0a757807ef376475b9aa8c5b4afd5ee35af3908066a530000012800000090f01ed56f5ce1b851ea8242e8f2b54b3a470b33bef4a3f98e90e57a1efa1d066af51ed76a646cb0569643f75e371ddde0e4bac9f097f48ebeee3408a9e1524cbdaf08400cb29cf8baf0f1c495c040075526e507f551aa7247610b4374115a9cc36d55d17cc2513f34b294b6b57ebb63f811df0b8c164061b559447fea1bbbee0cde3c15837b4866984ae8e1cf7e91848000000090f48beedcc6a7a73c5dbe0f65a08901e8912e17b53430708ec55f8ebd94ef63cdd8d1ac2ff75c07849e92fa721d62c429769b2f9735c357a275929093d05211c63b36b72c38139554d705aa77ba77153c1810eb74a7055565d2b38898c1c7f68b2b6ff3a892051417bb67677dcb606d80210bcc0e3dcdf034dd98cae6b17708ad15c843e1625300b780d7dec624a6158e0000012800000090e3d8bbf1a03a6ec99d18debe60451df0f74b08613bc7df42072ffc0c63658e3f7a4a4ee218d29f7dee54fb3743b47a9a22a62067a43992ecde88fd0d5a4363d620c54a4f8794f23412e64d8a579d8e2614d2d47afc37c92f2b455c010d741cd477a38f3c53d9fc2a5ef75539347954c30dc480c9350557bd2ccc1d6ec3d93c917d0668cf00efbbd5ac9db2c69a35408e000000903490e166050c8c9a7ced51be3e57b99ae8d4de9e3ae3d7872d7cabfad63305c36e97214768219f502f11e081b6b1ecc4731c9d21e7857a48c39f700f2de1a1e690fdb2640bcd80de3495f5626d2624b81da3a8a2dc731da13a8f75335eb636aae5517433afbf8e02b1bfb63735eafd61122ade87e69376243405e78e1e3730cd0293ee37e4471eda1eed0f0c45c3842800000128000000909fd83cf44626806bbe7824895282b806c8aeda0f138dcd314cb32aefe75c2b692ee9113b1f9236e0789edb9ef55000d8ad3fc9610808e1f8ba10ec5c2066489f8891d029ca88be20c24625c68e66f39918b12237680f30254c3ecd75fbd881791255075b70bd58da59e9994242e2599617011050da58374af5bcb35f4cda80377a8a187dbd733ccf3a97e703dbcc5602000000902dc70eb32d4fb884d0b430b16c7ff97d5b88f35550034ed6841f85aa8dd2bf3b31e316b75c107bbeb05296995c4372b1808268a7e4f2e0f9624de9e95ecb47087753746334c65615578c9e9feebb3a51241fc894f0c95bae803c4f4fac8caf11447f290321247bf7761efa4e84d3453c16e0efd9024dde101546a4a4ef8e473e464a605b56613a3199ad3b629c042e880000012800000090b35df4a8e4fe3d9ba9a45a24b72bc3af314b174a2159cba62864c91c495848f8b11fce0c649922e5c957b88e4357965efe8f95eb96b290509b8dbdac4da7db9eb7f54116c9ab5367335037d89b946c5307f6f9e11fe03737543c46355427cb8c3d0253d78de7d89a97ee51b8a0d125350999bef16260798f2b1eec194a736ecf5c1d58e17ceb37bfb51e0c7396de39ef00000090f6b68d8dad58b1f726721ebfe0ad5547ee026f110e6fd2fdb139116ea2a3a3e808c682b2e43e47718e13d67502a9291b39c3796c3dc6c31b55ff7df469ba1408e1c1db38518a10e9a88235e430d1bcfc01c80d1f0ad3567bc6f3f36ee8242b44ef0b765a5130d8a4131b0759aa1ba3c32d20a24010618542cb216f00fda8b7186bba33dea148e9909b4d4114d273733e0000012800000090eba1cabbf010fc7c52c12227c7cc1bff001f549f020a7181c2b1ea71549f4e8c73c2a3b8a1ac6cfc09ed85ed820a479ec25d2f3e23d0f0807c9052827f4da196122928d3ddbace54cc179a5dc8a29799297e2a199d7074c84cc0696b822b40ccc1a1821fcec621ad646721d0914ec7932fe1b6ac2f70ea89c890f1261e55a09eb95eae781cb719f08c28c1be6e4117f400000090fbbd8ae5ed706962d244022184001121b2bed70fd7c5f24a77747014d9d118a13e8e3e83e5f0f613e51765e55b0cb9e2db954e9d3413b0453fc7166e69288cf6a775c7db07488b1e21fb2b24f1f3cb0023c61ac84d0fcd2b205765fcc3f9fba7bb5486441c07b1cd58ca4176cd410ac80899096c50546c8385b037b01abee2ad4b1fe28353e9713ccf291c29adfa392d0000012800000090f9a33174474e431d81d35dbdb9bffdac406b33d2c6f50ec30f40a501f9019fab188fae220ccc7a12de6ec060712c95add30a769ba5b4679125216799709c7b3fea4ad16b3b2f61beac2140a77bdb27d40cf50eac4c456057fce6aed3886a363443a56a4a4d5ef904d5d037831af022da01cb2f68f559ea4c571058cb175f2a5422f65301b7b24298916e2a7e5d8e8b4e0000009005dd3985388842b02e60a086ad305688dba8c73acaba8804464dd9b3650af21656d86f7dbbacbb344d6380351cf99f5298bef1cf20a917860cf962899c23274f05cde33a985834dd53eaf93aa6043fa72ca9f8ec3d4d394cdae9fffc49896a885c15c4efee1c3823c69f74cad0c19fd517babcc3125db46fc01a444e8725778eb0db0906db46fbd5cb4dbad9439716de00000128000000902bdab506bd3624299973bf33ae4fa16aba0e407b246e8061a437523b59b8bdac5d99d7dc63aa3d15b3c4bc7eaeef86469965d03ad3e9208d349d9f0fa987a789f309f0a847926337207b6f88479438b71c35b3c79aa2eadb871586be85ff3fad85f5c69b1ee4703889c555b242304ee7178997b71733c8f33fa78b9ea722e701ba79f0388c1f76acf7d5d777cde50d2f0000009048b5454d5350c10d5970abd7223e34b714bdbc791b4c65b14b58bae6a87959e9b8d2028cbab36e92b7d96c496613e1a4fffddb3296f28f28218231531aa50db7b5bcd04a24b200191498aa893862559922bd03d09dd727f797a75561ff4bc9ac01c0295aee978cc3487b08de3c5e77e028dc877f80f4baa2c748bf4e6b7fddc9af3c750691e88463670907dc89ae366a0000012800000090839be5d7c52676e753c8a94fc7012fee0c33e0ba824ef37cdf0e4ea1ba7d378161d29e54ea55823565c2fc5b91326b4a99a72ccd98595424e5751381143578bc2ef5f8fc5abfe87eda3951806f9f7ea20d2e867704f0c4f1a7458f33ff54764e2a64ce090b66e306b0f0a9e27f36e6a72828f812d9cbea202ce0ed288be99c5da3b8c032afa35c82906ed622f5a3603b0000009074878a57a2fbf52e6b1096fce33c7f83f2c7425ba6d150f48be26ac01966ca1f5b603a3d3bcca9f1524c4dfed85117c8b8ece60461d5974836189771a9fb700a44c92f648ebdd97770d1526fab8e5dc9301100a2a7804fedabd6d86f2fbbe46e3fe24603a00063db5b42c4848083a3580d1cb7b2386c037a8de0a9c6055ebe5edc17d18440ac6719ed98734f92ae5527000001280000009093e36780cca35dada87cabee15291ba8c3f3b51e28aa2b2f36f9a02f5a19eb21c6ac03f389843056a84b3fb4b2acc9f476266fb480fd7f99bf036d492324f168139db1e31dd27cdfb1b4e8dbf09185411c4de97982b74e636bdf6f7048c4cbf4d1b2149904cff0d5a187b3e3428485692df3c284b29771c96edbed7ac3a915c57377ebbdec271352157053c10369c2b0000000907c664c1d087d8642d85f3394f66f4bed378f77c1d9d7c128b164fec745a018176acb3c666635487d07ef39a9a7443cddfbe690dd2d90f249189a3621281c4d8cee6b8af4c22b18c6ed258b0cd1b5852128eea188949ab62e174d2a5e35ac77b2ecb10424b1d49a956eaae6d453e0843422e843b77ee88004fd697ce4ddfe4e032890c1021ac3d0b33b993d2cc260dadb00000ce400000128000000905998d03244f645698ff7cfc4dd1ba37cbd375b94a94005ad980a9ee1389965347b34b4732bacd868f2d46ba76059f07a9612b8841b00795d1899f4d9e35f14f628361a9d6db9d1cafe334768894eabce246ba1dac13af0fac1bda97683d7cb5789c83c8bca06e4797e2ed46bc518c3ca15d4bf801942721b74175d2034e86b3269d17d92ccf0ae1be0974c478678ccd9000000905d04d09462ee4c6e28988b59218779dc628362c3c8d61b0080506b506232c8dd8f5a8c914e19cc2734646ec283ef984d3a86bc15dbd8de783a4e17308e94db25428c59e05e9012c8b44da233efc49adc0c029e9962b7596fd6466cf39135c96e3aa7ca27556fcd2bb99a520e3468216b2a1294542a597a110476ed26bb8dcbb17162dc138d1b68aa5eb8ef962fc703f900000128000000903c8238f40ee0e3f9e925671432e84c067595931998373096731dd118da4f6acdb427febefa4ead8cc0b2757f651a35607ec45c65669983704f3c1c5696617db0a43dc3f6895691796b92d1586e2d62ac2783413610f60d5d6626eaec0cf5489b56a67fff21145d422bac59bc396dccf3025a8fa94d115c7c3a59681352149f1245f9703ebde50c5ede736cac50e802fb000000905e4e8b0e7d92d0db9288b2b0053965ac7f99b674c782135b7ad9ed8b2f444a70df394aef47fb8058895a0e1095154e2b7ab1783b5a3f0a39d0a497ba8d39bb2d35b812cd7da132646264393f75bb2a050ed19615dca0bfe3e31a947e1cff38a5648ad99b3148841c526abb8ef5130f6a0d1548c4d345bdc0e485e8f001927902345548007d66bc6040ff4d9c5d63b5ef0000012800000090490bd4103feca675238fe7fb4c16fc04b41f260da6ebcece76f632ba3f88c45c041e24553ce95a540d0fd48949d652bc7900b8c7a6eb8b2b687e00349bc9d832e0dd7cd4a4fb6dd73970b40e0156a9112de6af792a7d99bc6dcfd7a322f3ea87f4a5bea253e284ad2c26a523aeca62a32ef78b5c436a4e8dd5e6e12614d04e2cfe468a0ce89df5bb2638156ffbe85c5900000090c152b7aeaaf6f66ba3606d5272e2de83c2ec413ee7adf1c043500c433cf35527fb29f203028e547446779ed475dadb346b8b210c39de239685e9716aefe5d38655d9179c01d89100967ec7936bd59efe0be12e855ab54331d40fb17e7c2c4c4d0d93f3ee108c9cc9e871cf8019878d9517a9cb987489f85c9dbb343ae729094658d51a0c76ecc8f97f711e88aa09f25f0000012800000090ce845ee33b8828c450d0f2cf2e901790e918bf0c8d809e81113f1e829b219df0cee5fd00af7f89613a56b120115c72f98809c06cf525f4926f0c44d2d89916979f11100ea3adceade2c3fdcfd7902c8a203f3f68962dfcfd5d469c0f44b89113b35c8fbb3bd00f35e9c869325c6d56fa1d3a582441db19937f1131d6c57069293c0291c4c5497b62f9e253cd1fa17a3900000090dc2b6f7a95ac2f9b02608236b9d001c25d4bd46c1c299c6d2c5d888d4f6cda24fa0d7eeb717e173ee675f7f1f6a891a65c76d5137d5d8536525ef77268125445bd2a79a87e6dd03ad7fa682ecb6bdb1024cc7ef89dd5d28d3d83a0cfb8d6ac2c84823ce8d2b23da74ab19cb739352166002bb6a64ab8ba6219020940c1868aaf9098599b0536295a152d76376aae54490000012800000090382c4148126f8968b857162ec8fd930d573a41ae07df55b075fa4a90341342a75507d57fb3accd1b145f651562b68172a16d01822fd8fe19b8d74371c935229126d7a3cef7f0ef69c263389096ae3a9221e0676c9bd4d0604f00b6953347bf10af9bf823cad27dbc1f7356dd17fa9c0f12e5e2d085ddc1b4a345e9bffb549e5db1c045c210dbedb30dea67a2ddbb2bec000000905d60495979e9949a319ee7765f6d3f07956e97cb076538f3931c0f4572dfe7c2c9ac2afa11daf65b43b6aa44efd5e3b26672b3d0e3c714f5667fecbed230ef70b0f1c7cf6e739b3f35959a55c46423cf232f6fdd1fc069652903d19451c7870a33ce63d016a2ae702455b5e899f4483f02be42174f5af4eab43fb9c68a1473ed7a51e89c519da6a0073c96bb9cfbd4270000012800000090346bc85326b32dda7ce8f0212fbff1092a4141ae7452adc2c667782ed03aca9b9fefd2d5740b0dfb5919c2ab9a5d4a7ba4118797df233952f68458d346ac573406de9db783d5f3e97d911af1331508312056a292d09b43d071621a945152ad287b75c8a4d790c2e91561e04407be1aea0c81f8af7657704175e1b0aad580ba4564cd3d6ec6f36c55f5e74afeaa2855f800000090b77a26c6b8dd4c4dfe3aa1da8ea966522275687a8f7596662270fc760493b8fbf1e563fa0b307a00bf6e478fcc4eb3666369b67e5273afb4a02bf42374fa193fb0d0813fa243aeaba6d683d4049dd6422166b0ecdba3db4b79df7b0c1fc8a935aa7d48fb5a550fee0541e69d76015e63009ec5223365534bcbb376a2539e42bd129a9c457be332616dc5efaf44bd30aa000001280000009018aea5bc1ca8f0df49da8a42c192a4b8cc0aa96737fcb379804441c19b2a74e9320e84fddc1a23787216e5cf2909c0030145853cb165993dfd87cbc6d422ef21fb6cca7f7825a3f7b6adf36e06e6bb162b4eba544dc40b453b24b4fea13c643a8dbc0bae7729bf40cd78b9bebc4ac7b80495138415b64412bf67b0cdf88d7b4ae8798c4ede2fbf763deec962a29be47500000090142795b3ab49aa436c60b2a711f4c19339e4a3801a70876f143ebff42950fa11687fff7563af84d6f2a2b8c9313cc2f82818a201d4e258d979f61ad4b4ab14a8b8309f17c44bb414b3d74faac4e345cc16bb64c83ec01479fc0c993bf957ecbfb486fd5a4e6c1d3d1274914d5727c22f1917b87c903dd1881df82801e91cc83306bf990f0d55e63891ddb7fc7b8aef4c0000012800000090dcfeef5d43ffa92d2424c452b997f50133e3bb19581f58d007e3129bccb19388e395d25eb5bb852c71700150d709b93871a61b543439e5e0f75f174724f0d7ef9e61c335ff95c337e9929a7219ed1af1263a222029e7a033ff8e7f0ef7ab74af7d85cedad791f2825976d375f17636a80132c3034754ad9ae550bdff011feb1be1c172b2207f98239ae4349019ee465d00000090ac3204228825a74c55b968672f4d63d1e2dc40b9f41659ceb3d5dd63197f826e8d77898eb5e6120313c5ef4ce754d4ba89adc624fe368bb493b5c142b635a2a930339e8da2bca2d4e07b7ae451fe95ae2837128baacb9756033334a5d63609289cbd69f559036c422ce03dc91971424901cf9e1f28c35fda2e46fc7ee1239be8d474913be51cc5a2ca432f6b48684f840000012800000090cd23db296e01fd2dc8da08863075927f5a60a7907f3d265769f8d0f5081cd8fc218766160527828a87715ce58f6d7416114a9c1ef77ec93781a8aca5da4d3aa8aa16fe1a09eee2af3994eedba49718ba28be0537fb39986aa2e1f3ff5bd18f41e9ecd437e6db73e4cada5cd5639935e30756bf0b2d3d0a9ce69a6aa4c2e7d330be077532e4bd5e0a309eb5d3d5e1f94900000090f065bcc6ebb2303fd9c98b22d0e78378302d69307f498fe65e81c146d1001f1fc58423db36003c66425bd288cb7ed234dcf6e6c5cd03f6cf7f3b317b88d2a37767c6e36caa7c0997c0977252397dbad80997a6ec34730acc421489e3b118dac6f17cd6b4d816a0092b3e30477bb51c62219452973b63d9fe92bc2e93b6a0887c8d2a938a00f5cc40ae3d35b71ba74d0b00000128000000901f4117b0387cbd69904faf5afa7e0994ee94179caeaa45f3b3eb2f2aff67481e0da701c4ae66051bf316dfa30304b550add8512230122fccb457af9f61ea3522d0a16255a26d403e080182c27b5ae25e21973829fb3679da8193c631fc7f48bf0d8a789dbf2b42cb39ed2c57dadcf431129cb742a98965cb927e16285bec36e576ad810e799ed4089b1dd1b13ff07d5e00000090fbdf9e199bc0623a1fe2d32c0a4cfc814af0f22450bc538fe3acbd84a8e16e9244e44b25c59dcc3c566b71ec2c5ecce2730680427b55a9fe31c3c2725a347ba742c628693edf2d5644c6a94970588ba916c139b768b3c44cf618f2ce88546aaf413f3803f30bd9e0b66777e5d655f4831cdad9a00f7ca7b8549dbe5d0c579f3f0fb929853a5e836bfd1856efdc4fe20f000001280000009019dd6fed398d5a1ec6d9b90c21f72066191e977de4aaa552a27e8749d1e320081e7fbcba1d65f56c6ce845ba3218213ed8a07c4072dc271d5228b5cc58997ed670d120e96c92d1dac8ce47f856319246167c6d2d5c0c304aeba71d923efd25f9bed2c8112cdad624a3211d9692814fb9029f1f04fa904b76b473fea9e6f83dfabf214caf5ffcf0c5827a34731b31e40000000090e65cb233571c73e4fa6c182120793001a990fa27b961e18ce833933d48bb801382308a6d3c615ead2f098dc4b7631f4101d559a2a2bd2908e41ce82bdb5edb27173450739eb2368b5444822d1ecfcd912c8628008c9433d1c4fc475e73d486032ea9e075da8a2b4f2f9159cc6b68a9e6147432868e71b7093fd7af04a9e50f5188b6d7ed57cb7627ccb31670df5db32d00000ce4000001280000009055715488a08c638d410ac1c3ecd21ae332880fc42105b976c6fb07d698c1b39faa8d9b12934b08bdcc693d3ec0128051cf80c4e9f86c5973eb6d40d03cec36dfb7c971d734262ccffa3dcdae15ea22750efebba45ac81f517d39f8659cfb7734733128e7a96775491393889c73de2e55067fa9a986af3a69d33cae41ca15f2bdca098c58a97d91dab3199c93d04f570e00000090b6dd3736805e84ea003952a85327a4e528da04d3b158b8f9242fd8024ed02a5adc297de3d2ee0ff3f63d4adcfac256d843cbafee96ade152809332a8547682ed599c1c0e91498f3994ba461857d4b8ec037262da4a92fe480505db09fb5bff17bf9eab8daee32e909fdb846a34388c9516fd376daed2955220b85798bc7b740014edc73ffea1a5f7fa15368d582c965600000128000000900a8ce8c6a86aca7ab9f6ea3fd6a2f6535f672840674ab498f9f5ae781b925f2b8e5a0b6ce75cc08e9241452c57590936b61bfdecfef41ce881ec548b0b5a0ecb0abd8405cb28b38d04c8c7f0df097cb424f19bc9257e5fccb7c90a57e15e5d92d6e2eb60ef12956afe176d524faf5fc418725146da3b7c57bb187f7e83046c8898b46713888b536f5ab431d808e4a52900000090891c999fb6f5f2736c46f3d6699cb9869d6e022a61931bbc521008bf3e3d57f048b7bf300a346cf384f2e73260b6796889c7e6416fea936b69dd330e5828ed21b7fee287d1cabd0c1ce21e2676a9ce451bd960aefee87efcf907e8433e3f986ca0d46a4c1c6074b37a1c444c4fd8447d12cc44a788108c3c25de23c9d5a50ee77d1e64d8f5c3c8533abf5df125140d320000012800000090fe755ae0c22e8a61cdada5c298ff8cee16a776607e29d4c7cef27e0de9880dafa71b65c64005522859505870fbef0636ac3066b6b7c7d61941b8a0448b7bf9b2f6f1385ded2e353b329f5bc5a87c2d82088ebe3fbf9907f30caf2c3b649bace27ea96165beeb06bde6c1727b19b6487b2508fa3dca2918a1c35bccd7eaae5e195ee06fdc2953d546542535d3a55c9d0b00000090abe888fd7163369618f463f6d33563db49f7ee9316b35662863a60378ae0312d1f1599d9c2a967ca597d2a6512577dfec7ad1a75364664b29bf2311db1edffb4d059048d653a950c4d7222a53cf069731a7edb0aea3e2d066e760eedc1ace79d8c826e5c2e001790d8c5b99571c174720a03e33f332858a22d1d217591bb4902d161fc4ad5cb987a08c4ed291960400d000001280000009031046819fce63a7102b44aac4c5f8c7a61a3509eb5689cdf977d59cd27c2ae4d1ce799c3c87ac8c8e009f16f8e668574eb7390c74dc034a69f6b3ed1791ae3e8ad9cb378051a96b03e146071515dab32042bc3e5a0144771e4350cf9e97843324a00afce01dbfdaacb9d7973ffc92a92087c71040899508ac6ed22f98cbbc28a326e5450a4d45fe6b3a647b50a41e56400000090094b3b1bba5ee496fc26c68a807f8ded13c145d68ba578d7344525cf8eda77c26cec928f2637327ddbc66ed7a010164adcac03c64a9fa60378d8ebb4d4ef6dc8a0abd085daf104110f5427e737d11dcf0f81eb371c02344fdab811faaa2c3f6848969da8dcff13706be21add66cbeb7a1af501f16c59213bb5ff15fb5622c77b4230bf65f7f99b506dab2da006c5685b0000012800000090ee8c783eec420a1c1645d48a5629cf8ce95d1fa8949367a9da12a9ede842d00b13110aee316cb020d0179e109d17c2bdd9ffdf4a5bc64fc72a5cd07458a7ef79c6724c251fb28c7cc17dce89e99d45d31469f8b4ff96a5cae2822972e78debb1e975944e56522f467d32fcb387c2fcb517125a849697ae7c264e80cf0aebdd9e8fd047d3f48a8ca181ddf60a21a4847800000090c21131eace51e663aa5ddf47fac03e4b8c1b3a386f11d0c4d4a75b8989b6176daedcda7cd3bf8250b611569ba72caaa70aa03db71feea8d09e5a4d8abd3d2094a5137aa8c52af5548d8a8fabb5bbcf0c17b6b9196a1dda2389ee4c780831b684ebb6cb86eaeade5d02c3cb5c9c09b5270e2aac6566015226bfaaa7bb1edb01a88c5583cb0a415ceaa8b0031cbce9c4e10000012800000090618ac49800cfa73d6833d7c6b8382e3409e91435c9901b6b0e6fa5de9c09f065853cb0829b9301e3ade7c1b3c01f0cde7b99086205021fc578bdc51e7aa843849c8ef00fb43a30f9a3c5e3f85ffade7b29e73fd40371222f8d668c62863d9235f3b8adb1ac115b5febddc0e305bc7e1c006902c3cdf60732133e0803abd9fd2d509dfb2fbe7742a9f44d82dba0ffd27900000090a184c9e0eefea15471bab69b8f0a6500c5442f6f042110173c5ad0827e5cd1932d38ea76f0aa40cba967adbb9e97e07db74301806f696d0d177cde9fa0ba61f086b206b98b564157ac24a5dedabd82792bbe9a051cd6b48514c3296d6c54cb8647df72025211ad123ee1cca0291ca03a245dcf0768cab5fa534d148c587ee66f5f36b89fa50df893637f0a2aa8db180000000128000000903b09966390159024f0c642e5d657b0635bc31168923f0a3e0736823d1efa7e48a642a25fb718221062383683fb84e2b64619ea07f026297b445f5bd02451f631087fad7617b2d16bb585866593009db0094d06fdcf120b60e1f4b1b4de7601be84406b9a5373ab0ae7a1793773567d1d20e39cc64e8fcd3e65b33d226a559f87e3029f022c545a449c6fe85bbffa7b0000000090c9f21a34cb2673ab1fec1f94b8b54e3829ad11becca8b51a924f18796eb5d6704d2770518fdb1fdd84c65b40fbc68a5a6c8a535d4ee2e118c851439db8b78ed4c57b8e3d11da1562164de0f87396911525a9e502bbb33d46d38cf863102c2f2e74fbd56811eee530baad35810faddca80326e3d63d9799ca7069f6797d294242373b5a58e6f1ed7330d0060939cb48ee0000012800000090367e9fc1b4a260ea686ac8ad04f2e2ed0761c35a27e3108e16f321d20c8acb40b641a4cd1f1c71d2c5e42b59995ea7d47080e33bef859bff011b38a8ef6b043f236f976c0c39a13f192db7011a5831f807013ac9d1c3a9b88810b0e6ded72f02265be72de608b63c06af3375a1e2daf8168bbf4ad7c401d160b6b36bbaf33cd7542211745a0d0d0abc709d284853ae3a00000090d644726cd54c87ea3ce66c7a5af8ec080a8e8a9cb8db41300b151a2c338e7f9f14ac0e231043934a7ed7bb837be46c7d187e90dd38298e904499932add5d825fd22ba4824609f4c54c3db28fc99507a916a8efbec6336f0b8e8390f5a5106612c428a0adc434d9320f9b9d390a4829e5079a5432b99e97699daf0d728421bf8011cb6bf401f53eb0c1beef6b85d8241f0000012800000090bf4cfcc3fbbd79ba831951aa02d8cf650e7d462d4f1c7cd2a5df1a7ebc6eaa87cd66782af865070338a0a76a66096528ad11288bdb1d9016c1e38e2bf1beadf952896e570071c57f7ac313ad813ac1d90b3d76e851416bd1ccb2dba2d128d6e8203cd39ca8b9d50955970c007b7dad4d104e291a8f5df57bdee6008fe68f0d8163da7984dd6509e2a58655ac2d5e74290000009081d736b83b29f9b0611c05a0dda2490330a97ea2ad65e48c042a3c8b0ad80daa2b6d51f6b19fffe03b50afa87da3262e80378f6248cf5efd1cedd041692aec4573d0e1fd5207c8b281825e76225765dc1f37ae1ba00845d72156077c6533826b991f5f788dd1a10cbcd72ea73f6515812b1ee78954d349355a2a5b9c1232eef4c83d94e20649dec3ab24760cda75e10f0000012800000090a3a61d404a07f45cd49966ed22bf3b4e9c9c5878f58915e0472dc8dd2eb594075d8efa7eb429d7ca61a6c9f79fbea29405f228e03d0bd978971e7f2a42856a89c8aaf4cc565f922b9f832af1c22d365c303bd283c6a1e7b378c5179620165d78bbd8700d4a2900e525236299768dff561ca13cbb25aaf32dd350f51521143a7bd81be6834983052b343e95102f69060300000090304e9b7a5f4670f2fcf132a631b18090cf542bd22bb0a45fbcaa1a2f4ff290e8eaf041592ce1d0e0873e0db3a5943d6ae92ea857d2321859ee87f48324df9198b44e02996ca66db592142f89cf938d6b2e98e9558fcf3af3bfd2ef38ae3506a31f4fe45d907853c60dd998a0ad5bef3f2a620064f2facce42d62d5a2506aea0aea0685b21c7558ff45f122aac0e91c8a00000128000000902640abd81a3da57efeb903fb7ee0e5b7f953a7002ec47e3a9abdf3305a41530e7eeea0371df3533bfaa215b6c987be3a6598e20caffdb7723fda7c5af5fac93d62973c5a86a6411304310f4c0d4da8af14e9d113f7df86b49d60342920cc20dbee12dd8f418d11b0842821684e87feda01fc946ef7c05ce56a9b98f19178f8de758e2af5f786b1fb8b004cc85cb23ec70000009013ec1d98f9636f93ead41ab3140fc2a411f5f2e021bbc9f72d95df91ca55084768d93d2ccebf83fa26cae9e8fa83c2b118fe1cdc46eb9daa30b2d011c40849f0fed65cfadc92fbef62d3630dd676c583125d62403618c5c88c41f689de97c1d75082ddcbc95339e74b677eb2d1318c620d0cc8c82f44736c9bdda24e8b0d706003fba7d4b23237920273970abb93545f00000ce40000012800000090d56eeaf9b6fc69437806e1be871c1ec2a0c23aa64a1d82bac9a7429ef2270bd2765c33c91f82598c1f68ddde7699a285cb64bd409502b8e83b42f1e28207a4e874f8a0b1444f2886da4755d73c7863da004d0689e149f89c368d424e5cd74fdacad44ac7584c9a300a1fc9cba944be581dadbe8d6dd1dc5f96fc4c4cccfa300fd2e787e80e7618e9c5be43003ce3d95f00000090f572e6184890cd783a2c867345f8bf18fe1461a046376de7473fb34c2fc2f1862f6b769d98e88f737eca890f5f5cc48db20571ed6660cec27ce064692abf5cb5a26e5202ff3e0e1fb703499d5fda828800f8b556e4c1224f985a8e2ed75c66b12aed838d942929590121f8983bdc5b7517f746adc73b0c09047e69b64eefbe0340c78aeb25efaf3c0912f93b4f98a0ee000001280000009044b6e3ad790cc71cd6c47f871fb2a86629693ec8472f30df83c8cb4f6001e0e78dbd947a4ada49b87a2dcff150b6735851336062fb4c3ba6a3a74bf35c3aead1860d1cbd5c3507e60a2ddf30ae898cc5018d40e135b8e5c7146e5b2864e91c23da095ef0d6ae535b7d9c6817babacd5313112b1fe26b533d29d413a52391cfa119c12eab0515970954c029ffe1f87b5b00000090870a1f0bae78d421ee6c9ac89c1d95a1b18a31d2b7c86ef2af7e568103d612834985339e8c33c7a5d24f90681edee45a8ece287a949c6f25427b8d26fcd5cf0b774dec6d70cbe0f1688c77266f78e72f1d8418bd3266b95e010d48d53cf30031328f6712893c9eaf368695f43f55f6132a50a634471b990ca9754480d43e87116a1df5bf3b91fdd2a639fb96215472b400000128000000900d2bc0b76f2e7fe9b1143b40fddf59fb274426ef2d5f01d7ed24ac9cd6c3b5ca1279f0216fd765c65be395648debc9082c5826acdd804dc1985826a6d30d9bae86783cd9a9b05a178e8bd613985f0cd71dd6a8dc8dde4fe04fc55f5b391456e02bd685d6a9ea14fd36c38d355d62673e2cfc54c674dce7da0b12c50c093f3ab559b8adbbf2b9cc3b4e3ea52509715b0f0000009012d6e407a368b98961a98fccb0ceb799977f6babcc11d9de75203f9b73dbbc2c141c38bbb43b4d3dff3ac3fba44c348fc35edebf22f3bff9af985e67e2dbdef73c0dcac8c368964f0257a5ce18e5e32a2efed8a3befc81d87c130698efd0a7e6a24a430448b702852988840630cbf639164d104f77092c2e2b5118a6e4be061e6143a9b70ebac3a15ac1a5bf9d5a65c60000012800000090aa1fcd5d082096320617c0e66f2b830a5c7c0548be3cefec89c8d5efc2361c6f0b95119c85d64121f78fcd7317e7c3481c4cc26ca0ff51ce151b8e891b3acd558b0d269645cfd61ec41c6e0a390090882a5e9f8e69af9d41543ab3be93a4a765675fe193213864305b82179cfffd52500039937fc63b2efc64a515492970bbb4a62a476c962bfb03626448e49f478437000000903283ac07cf03f2b74193fd9c1a16ff330ebfba1d6a8d4726cc6f39049af672c17930ab4ce63180b24922c18c43c01b4ac0172b5aafd299476b53e5ba1be50f7e877313fb34ee31354f0378b33b0cb9d4116b9298a40ed296d2b23696b6cd3a50986c0bdfd2bbb5439c58af6b351f9cce0103ab28a09841aebfacf6598c0ec25873088139ce3306e3bbf1a8b84993242f00000128000000903f890ff13d5bb64a96df89deceb505ae3bd968054cb6b354bf39a73e0d3908950a0d9aa8c2d5ee6e2b4fc0188a69c9acc5991f91e4d321b865264765c1de168d83c85ba1ac616ce4801017e5e4c34cf009a7f9f287f676bd11c67d9390ab116e7cb9dd8aa6b468a04dd31f5d78f9666322e6b4b017677a7ce3888a6618558310a0a6ac3fa061782f3c8c77d60f493b03000000900fdef5192501a6583cc3cb04a11f34997f3676a0d31183d87fb7e6255f8bfbd22dc5ca480c264ca60e894727271a00cdbab0b96de88c43e699961e0315f60675fff533af703b944fab3e2900cad022f4207fa960b0d7465156700dbb6587a95ef99dbfb10201d98a4064d1172feacf8430312b5dca5204b1ad73cc3599e01f077a070a39dcda3ea7edd272694debcc49000001280000009015560ec3cb3d4cb1a245fd268fb1c81831d317249ab55981783db915eee39b58771efa13b81e2c90852d5c3e7e74580bc8952a487c10f96b953ca1d86ec62284219910fa213d4a028db2cb3b9883685f209ccd6054af646b530afb5951dc48bc61facf9562420135f161a98d6dc78cb2206f2d4869841f67d3275e541e9f9d66e356d27a06bdaa61448c0afbacc8ad3700000090d445aa4041263de462b276c145ab0bddd25aa0c5f875e429c323e3f58d2d5e84a1aaa46e9297e5313840f3a6fdd600e68453e822744e24500eed099c27de245c542afd148c20548ed106ac2c4286641c0d73fb1acf582d06be8c11439786115b3c634b1be76843622d2b14785d6259e12b8f67d232257b9c837a590b2e69259495c3f9966f5dac6b9a7e7773003aced30000012800000090cec753f8114fcc724810c5123315bfbf96dad76dcab51ba41652b10426b9fd65d7a48cfb2784484e0cf61b8b65b20afc8ad669fa2c879d19028338017df945614e3ffe7c7a5a5f7e7bca84473ac862f403832ca2dbe679bbe6d0e1fb7ea7e21930afe46894c13b48446e6005ab935d841d5494ed8e72009c651dca2ac7eea7d33ec5dd615d818fbda959ef598a230c28000000905a08792b87fedc1a668185e3acee53c5144ac408216f98c9b819a648d5c146ba0499a9af83e36ca91c3f6cda0a225e01cd1e41f3ead0c4f4057c8cb6a7b4ed51911ce4b24ac648c3cd180666b4b74377126825d1ae86b7502e11ea18cd1c8d55156a8b7a1f25c21a92ac80e007c41335182b160006561e7773143e3c9a5dfeacf0e8496c2e2c6ddfd321c04d4673047300000128000000904be201a9ffda34daaf047d5b528835dd61911db450880b1bd3a2b7fc8298600159788b7e47f83dc625b8b9c2636b6ce78c5d2a6fae8c0d1d44009d0610dd2c6f82024a4b23afc49164de7c944b5e4d5f0e20f06069ce3ca7fe2f76c21918796142314525e4546f1e83888970e68dca682f51584adf3fd22f76ad10d759867c52cb7197f1649572c342d970b08729725500000090aeb1109cb748d04bf154bb94546157475bac2113d36e8d584e953a57a7fc212355f8fcd186697882282d6dded2e55b85abf920a5c57e756e7545faa36bce08dca2faa5429086a6976b8c4366e45311d41740d1c95e322047f5b5e96262040c69a166a68d6eff9e5e3ae83b261c0aedd61f830bd4c0a38e1f45c720774e902b7550012b2ba038c9d3710d851830b7c0c50000012800000090a492671e46d035652bae1de1e2d3f409c9391c7ad1315f32d2b686121a75c96756d4dd16f0ac1d666cff578f352b4569fbcba5a153ef82c7611c12421ae9027434bfec9260033fcc0267f44e5a3c4b4f1c2f31f6321a58b8f0ab6b7887cfc7107a2bdb59346fbdae29f343c62e2a5f1102f383e52f679f3d9757f3207cea70f06927d9526edf9b33ff2089f899f2825b00000090148bd8adb33b112b1aec51d508591ff6a3a960056bba4697b89ba23edb1e95b995fa9c1f96b530d117488c56b3351ea5990fcc431ad21c67acadab7ead8ec87ddaafdca660fad163ae6e35d3be395dfc14560cada59209dde10b230d7d4c662e3e7cfcaeb7a9a7a340dcaf6fb8fc15442b58edf35c4c02594f1bf3e5ea3e899f0b26ad62f036718681b829dbb55703670000012800000090e8cfe16147cbfbcede698b9c100dd416212652230a29d79d9716fbd8fa08514837c9644e182460c8eb5bdd694a89195e2365eebcd3996c4af7a1c8d3f887450a0d597a12cef9bda224caaab8a8ecbd982aa923fee4ef4f07e28bd74b4e2c8b0a5ef49674b749513e30b1a039186a3e35269a78b9f7207db380eda629301d79a07b27cf70748aca38a1a0b79dad0aa75200000090655afa7a84fdf37709cc9c7a283cb30c178a5446e7d6f18c54607be8526282f15985a92beaa8ae01cd798f9e4cffc106d86021e65154cfb1a47bbcccf2086f6a89226570e73ec7e47a8c842abfafeace2f3c6fdc480aff2705484a3fc91f494dcf5c427290aba416a052de63ecc50fef164919d1aeed69286f215447f69fca971e4a19421952128bd7bd133ba3a3e8a50000012800000090b00d676b1075c815808ac19b9d44e1b76010750dd21adb26c7a8519eb4c197de00b568d2593c1a4c21779ca05f86f074c7a46fdedd80c67185d13a86ce2d524835b8fa30c9b61dac3596b8717214dab4005681bbbdb96dffbccb423a2bd9178ba7075084be235f11da12d99caf6759a52e106f8e5e7d0f016240f1a9654c4750d34452a01d73afebd928384b0a95c0df00000090b770118ade6cba6553985ccb76698268a91a7e59537762d62cb83b5e2fbd6c78fea043ebb9a51314b8588ff85d7afe03837cccdc4f6518e4e51f28d22374f5814e7c6b5648c0d06563333f8926d162932a7f3a03443f27b002a613ba3efd51e22527ac9fa9fa7dd1234244612ce6b8430a02bd9ea02b7e86c7c9591d9086fdb8a986c8fe164fe57189995af4fb8fe3c9",
+    "calldataHash": "0xcd9a7ed1324b15c82eb2b86042643cd52b67ef1909cdcdefb26d2073d8664a23",
+    "decodedHeader": {
+      "bodyHash": "0xcd9a7ed1324b15c82eb2b86042643cd52b67ef1909cdcdefb26d2073d8664a23",
+      "globalVariables": {
+        "blockNumber": 1,
+        "chainId": 31337,
+        "timestamp": 0,
+        "version": 1
+      },
+      "lastArchive": {
+        "nextAvailableLeafIndex": 1,
+        "root": "0x1a005071a487e4891787073a91504fe6ea55280bc6f65a021fd6f7ca1f10aa02"
+      },
+      "stateReference": {
+        "l1ToL2MessageTree": {
+          "nextAvailableLeafIndex": 16,
+          "root": "0x0a241c83a063083fad29b6c333afcd968f71f8a875544ff1f1f08cae7f770f51"
+        },
+        "partialStateReference": {
+          "contractTree": {
+            "nextAvailableLeafIndex": 4,
+            "root": "0x1a3d3e40c90cd24822b9c268154ef14d4639febdb7af81b554cb2d651b88dfb1"
+          },
+          "noteHashTree": {
+            "nextAvailableLeafIndex": 256,
+            "root": "0x0d944282e11bdcfa5e8f2b55fe80db4c586087bfc10e0bbba5724d30b8c15e2e"
+          },
+          "nullifierTree": {
+            "nextAvailableLeafIndex": 384,
+            "root": "0x01c16141039343d4d403501e66deecff1b024bd76794820a43dc3424087813a2"
+          },
+          "publicDataTree": {
+            "nextAvailableLeafIndex": 96,
+            "root": "0x160ba3a7c15d7dd592a24b3f14bfa76a0b45378877d4dedc5f126f47844b99b2"
+          }
+        }
+      }
+    },
+    "header": "0x0000000000000000000000000000000000000000000000000000000000007a690000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000a241c83a063083fad29b6c333afcd968f71f8a875544ff1f1f08cae7f770f51000000100d944282e11bdcfa5e8f2b55fe80db4c586087bfc10e0bbba5724d30b8c15e2e0000010001c16141039343d4d403501e66deecff1b024bd76794820a43dc3424087813a2000001801a3d3e40c90cd24822b9c268154ef14d4639febdb7af81b554cb2d651b88dfb100000004160ba3a7c15d7dd592a24b3f14bfa76a0b45378877d4dedc5f126f47844b99b2000000601a005071a487e4891787073a91504fe6ea55280bc6f65a021fd6f7ca1f10aa0200000001cd9a7ed1324b15c82eb2b86042643cd52b67ef1909cdcdefb26d2073d8664a23",
     "l1ToL2MessagesHash": "0xb213c9c543fce2a66720d26a913fe0d018f72a47ccfe698baafcf4cced343cfd",
-    "body": "0x0000000000000000000000000000000000000000000000000000000000007a6900000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000016642d9ccd8346c403aa4c3fa451178b22534a27035cdaa6ec34ae53b29c50cb000000000bcfa3e9f1a8922ee92c6dc964d6595907c1804a86753774322b468f69d4f278000000801864fcdaa80ff2719154fa7c8a9050662972707168d69eac9db6fd3110829f80000000001ed250ed73db6e70805c4efcf0056e8695b79cd3ba418e827c184dee6c6fb0e0000000201864fcdaa80ff2719154fa7c8a9050662972707168d69eac9db6fd3110829f80000000001a005071a487e4891787073a91504fe6ea55280bc6f65a021fd6f7ca1f10aa02000000010d944282e11bdcfa5e8f2b55fe80db4c586087bfc10e0bbba5724d30b8c15e2e0000010001c16141039343d4d403501e66deecff1b024bd76794820a43dc3424087813a2000001801a3d3e40c90cd24822b9c268154ef14d4639febdb7af81b554cb2d651b88dfb100000004160ba3a7c15d7dd592a24b3f14bfa76a0b45378877d4dedc5f126f47844b99b2000000600a241c83a063083fad29b6c333afcd968f71f8a875544ff1f1f08cae7f770f51000000101f1de772c009f5b1660876343eb57b7a676a84c695b0c526de2f238c4181090700000002000001000000000000000000000000000000000000000000000000000000000000000140000000000000000000000000000000000000000000000000000000000000014100000000000000000000000000000000000000000000000000000000000001420000000000000000000000000000000000000000000000000000000000000143000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000001450000000000000000000000000000000000000000000000000000000000000146000000000000000000000000000000000000000000000000000000000000014700000000000000000000000000000000000000000000000000000000000001480000000000000000000000000000000000000000000000000000000000000149000000000000000000000000000000000000000000000000000000000000014a000000000000000000000000000000000000000000000000000000000000014b000000000000000000000000000000000000000000000000000000000000014c000000000000000000000000000000000000000000000000000000000000014d000000000000000000000000000000000000000000000000000000000000014e000000000000000000000000000000000000000000000000000000000000014f0000000000000000000000000000000000000000000000000000000000000150000000000000000000000000000000000000000000000000000000000000015100000000000000000000000000000000000000000000000000000000000001520000000000000000000000000000000000000000000000000000000000000153000000000000000000000000000000000000000000000000000000000000015400000000000000000000000000000000000000000000000000000000000001550000000000000000000000000000000000000000000000000000000000000156000000000000000000000000000000000000000000000000000000000000015700000000000000000000000000000000000000000000000000000000000001580000000000000000000000000000000000000000000000000000000000000159000000000000000000000000000000000000000000000000000000000000015a000000000000000000000000000000000000000000000000000000000000015b000000000000000000000000000000000000000000000000000000000000015c000000000000000000000000000000000000000000000000000000000000015d000000000000000000000000000000000000000000000000000000000000015e000000000000000000000000000000000000000000000000000000000000015f0000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000001620000000000000000000000000000000000000000000000000000000000000163000000000000000000000000000000000000000000000000000000000000016400000000000000000000000000000000000000000000000000000000000001650000000000000000000000000000000000000000000000000000000000000166000000000000000000000000000000000000000000000000000000000000016700000000000000000000000000000000000000000000000000000000000001680000000000000000000000000000000000000000000000000000000000000169000000000000000000000000000000000000000000000000000000000000016a000000000000000000000000000000000000000000000000000000000000016b000000000000000000000000000000000000000000000000000000000000016c000000000000000000000000000000000000000000000000000000000000016d000000000000000000000000000000000000000000000000000000000000016e000000000000000000000000000000000000000000000000000000000000016f0000000000000000000000000000000000000000000000000000000000000170000000000000000000000000000000000000000000000000000000000000017100000000000000000000000000000000000000000000000000000000000001720000000000000000000000000000000000000000000000000000000000000173000000000000000000000000000000000000000000000000000000000000017400000000000000000000000000000000000000000000000000000000000001750000000000000000000000000000000000000000000000000000000000000176000000000000000000000000000000000000000000000000000000000000017700000000000000000000000000000000000000000000000000000000000001780000000000000000000000000000000000000000000000000000000000000179000000000000000000000000000000000000000000000000000000000000017a000000000000000000000000000000000000000000000000000000000000017b000000000000000000000000000000000000000000000000000000000000017c000000000000000000000000000000000000000000000000000000000000017d000000000000000000000000000000000000000000000000000000000000017e000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000000000000000000000000000000000000000000180000000000000000000000000000000000000000000000000000000000000018100000000000000000000000000000000000000000000000000000000000001820000000000000000000000000000000000000000000000000000000000000183000000000000000000000000000000000000000000000000000000000000018400000000000000000000000000000000000000000000000000000000000001850000000000000000000000000000000000000000000000000000000000000186000000000000000000000000000000000000000000000000000000000000018700000000000000000000000000000000000000000000000000000000000001880000000000000000000000000000000000000000000000000000000000000189000000000000000000000000000000000000000000000000000000000000018a000000000000000000000000000000000000000000000000000000000000018b000000000000000000000000000000000000000000000000000000000000018c000000000000000000000000000000000000000000000000000000000000018d000000000000000000000000000000000000000000000000000000000000018e000000000000000000000000000000000000000000000000000000000000018f0000000000000000000000000000000000000000000000000000000000000190000000000000000000000000000000000000000000000000000000000000019100000000000000000000000000000000000000000000000000000000000001920000000000000000000000000000000000000000000000000000000000000193000000000000000000000000000000000000000000000000000000000000019400000000000000000000000000000000000000000000000000000000000001950000000000000000000000000000000000000000000000000000000000000196000000000000000000000000000000000000000000000000000000000000019700000000000000000000000000000000000000000000000000000000000001980000000000000000000000000000000000000000000000000000000000000199000000000000000000000000000000000000000000000000000000000000019a000000000000000000000000000000000000000000000000000000000000019b000000000000000000000000000000000000000000000000000000000000019c000000000000000000000000000000000000000000000000000000000000019d000000000000000000000000000000000000000000000000000000000000019e000000000000000000000000000000000000000000000000000000000000019f00000000000000000000000000000000000000000000000000000000000001a000000000000000000000000000000000000000000000000000000000000001a100000000000000000000000000000000000000000000000000000000000001a200000000000000000000000000000000000000000000000000000000000001a300000000000000000000000000000000000000000000000000000000000001a400000000000000000000000000000000000000000000000000000000000001a500000000000000000000000000000000000000000000000000000000000001a600000000000000000000000000000000000000000000000000000000000001a700000000000000000000000000000000000000000000000000000000000001a800000000000000000000000000000000000000000000000000000000000001a900000000000000000000000000000000000000000000000000000000000001aa00000000000000000000000000000000000000000000000000000000000001ab00000000000000000000000000000000000000000000000000000000000001ac00000000000000000000000000000000000000000000000000000000000001ad00000000000000000000000000000000000000000000000000000000000001ae00000000000000000000000000000000000000000000000000000000000001af00000000000000000000000000000000000000000000000000000000000001b000000000000000000000000000000000000000000000000000000000000001b100000000000000000000000000000000000000000000000000000000000001b200000000000000000000000000000000000000000000000000000000000001b300000000000000000000000000000000000000000000000000000000000001b400000000000000000000000000000000000000000000000000000000000001b500000000000000000000000000000000000000000000000000000000000001b600000000000000000000000000000000000000000000000000000000000001b700000000000000000000000000000000000000000000000000000000000001b800000000000000000000000000000000000000000000000000000000000001b900000000000000000000000000000000000000000000000000000000000001ba00000000000000000000000000000000000000000000000000000000000001bb00000000000000000000000000000000000000000000000000000000000001bc00000000000000000000000000000000000000000000000000000000000001bd00000000000000000000000000000000000000000000000000000000000001be00000000000000000000000000000000000000000000000000000000000001bf00000000000000000000000000000000000000000000000000000000000001c000000000000000000000000000000000000000000000000000000000000001c100000000000000000000000000000000000000000000000000000000000001c200000000000000000000000000000000000000000000000000000000000001c300000000000000000000000000000000000000000000000000000000000001c400000000000000000000000000000000000000000000000000000000000001c500000000000000000000000000000000000000000000000000000000000001c600000000000000000000000000000000000000000000000000000000000001c700000000000000000000000000000000000000000000000000000000000001c800000000000000000000000000000000000000000000000000000000000001c900000000000000000000000000000000000000000000000000000000000001ca00000000000000000000000000000000000000000000000000000000000001cb00000000000000000000000000000000000000000000000000000000000001cc00000000000000000000000000000000000000000000000000000000000001cd00000000000000000000000000000000000000000000000000000000000001ce00000000000000000000000000000000000000000000000000000000000001cf00000000000000000000000000000000000000000000000000000000000001d000000000000000000000000000000000000000000000000000000000000001d100000000000000000000000000000000000000000000000000000000000001d200000000000000000000000000000000000000000000000000000000000001d300000000000000000000000000000000000000000000000000000000000001d400000000000000000000000000000000000000000000000000000000000001d500000000000000000000000000000000000000000000000000000000000001d600000000000000000000000000000000000000000000000000000000000001d700000000000000000000000000000000000000000000000000000000000001d800000000000000000000000000000000000000000000000000000000000001d900000000000000000000000000000000000000000000000000000000000001da00000000000000000000000000000000000000000000000000000000000001db00000000000000000000000000000000000000000000000000000000000001dc00000000000000000000000000000000000000000000000000000000000001dd00000000000000000000000000000000000000000000000000000000000001de00000000000000000000000000000000000000000000000000000000000001df00000000000000000000000000000000000000000000000000000000000001e000000000000000000000000000000000000000000000000000000000000001e100000000000000000000000000000000000000000000000000000000000001e200000000000000000000000000000000000000000000000000000000000001e300000000000000000000000000000000000000000000000000000000000001e400000000000000000000000000000000000000000000000000000000000001e500000000000000000000000000000000000000000000000000000000000001e600000000000000000000000000000000000000000000000000000000000001e700000000000000000000000000000000000000000000000000000000000001e800000000000000000000000000000000000000000000000000000000000001e900000000000000000000000000000000000000000000000000000000000001ea00000000000000000000000000000000000000000000000000000000000001eb00000000000000000000000000000000000000000000000000000000000001ec00000000000000000000000000000000000000000000000000000000000001ed00000000000000000000000000000000000000000000000000000000000001ee00000000000000000000000000000000000000000000000000000000000001ef00000000000000000000000000000000000000000000000000000000000001f000000000000000000000000000000000000000000000000000000000000001f100000000000000000000000000000000000000000000000000000000000001f200000000000000000000000000000000000000000000000000000000000001f300000000000000000000000000000000000000000000000000000000000001f400000000000000000000000000000000000000000000000000000000000001f500000000000000000000000000000000000000000000000000000000000001f600000000000000000000000000000000000000000000000000000000000001f700000000000000000000000000000000000000000000000000000000000001f800000000000000000000000000000000000000000000000000000000000001f900000000000000000000000000000000000000000000000000000000000001fa00000000000000000000000000000000000000000000000000000000000001fb00000000000000000000000000000000000000000000000000000000000001fc00000000000000000000000000000000000000000000000000000000000001fd00000000000000000000000000000000000000000000000000000000000001fe00000000000000000000000000000000000000000000000000000000000001ff0000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020100000000000000000000000000000000000000000000000000000000000002020000000000000000000000000000000000000000000000000000000000000203000000000000000000000000000000000000000000000000000000000000020400000000000000000000000000000000000000000000000000000000000002050000000000000000000000000000000000000000000000000000000000000206000000000000000000000000000000000000000000000000000000000000020700000000000000000000000000000000000000000000000000000000000002080000000000000000000000000000000000000000000000000000000000000209000000000000000000000000000000000000000000000000000000000000020a000000000000000000000000000000000000000000000000000000000000020b000000000000000000000000000000000000000000000000000000000000020c000000000000000000000000000000000000000000000000000000000000020d000000000000000000000000000000000000000000000000000000000000020e000000000000000000000000000000000000000000000000000000000000020f0000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000021100000000000000000000000000000000000000000000000000000000000002120000000000000000000000000000000000000000000000000000000000000213000000000000000000000000000000000000000000000000000000000000021400000000000000000000000000000000000000000000000000000000000002150000000000000000000000000000000000000000000000000000000000000216000000000000000000000000000000000000000000000000000000000000021700000000000000000000000000000000000000000000000000000000000002180000000000000000000000000000000000000000000000000000000000000219000000000000000000000000000000000000000000000000000000000000021a000000000000000000000000000000000000000000000000000000000000021b000000000000000000000000000000000000000000000000000000000000021c000000000000000000000000000000000000000000000000000000000000021d000000000000000000000000000000000000000000000000000000000000021e000000000000000000000000000000000000000000000000000000000000021f0000000000000000000000000000000000000000000000000000000000000220000000000000000000000000000000000000000000000000000000000000022100000000000000000000000000000000000000000000000000000000000002220000000000000000000000000000000000000000000000000000000000000223000000000000000000000000000000000000000000000000000000000000022400000000000000000000000000000000000000000000000000000000000002250000000000000000000000000000000000000000000000000000000000000226000000000000000000000000000000000000000000000000000000000000022700000000000000000000000000000000000000000000000000000000000002280000000000000000000000000000000000000000000000000000000000000229000000000000000000000000000000000000000000000000000000000000022a000000000000000000000000000000000000000000000000000000000000022b000000000000000000000000000000000000000000000000000000000000022c000000000000000000000000000000000000000000000000000000000000022d000000000000000000000000000000000000000000000000000000000000022e000000000000000000000000000000000000000000000000000000000000022f0000000000000000000000000000000000000000000000000000000000000230000000000000000000000000000000000000000000000000000000000000023100000000000000000000000000000000000000000000000000000000000002320000000000000000000000000000000000000000000000000000000000000233000000000000000000000000000000000000000000000000000000000000023400000000000000000000000000000000000000000000000000000000000002350000000000000000000000000000000000000000000000000000000000000236000000000000000000000000000000000000000000000000000000000000023700000000000000000000000000000000000000000000000000000000000002380000000000000000000000000000000000000000000000000000000000000239000000000000000000000000000000000000000000000000000000000000023a000000000000000000000000000000000000000000000000000000000000023b000000000000000000000000000000000000000000000000000000000000023c000000000000000000000000000000000000000000000000000000000000023d000000000000000000000000000000000000000000000000000000000000023e000000000000000000000000000000000000000000000000000000000000023f000001000000000000000000000000000000000000000000000000000000000000000240000000000000000000000000000000000000000000000000000000000000024100000000000000000000000000000000000000000000000000000000000002420000000000000000000000000000000000000000000000000000000000000243000000000000000000000000000000000000000000000000000000000000024400000000000000000000000000000000000000000000000000000000000002450000000000000000000000000000000000000000000000000000000000000246000000000000000000000000000000000000000000000000000000000000024700000000000000000000000000000000000000000000000000000000000002480000000000000000000000000000000000000000000000000000000000000249000000000000000000000000000000000000000000000000000000000000024a000000000000000000000000000000000000000000000000000000000000024b000000000000000000000000000000000000000000000000000000000000024c000000000000000000000000000000000000000000000000000000000000024d000000000000000000000000000000000000000000000000000000000000024e000000000000000000000000000000000000000000000000000000000000024f0000000000000000000000000000000000000000000000000000000000000250000000000000000000000000000000000000000000000000000000000000025100000000000000000000000000000000000000000000000000000000000002520000000000000000000000000000000000000000000000000000000000000253000000000000000000000000000000000000000000000000000000000000025400000000000000000000000000000000000000000000000000000000000002550000000000000000000000000000000000000000000000000000000000000256000000000000000000000000000000000000000000000000000000000000025700000000000000000000000000000000000000000000000000000000000002580000000000000000000000000000000000000000000000000000000000000259000000000000000000000000000000000000000000000000000000000000025a000000000000000000000000000000000000000000000000000000000000025b000000000000000000000000000000000000000000000000000000000000025c000000000000000000000000000000000000000000000000000000000000025d000000000000000000000000000000000000000000000000000000000000025e000000000000000000000000000000000000000000000000000000000000025f0000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000026100000000000000000000000000000000000000000000000000000000000002620000000000000000000000000000000000000000000000000000000000000263000000000000000000000000000000000000000000000000000000000000026400000000000000000000000000000000000000000000000000000000000002650000000000000000000000000000000000000000000000000000000000000266000000000000000000000000000000000000000000000000000000000000026700000000000000000000000000000000000000000000000000000000000002680000000000000000000000000000000000000000000000000000000000000269000000000000000000000000000000000000000000000000000000000000026a000000000000000000000000000000000000000000000000000000000000026b000000000000000000000000000000000000000000000000000000000000026c000000000000000000000000000000000000000000000000000000000000026d000000000000000000000000000000000000000000000000000000000000026e000000000000000000000000000000000000000000000000000000000000026f0000000000000000000000000000000000000000000000000000000000000270000000000000000000000000000000000000000000000000000000000000027100000000000000000000000000000000000000000000000000000000000002720000000000000000000000000000000000000000000000000000000000000273000000000000000000000000000000000000000000000000000000000000027400000000000000000000000000000000000000000000000000000000000002750000000000000000000000000000000000000000000000000000000000000276000000000000000000000000000000000000000000000000000000000000027700000000000000000000000000000000000000000000000000000000000002780000000000000000000000000000000000000000000000000000000000000279000000000000000000000000000000000000000000000000000000000000027a000000000000000000000000000000000000000000000000000000000000027b000000000000000000000000000000000000000000000000000000000000027c000000000000000000000000000000000000000000000000000000000000027d000000000000000000000000000000000000000000000000000000000000027e00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000280000000000000000000000000000000000000000000000000000000000000028100000000000000000000000000000000000000000000000000000000000002820000000000000000000000000000000000000000000000000000000000000283000000000000000000000000000000000000000000000000000000000000028400000000000000000000000000000000000000000000000000000000000002850000000000000000000000000000000000000000000000000000000000000286000000000000000000000000000000000000000000000000000000000000028700000000000000000000000000000000000000000000000000000000000002880000000000000000000000000000000000000000000000000000000000000289000000000000000000000000000000000000000000000000000000000000028a000000000000000000000000000000000000000000000000000000000000028b000000000000000000000000000000000000000000000000000000000000028c000000000000000000000000000000000000000000000000000000000000028d000000000000000000000000000000000000000000000000000000000000028e000000000000000000000000000000000000000000000000000000000000028f0000000000000000000000000000000000000000000000000000000000000290000000000000000000000000000000000000000000000000000000000000029100000000000000000000000000000000000000000000000000000000000002920000000000000000000000000000000000000000000000000000000000000293000000000000000000000000000000000000000000000000000000000000029400000000000000000000000000000000000000000000000000000000000002950000000000000000000000000000000000000000000000000000000000000296000000000000000000000000000000000000000000000000000000000000029700000000000000000000000000000000000000000000000000000000000002980000000000000000000000000000000000000000000000000000000000000299000000000000000000000000000000000000000000000000000000000000029a000000000000000000000000000000000000000000000000000000000000029b000000000000000000000000000000000000000000000000000000000000029c000000000000000000000000000000000000000000000000000000000000029d000000000000000000000000000000000000000000000000000000000000029e000000000000000000000000000000000000000000000000000000000000029f00000000000000000000000000000000000000000000000000000000000002a000000000000000000000000000000000000000000000000000000000000002a100000000000000000000000000000000000000000000000000000000000002a200000000000000000000000000000000000000000000000000000000000002a300000000000000000000000000000000000000000000000000000000000002a400000000000000000000000000000000000000000000000000000000000002a500000000000000000000000000000000000000000000000000000000000002a600000000000000000000000000000000000000000000000000000000000002a700000000000000000000000000000000000000000000000000000000000002a800000000000000000000000000000000000000000000000000000000000002a900000000000000000000000000000000000000000000000000000000000002aa00000000000000000000000000000000000000000000000000000000000002ab00000000000000000000000000000000000000000000000000000000000002ac00000000000000000000000000000000000000000000000000000000000002ad00000000000000000000000000000000000000000000000000000000000002ae00000000000000000000000000000000000000000000000000000000000002af00000000000000000000000000000000000000000000000000000000000002b000000000000000000000000000000000000000000000000000000000000002b100000000000000000000000000000000000000000000000000000000000002b200000000000000000000000000000000000000000000000000000000000002b300000000000000000000000000000000000000000000000000000000000002b400000000000000000000000000000000000000000000000000000000000002b500000000000000000000000000000000000000000000000000000000000002b600000000000000000000000000000000000000000000000000000000000002b700000000000000000000000000000000000000000000000000000000000002b800000000000000000000000000000000000000000000000000000000000002b900000000000000000000000000000000000000000000000000000000000002ba00000000000000000000000000000000000000000000000000000000000002bb00000000000000000000000000000000000000000000000000000000000002bc00000000000000000000000000000000000000000000000000000000000002bd00000000000000000000000000000000000000000000000000000000000002be000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002c000000000000000000000000000000000000000000000000000000000000002c100000000000000000000000000000000000000000000000000000000000002c200000000000000000000000000000000000000000000000000000000000002c300000000000000000000000000000000000000000000000000000000000002c400000000000000000000000000000000000000000000000000000000000002c500000000000000000000000000000000000000000000000000000000000002c600000000000000000000000000000000000000000000000000000000000002c700000000000000000000000000000000000000000000000000000000000002c800000000000000000000000000000000000000000000000000000000000002c900000000000000000000000000000000000000000000000000000000000002ca00000000000000000000000000000000000000000000000000000000000002cb00000000000000000000000000000000000000000000000000000000000002cc00000000000000000000000000000000000000000000000000000000000002cd00000000000000000000000000000000000000000000000000000000000002ce00000000000000000000000000000000000000000000000000000000000002cf00000000000000000000000000000000000000000000000000000000000002d000000000000000000000000000000000000000000000000000000000000002d100000000000000000000000000000000000000000000000000000000000002d200000000000000000000000000000000000000000000000000000000000002d300000000000000000000000000000000000000000000000000000000000002d400000000000000000000000000000000000000000000000000000000000002d500000000000000000000000000000000000000000000000000000000000002d600000000000000000000000000000000000000000000000000000000000002d700000000000000000000000000000000000000000000000000000000000002d800000000000000000000000000000000000000000000000000000000000002d900000000000000000000000000000000000000000000000000000000000002da00000000000000000000000000000000000000000000000000000000000002db00000000000000000000000000000000000000000000000000000000000002dc00000000000000000000000000000000000000000000000000000000000002dd00000000000000000000000000000000000000000000000000000000000002de00000000000000000000000000000000000000000000000000000000000002df00000000000000000000000000000000000000000000000000000000000002e000000000000000000000000000000000000000000000000000000000000002e100000000000000000000000000000000000000000000000000000000000002e200000000000000000000000000000000000000000000000000000000000002e300000000000000000000000000000000000000000000000000000000000002e400000000000000000000000000000000000000000000000000000000000002e500000000000000000000000000000000000000000000000000000000000002e600000000000000000000000000000000000000000000000000000000000002e700000000000000000000000000000000000000000000000000000000000002e800000000000000000000000000000000000000000000000000000000000002e900000000000000000000000000000000000000000000000000000000000002ea00000000000000000000000000000000000000000000000000000000000002eb00000000000000000000000000000000000000000000000000000000000002ec00000000000000000000000000000000000000000000000000000000000002ed00000000000000000000000000000000000000000000000000000000000002ee00000000000000000000000000000000000000000000000000000000000002ef00000000000000000000000000000000000000000000000000000000000002f000000000000000000000000000000000000000000000000000000000000002f100000000000000000000000000000000000000000000000000000000000002f200000000000000000000000000000000000000000000000000000000000002f300000000000000000000000000000000000000000000000000000000000002f400000000000000000000000000000000000000000000000000000000000002f500000000000000000000000000000000000000000000000000000000000002f600000000000000000000000000000000000000000000000000000000000002f700000000000000000000000000000000000000000000000000000000000002f800000000000000000000000000000000000000000000000000000000000002f900000000000000000000000000000000000000000000000000000000000002fa00000000000000000000000000000000000000000000000000000000000002fb00000000000000000000000000000000000000000000000000000000000002fc00000000000000000000000000000000000000000000000000000000000002fd00000000000000000000000000000000000000000000000000000000000002fe00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000030100000000000000000000000000000000000000000000000000000000000003020000000000000000000000000000000000000000000000000000000000000303000000000000000000000000000000000000000000000000000000000000030400000000000000000000000000000000000000000000000000000000000003050000000000000000000000000000000000000000000000000000000000000306000000000000000000000000000000000000000000000000000000000000030700000000000000000000000000000000000000000000000000000000000003080000000000000000000000000000000000000000000000000000000000000309000000000000000000000000000000000000000000000000000000000000030a000000000000000000000000000000000000000000000000000000000000030b000000000000000000000000000000000000000000000000000000000000030c000000000000000000000000000000000000000000000000000000000000030d000000000000000000000000000000000000000000000000000000000000030e000000000000000000000000000000000000000000000000000000000000030f0000000000000000000000000000000000000000000000000000000000000310000000000000000000000000000000000000000000000000000000000000031100000000000000000000000000000000000000000000000000000000000003120000000000000000000000000000000000000000000000000000000000000313000000000000000000000000000000000000000000000000000000000000031400000000000000000000000000000000000000000000000000000000000003150000000000000000000000000000000000000000000000000000000000000316000000000000000000000000000000000000000000000000000000000000031700000000000000000000000000000000000000000000000000000000000003180000000000000000000000000000000000000000000000000000000000000319000000000000000000000000000000000000000000000000000000000000031a000000000000000000000000000000000000000000000000000000000000031b000000000000000000000000000000000000000000000000000000000000031c000000000000000000000000000000000000000000000000000000000000031d000000000000000000000000000000000000000000000000000000000000031e000000000000000000000000000000000000000000000000000000000000031f0000000000000000000000000000000000000000000000000000000000000320000000000000000000000000000000000000000000000000000000000000032100000000000000000000000000000000000000000000000000000000000003220000000000000000000000000000000000000000000000000000000000000323000000000000000000000000000000000000000000000000000000000000032400000000000000000000000000000000000000000000000000000000000003250000000000000000000000000000000000000000000000000000000000000326000000000000000000000000000000000000000000000000000000000000032700000000000000000000000000000000000000000000000000000000000003280000000000000000000000000000000000000000000000000000000000000329000000000000000000000000000000000000000000000000000000000000032a000000000000000000000000000000000000000000000000000000000000032b000000000000000000000000000000000000000000000000000000000000032c000000000000000000000000000000000000000000000000000000000000032d000000000000000000000000000000000000000000000000000000000000032e000000000000000000000000000000000000000000000000000000000000032f0000000000000000000000000000000000000000000000000000000000000330000000000000000000000000000000000000000000000000000000000000033100000000000000000000000000000000000000000000000000000000000003320000000000000000000000000000000000000000000000000000000000000333000000000000000000000000000000000000000000000000000000000000033400000000000000000000000000000000000000000000000000000000000003350000000000000000000000000000000000000000000000000000000000000336000000000000000000000000000000000000000000000000000000000000033700000000000000000000000000000000000000000000000000000000000003380000000000000000000000000000000000000000000000000000000000000339000000000000000000000000000000000000000000000000000000000000033a000000000000000000000000000000000000000000000000000000000000033b000000000000000000000000000000000000000000000000000000000000033c000000000000000000000000000000000000000000000000000000000000033d000000000000000000000000000000000000000000000000000000000000033e0000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000540000000000000000000000000000000000000000000000000000000000000054a0000000000000000000000000000000000000000000000000000000000000541000000000000000000000000000000000000000000000000000000000000054b0000000000000000000000000000000000000000000000000000000000000542000000000000000000000000000000000000000000000000000000000000054c0000000000000000000000000000000000000000000000000000000000000543000000000000000000000000000000000000000000000000000000000000054d0000000000000000000000000000000000000000000000000000000000000544000000000000000000000000000000000000000000000000000000000000054e0000000000000000000000000000000000000000000000000000000000000545000000000000000000000000000000000000000000000000000000000000054f00000000000000000000000000000000000000000000000000000000000005460000000000000000000000000000000000000000000000000000000000000550000000000000000000000000000000000000000000000000000000000000054700000000000000000000000000000000000000000000000000000000000005510000000000000000000000000000000000000000000000000000000000000548000000000000000000000000000000000000000000000000000000000000055200000000000000000000000000000000000000000000000000000000000005490000000000000000000000000000000000000000000000000000000000000553000000000000000000000000000000000000000000000000000000000000054a0000000000000000000000000000000000000000000000000000000000000554000000000000000000000000000000000000000000000000000000000000054b0000000000000000000000000000000000000000000000000000000000000555000000000000000000000000000000000000000000000000000000000000054c0000000000000000000000000000000000000000000000000000000000000556000000000000000000000000000000000000000000000000000000000000054d0000000000000000000000000000000000000000000000000000000000000557000000000000000000000000000000000000000000000000000000000000054e0000000000000000000000000000000000000000000000000000000000000558000000000000000000000000000000000000000000000000000000000000054f00000000000000000000000000000000000000000000000000000000000005590000000000000000000000000000000000000000000000000000000000000580000000000000000000000000000000000000000000000000000000000000058a0000000000000000000000000000000000000000000000000000000000000581000000000000000000000000000000000000000000000000000000000000058b0000000000000000000000000000000000000000000000000000000000000582000000000000000000000000000000000000000000000000000000000000058c0000000000000000000000000000000000000000000000000000000000000583000000000000000000000000000000000000000000000000000000000000058d0000000000000000000000000000000000000000000000000000000000000584000000000000000000000000000000000000000000000000000000000000058e0000000000000000000000000000000000000000000000000000000000000585000000000000000000000000000000000000000000000000000000000000058f00000000000000000000000000000000000000000000000000000000000005860000000000000000000000000000000000000000000000000000000000000590000000000000000000000000000000000000000000000000000000000000058700000000000000000000000000000000000000000000000000000000000005910000000000000000000000000000000000000000000000000000000000000588000000000000000000000000000000000000000000000000000000000000059200000000000000000000000000000000000000000000000000000000000005890000000000000000000000000000000000000000000000000000000000000593000000000000000000000000000000000000000000000000000000000000058a0000000000000000000000000000000000000000000000000000000000000594000000000000000000000000000000000000000000000000000000000000058b0000000000000000000000000000000000000000000000000000000000000595000000000000000000000000000000000000000000000000000000000000058c0000000000000000000000000000000000000000000000000000000000000596000000000000000000000000000000000000000000000000000000000000058d0000000000000000000000000000000000000000000000000000000000000597000000000000000000000000000000000000000000000000000000000000058e0000000000000000000000000000000000000000000000000000000000000598000000000000000000000000000000000000000000000000000000000000058f000000000000000000000000000000000000000000000000000000000000059900000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000005ca00000000000000000000000000000000000000000000000000000000000005c100000000000000000000000000000000000000000000000000000000000005cb00000000000000000000000000000000000000000000000000000000000005c200000000000000000000000000000000000000000000000000000000000005cc00000000000000000000000000000000000000000000000000000000000005c300000000000000000000000000000000000000000000000000000000000005cd00000000000000000000000000000000000000000000000000000000000005c400000000000000000000000000000000000000000000000000000000000005ce00000000000000000000000000000000000000000000000000000000000005c500000000000000000000000000000000000000000000000000000000000005cf00000000000000000000000000000000000000000000000000000000000005c600000000000000000000000000000000000000000000000000000000000005d000000000000000000000000000000000000000000000000000000000000005c700000000000000000000000000000000000000000000000000000000000005d100000000000000000000000000000000000000000000000000000000000005c800000000000000000000000000000000000000000000000000000000000005d200000000000000000000000000000000000000000000000000000000000005c900000000000000000000000000000000000000000000000000000000000005d300000000000000000000000000000000000000000000000000000000000005ca00000000000000000000000000000000000000000000000000000000000005d400000000000000000000000000000000000000000000000000000000000005cb00000000000000000000000000000000000000000000000000000000000005d500000000000000000000000000000000000000000000000000000000000005cc00000000000000000000000000000000000000000000000000000000000005d600000000000000000000000000000000000000000000000000000000000005cd00000000000000000000000000000000000000000000000000000000000005d700000000000000000000000000000000000000000000000000000000000005ce00000000000000000000000000000000000000000000000000000000000005d800000000000000000000000000000000000000000000000000000000000005cf00000000000000000000000000000000000000000000000000000000000005d90000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000060a0000000000000000000000000000000000000000000000000000000000000601000000000000000000000000000000000000000000000000000000000000060b0000000000000000000000000000000000000000000000000000000000000602000000000000000000000000000000000000000000000000000000000000060c0000000000000000000000000000000000000000000000000000000000000603000000000000000000000000000000000000000000000000000000000000060d0000000000000000000000000000000000000000000000000000000000000604000000000000000000000000000000000000000000000000000000000000060e0000000000000000000000000000000000000000000000000000000000000605000000000000000000000000000000000000000000000000000000000000060f00000000000000000000000000000000000000000000000000000000000006060000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000060700000000000000000000000000000000000000000000000000000000000006110000000000000000000000000000000000000000000000000000000000000608000000000000000000000000000000000000000000000000000000000000061200000000000000000000000000000000000000000000000000000000000006090000000000000000000000000000000000000000000000000000000000000613000000000000000000000000000000000000000000000000000000000000060a0000000000000000000000000000000000000000000000000000000000000614000000000000000000000000000000000000000000000000000000000000060b0000000000000000000000000000000000000000000000000000000000000615000000000000000000000000000000000000000000000000000000000000060c0000000000000000000000000000000000000000000000000000000000000616000000000000000000000000000000000000000000000000000000000000060d0000000000000000000000000000000000000000000000000000000000000617000000000000000000000000000000000000000000000000000000000000060e0000000000000000000000000000000000000000000000000000000000000618000000000000000000000000000000000000000000000000000000000000060f000000000000000000000000000000000000000000000000000000000000061900000008000000000000000000000000000000000000000000000000000000000000034000000000000000000000000000000000000000000000000000000000000003410000000000000000000000000000000000000000000000000000000000000380000000000000000000000000000000000000000000000000000000000000038100000000000000000000000000000000000000000000000000000000000003c000000000000000000000000000000000000000000000000000000000000003c100000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000401000000041c72e330b60e0052863df88b19ebb482d412b0a7bbb2fabb9347be5e59453d10078d263242fac5a2ad544b5005bcea367ebc04e01ff7ca279650bc63d9488ac304ad4d395e21ea570da47bf574569c6526312c5c7ad63a6d248f694e5c81c2b60e12693b411d9eb8f564aa43f4aa14e3e30f8574425a6d6491416332b77d2709000000000000000000000000000000000000000000000000000000000000104041414141414141414141414141414141414141410000000000000000000000000000000000000000000000000000000000001080818181818181818181818181818181818181818100000000000000000000000000000000000000000000000000000000000010c0c1c1c1c1c1c1c1c1c1c1c1c1c1c1c1c1c1c1c1c10000000000000000000000000000000000000000000000000000000000001100010101010101010101010101010101010101010100000010151de48ca3efbae39f180fe00b8f472ec9f25be10b4f283a87c6d7839353703914c2ea9dedf77698d4afe23bc663263eed0bf9aa3a8b17d9b74812f185610f9e1570cc6641699e3ae87fa258d80a6d853f7b8ccb211dc244d017e2ca6530f8a12806c860af67e9cd50000378411b8c4c4db172ceb2daa862b259b689ccbdc1e005f140c7c95624c8006774279a01ec1ea88617999e4fe6997b6576c4e1c7395a22048b96b586596bd740d0402e15f5577f7ceb5496b65aafc6d89d7c3b34924b0c3f2d50d16279970d682cada30bfa6b29bc0bac0ee2389f6a0444853eccaa932b2a60561da46a58569d71044a84c639e7f88429826e5622581536eb906d9cdd25a2c0a76f7da6924e10751c755227d2535f4ad258b984e78f9f452a853c52300e212d8e2069e4254d81af07744bcbb81121a38f0e2dbed69a523d3fbf85b75c287ca6f33aadbac2e4f058e05924c140d7895a6ed167caf804b710d2ae3ba62b1b51297b3ea37637af6bd56cf33425d95cc5c96e9c2ee3077322fbec86a0c7f32c15d2a888c6cc122e99478c92470a1311635142d82ad7ae67410beeef4ae31f0902ba2fb964922a4610bb18901f7b923885c1d034da5769a48203ae6f0206a92855e2c01ddb3d6553386b5580d681b8230fa4062948668f834f23e0636eaff70aaa64519aafdf4b040bd2f9836e76b9dc13cfec8065dcdf2834d786e06260d10000381000000e00000001bc00000090885bb3dc3c13f4414222efad9b9e5e6b380905a8824d722dbceaeae44dc9d8f03a7be52298709b7534e26a43afc7358bfcd2bd4fbfc4bda7e26710ab1adaac6ba47592ec789cebf41a2a12564c39819917de5950bb458c1f2a5029ba060e2d5d7d84910480c7f4a07c46b54ed36598d30818e99871e918f8c1c422c04d3cc0c6034ff9f034e9052f51c041dde393a1fa00000090ab3f3be064898fa1b6f88b2ff00e4928b3c5074286fb4a5233cbea038470b013e00d97e2c5e8187839db90699ea2e69acb15662fdd32653d66d1437c02754e56bfa7ef5169f00b77081d637d027dc86f1878e32c0f534c68a6985e5154b69be52d4f03a2b62fd36899df06f76bd7520724dc30c460bbe024a21939761482bb6c41ed47aebb56f42ce7d95bf792ce12a500000090860b182ed78831afcc1c928be192425f7ec533406dd66e925bd2b588cb89b642a4f15df2f79a177ce5a4aafcfba4bb8fb07f032f632ad17cc725e21c1bac538ee73ff2d5e77efe715e12af88d5453b690d75b692974c3327b985925ac3abeb6c12445c6c4d1ec51b7127cdfc90c95b5b23e5cb8afa1a351a612293ba6272fef9f8e3f82f138b961b0f76d7a7c916e4c7000001bc000000908122eecb03c180f9e3ef677d4b29a99dc26c88054d0734600668041ecec1868207a66b01b1941de1354cd8223c1f4ea3536db5305c02ec0e2a0e2858c2f4dede7e33ef9681d52276497da6e65343f0a1075a16514a1d323e1071ceb7439ff2ab6276cb29fd051c0eeb6dd7111e0e87230f46712569040b814d9be577d854fd02f917aff118f5ad14a25d05c7cee039e8000000907f9bde742f35c0ea8e81b656ce7d988a9d1ae00195cda79aaef816dd37548f9f2eaa13d46c5ddf3124ca0fb34fc8bff0b45e9894f8ac16ed038ce9d5722d6566d24f9f57f486ef0829c9b741bd1c96ea1c3f5c3f5a87b843d9787218ad4baa5af887e172a82b016d8506f6c953dc96581ac245bb267cd88bd8bc7e3ef9df7ccbeacb18bc1b30534368589e4f570a657d000000905c12faefd7a7cf65d6475e18ee99a942c6567d3473919de144ac498665fee34772f883fad49d250c33d1ff20fb1085c86137de6471bca35e6a5f3f7dcf8b6975e2605312d9fbf714a1cc9a58650c208016fe29c4c8ee1a0c371dfd02264cbe8642ca0ad671b2479af0f5e0a749d8b33c0da2f7e7fdc61947f39c7876fca728ab5fcf1761bc28272190b3defb9a9844f4000001bc0000009032d67ec8b6e9dc8ed89a3a411adfde6239b51667715c9c72cd1495db5b7b746380cd63f2f9188450f9fd686eb793b2de5af97357e09da777a8ca0c84995c44d2ea03208445c25361cdac650588c6d005191231bba3b350c452e6d76081873b450b2cc63e013bdebb1da5a9c18989f12e15fea068d56e97030101e058be618f286cf66719580c5295c1dcf3de827aafe100000090c4c9ab378f4957c8ad3b68e592e857830ac4c1145a8923918ead849873221ef658e0378e93fb196ead3eb080d1972fe4305ccf439751f57220004c8d3aa8ad6b686249f4687f5631902fda016643994226c6c0a2844bb06ef567624f1d06661a640a856e863a38e568b21cd4af6be791029fb2443d6e6c7d660ddc85c0e8de0b2b5f0a148ff426f1115974672f73164000000090c0ac0d3eadc05c94a097a0a76b9a68fc58d6ab8e66ccd223ed628f6950310bb2f369f2f178b3444802ced1a56fa7f57cafbbca09c7ce687cb7ed3f5a95601f6d7608c9be2f6df2469cffe14cf1b13f830bf1a1b9646c29be495fbf6f801ed8be5fc9d45cec5fc743a027899ff6b362f303db01d279fd5ba05817a92d8129d004d6edaf359c08bf964cb1e5d2fc99e5a0000001bc000000909105457ccaa2ba3b2254ee3ec3f19923a82bac08498ed2016ca2e9c0bca04979fb7577cd7c152ada33b82a8e40bebe45e497e2861502176e32c51cd5b1bf0ca91851cf7b3724cfb9a99417c1a4d2d90d1f3d35bb9eb3912108d1867043c38b4d5aede3570128855f56cb6d0348bcb8f52a8eff8224deb07c301555237486c0f37ddfa0ac08b0a5fda00f5cfdaad0cc0e00000090520db5e2d7b662e04f3988c5a428035b057f059f3cddb49439eefd9447458a99c733dff4b5a1702a9d392586195b02a24c5f24628d078f7c01bd4f422614bbb0c973a991475ce0ec2e678361237fa0251b16333fa4c3aaa531f98d1960466449964e3f5ba7ec75bcf322e87a35a2230a0ae9882a05db7731b4c6ed6da99efdf06c0815623698d8b71ade16a55ffc067200000090918abd315fde38beba7259c86af4ce352f12f1444481b6c86c23d5e2cfc4d98c90b6d8fcf7c30a5fac7dadc86a5ba8a47dcd1f3b16484812924f79a9e00a9633efa90b62f21bed0f8f3776cf69d0607b0fdbc918a51316145718e4c48dbc323e187982d83abbbc1fed4fbe2762e72dd91cb8f0c539b4ddd4f9a4a8ff6cf732127a0970de63718120523fede4ebab7f14000001bc00000090e5c846c8a6bceba584c29c0fcba48265a2cc20f6d982541b13654a15c1dc00c8ab9c8f9c52fb6ace413a95b1979eedca8d2d2385a622dfeaff8402ba4413ea16b78733f4e43a82bc95a56ad1f72702a72e025499b65d4b2e326cfdde34b3092c9e1c3bac6d610d361ce7dfed8f50d5222f161e3a59f5747a8183cb9719f9ffde5ea72eb1c5bd561c4f78f3c05614854f00000090e31a6868b9f9f24b79786034d06810d25c594ce48750e39ad996631cc6c8b4fa9f230fcdf32e1ad67e9acb892334f24cfb07267de8cea562a28788554cdddfdb323b4700800390c25434473988c7a1520c2bfeb394e512109f0d694c4b7f2d6e2abccbe414cab48a25e8de986b9eec3f07b0575584b0b455ede60d373f90f0cd6a2cfc08ad9be1056d358c821a436d0700000090f9b974c64844d04929e7f9c06b1a701ea02486bfb297c7a56f7728ef7df3a0bc21b6dabf6eca6273b68469cf0d06948166bff4c6c580bdda0d72b5a9aaee819d6c2d92a2aa8cc0cbcecdeb57df7c91740f87cea4888233cd5563a7ddad4f1e414ec745429f1ade6b2568319bb65f7ea123f67e4f1ac6379f7c9efc978e0c06556f16cc5ab6b3255f5a116d86e68f92b5000001bc000000907953bb52ffe6538fcd1c69c4bfc577b4217d27e17a1ba9d420df7a5bbcb32c825690e1b3af4f9b76566aebfaaa83c6cd22c1d27dbc979a94aa3e402148dd57399b57425f74b32fca7bf2b7ef88da460d0bfaf4dcc899aca398cfe7385d4d569da438023a5ed8a0b6c6c98b32acc95a300a9747a52cd664c6527005f2410fbf86e48135fb602da0f0e0d7857bea44051900000090a3b31666d69aac0ea75b4f14b3c9396fd413990d05b380e0ac360465035f4cf07e35324f15b51e964c04a49427d35ac6fd5db99837d7dcd05b3d1546571c15cc7e8f668ea2f445d003286827e3844ea2087b51181bec332e626019a95fe5b1e370875fc41a322c1cc340c8cfdffb068e302518cb4e24106e35373f67b04b8b2404468aa5a1a3899110061c89883d29fe00000090d1999c3f19d70a38351b00a5d70f267d7fd0e3e4ee253580e5e481cf1807d4cbca753bee71bc94bb0374278a884538302276e452e26f67ebaa2d1b223592faa44c2b85ed845d988edbaeb3dc64f2fd471c1ab57b02972ba4bff3448a513807cd17e1deb756ebd47960c340e18c2215121682c2c08a2f58c205f3dd24be3227e8e5a6385ece8905943a219f2cf2a84a6c000001bc0000009091d5467314eaf5b1accdb366a18b157b487db5445ef026a27a7c039767fe5777ec102cdd027e1856edb816f3d712b9135ae6acd56b7f80ccd23352dc17e48eb1be8e25532e56e281cf7afd9f0175edce0e51f5cdf9df26a39ed40a26306ff94f1ad73ceeecea7ea03e98b9ed0b69d4b61b6295d8849a071c13cbdd25f83e2ab9a3c1692eb19437cf4dae483f4bdfbcee000000902c6729e585ad2a150e094714412881dfeccd6d60a55adcc29b9fdfa1016ef0ab2820fd8f9231f77bcb1733becaaed726ee87c5a4b702c8b93257fb27c935be82c9dfed1b8f08d61ab4ec2e6a164ae4ba1c4b49da7b7297615009824dcbf37340527cf19158255916c7ae72edb381b76d19c20e326c044d932f963b5e49d123362ba3a165da27bf7b7efa26f10a90c25a000000908669621dc7cd48e795774a7d44493d63f672bec71988a8b652a0119101122345d4f5278a4d2c4f85309f677e9fe64375497073e4979f8b5d630ed62e8c88e06400f943d692bef2f370fd2bdc257ce2a125c6249e515cdceaab38f0b785ba054425a8a0ee15bd18cb0e1b8d91642d258b1ccbdefe5ba29c900abdc7cf8488b350aebf7296923e2e7f2fddab87acf35497000001bc0000009013e5e112b7fe339b2a5f07cad03c54af89a78e678aee76caee1996cb56cde14977c629c05ce5c914c5679145b0ab2461ce54394347072f363bb7066d448cdf6d70787f37f9d8a1ebb125d5198dd36ecb12ca14e6abe05439984c3953c86ed574bc0c8cade296aea9515ccaaf373734aa1b0474cd87dd3dd712a2371d9523ccce1d15b8702687ab97d0f9ee6f6b380ad400000090bbb31ce264b3254aa8551f77c4e15dc2356ef9e10ffb578b55a3bfcd3d946c16114859069db76a87e5ab25a7b8306fd41279dfa485ef9c1db1d5c8004d63c3f34581224a32fa05e8ef6e70c30a1a19182bd811c146c561484318b36158684b49bc0a8f633a41df89168feb871b6ecb4a2b2104c7f6e0e9046a1429a4c4ed010bf7f6661084f4f8413e60902b7091f88600000090a91313ba29284c043712351d55c47df69177271395548514ca22cfa79ded9689580b0c17c68ea59fd91245265cf933fe81786a0ced256d7062e182cb7822942ba1ba5c2c4e59c8eebe1818026b64ddd90a3dcde82e56d891fca6eaf4ba2d4aade3e96a26996f873f968bc78452f88e0411fb57ec23bc04c829c6e516d8989b853cf3072d9b16c0673e6bfbfaf2d0ce6700000e00000001bc0000009077ecbc7fd165d9ade6abc8ec7aef76b307b4f0223202b5466cc8aca4f4fe90fb52b3d6ec1aa36ce127e2e721c5164107d36be2975e0d3971c94455e550a329c776fdbbfc9a4c9fc3f66c073df1cab5140c0ef7dd2d4e3340d7f197e560996c17112346c052cc156c207e34386dd47c5307a76ed514cad3a7f59744c81c9d4a12fca48fddd3fcb143337dfdd7ec351038000000900fa810dd90147de9aed3bd9a035708540c69924bc682bd1b6c745ca73b15a173727a74b8a2de40894906a813b64960245376a7fa37c70f709f0552450ef76a5129d87870b369dd56847c590f502c2d210e9385ff9ff7e691a2abd5b6c0d96a9c709a3cc6bcfbbae261361777da8651420149af77f0630d9d328073fdae21ed6114a4eac5c741c26c6e0818f1ecaad2d60000009046ba7f5a13e47d1bdfc6d3dfd1d0b5529f4672d6fce5bb7384d19ab2a7e15965ff3a34c081da31d850786656c7af8b8a966a005c0412b141e855058472063a65e1899ab0db0d61a6b34395504e28c7b2146662c3df31eaec3f04cb6114cd8dfdafaf17f3dc1d382cf2dea579a814b57e1009058a127493317697cc37cf718f5e0b56f99aa09d5b3b8f26a02fc5dcd8ba000001bc00000090c5f9eec88ce8e5c36979798b376de2b28f9d1f2607d9010e5145af8a3ac2b0e0889e5c178be25060b061b1d583b471784a0461f9213e242dcd470a18200afc52b435d47b8a567a76a6b655924b5c2d8d209fb502a2435d3cd3e140629a2cba64126ecdf5236da4b089fa4ac315c9daa01d6453eb8857cfa2114cd3da25cc8134fb99b4c06a640bf6c4c808852b82629500000090db6ba5dfa5e3424815ffbfac8ef48fd05131be802899cec2852251c113b5eec328de64a9e640b3a243ab6202d27a5854e269a69fafa7a4d7fa960db62ae810c139a60091fccbb29dfebc4def6a50f2051e051255d552589a7b09899cbca9d89f6cdfacdda4f03ca9f5b4aad25bf947e52a717cbb1e27c6de6fa93a38cb53c6c0e287fd92386eed743b29ec85a557fa2300000090e0ab72826bfdb018ff4d03de311e647e1edf6469965bc5d2ffcd54e7167ac350a57457540af8de0dada31bc4b3ca199c9bf4686dd797c67ed21b34946ad241c5db1a87a1906abd877e7965b206b371bd0f772722bcd358dc890cb0a4707a1d5ff6590dddd773f3099b84d10f5158e2fe05e583c964cea3986aad35c7bb2799f0623ccc3666686764b9cbd53dd3f0c43f000001bc00000090f37fea372a0e4d26e6ce992dea6506f6cb992331e094da50cf92d329cad0b8e40fff1c0694bea939816aeb8fdff615d8fb41bafbb4662078337b7398a607d09c7fa8448ec27c7581855dcc12790c3487271cfb0703aed8612673183ef7d52bf2c449bdd023a9a743b7d25115cc403f181190481c74b41df64e1711b0d058f12ce16b634e23cd6b298e87810d2a1c399c00000090eaede529f772b2ba0f4c57c39e6bbf5c9e12a6258a38c8086d5de7dedbbff8306c7479719a5fe90506d0853a6f9bf5c12c45fdf1c62f7d5cebab84e9eb3eeee1acc6597e29e2619b96a7ccea4a9dfd0516bf834c8113f8f1251070908929a65e83266cf023f765a0cca29aae566444c71810d6d67cbefe9670eae9d7b6a1e57bb6a1fe6749e21806a4ea8bfca35180790000009024ca72f55751c3a2f1fa6b5ba8f2828de2b402c8c2aaa76f8df3fdb3678ade0d07b0788a3f9909f47d4e463a327b476a43acb8d58ab355c4690648fad19878ad62a77fefa8a731af94fd8f819253aaef2fdc29ea25c6d4027f1407247ee783138d98285577d29f0828092ce8a3ac13ed04afffed27a7d7f250f700a5e772b993dd262b911a9c92877ec640d9f5ac6d10000001bc00000090bf464ad4c3858c0122511935318812b1dc1db80b5cc1c41a7ece66dd0ad5dfab7ece2a9a6d3a514d7ee39a02ddc66cdbbcc1eba73167068723fd267fed815f38b52fce696ab3f6c2d63c3b45513043ca09f41a2a9a9479a22e62c45379405216747a71b6ec183f4a671cacc8f667ba09026d61f7318ac5b2253cf5d96b658d7bc3b65f67636aa573eb43c640ba3f0b6000000090fc3bb64b89c9cfb06dbe7e87bef9c2ed71c2610fe2cdef0aabb138cd39f373fa94f8e881c2c3e4365af09072249a0609fe24f34a3e8673c734414fc70fc617806704d7c6f169a61c4d7fd9ac7cab94cf1c8a9d504d17dacc3d3e1b766e29a2d03c8a5fa3c3e7e2b27062710f4407da3e0093123ff99e90c7ab2f266674ecac51df1d170c62327fe9de0b9c81d0095a2200000090e67f3ec573e658b392cd2af096090399240c98c2466f8e43ea5b8bf53ba1e940fd98a86bbb52540fa1a9475378f8027ac77d6ba02c736f758af04da2b72ca496628260263774bab8c3a81e23005a2397154774b7846b16ee66d0747096517db61c7d4d1f175573402e14c4394a87b1f52b0fcfde42d9382df89a7425f41484cde25adb6e0b1eb35edecdca08f00fb9d2000001bc00000090b92ab763c1a69450d42ca10e52b125b9d8bf3512fa879d1c5c9a119892600534bddbd15de8fa6edced3fa0769b21c711de0813398cd3bd5ffd439b24f9db1a24e03441895911fc88c04ec2712b4d2f3c1bf2209e64d6e55b9587360872f1226bac301ae33122e23d6d59fe0120e6ecaf01b2e7887f9a7a1fa4623ef0f907ecf15b1e0b581d06d90d2a306c831d58d43c00000090101b4e9c41460d1748945f6074788e6f58db9a4df2ccddaf42c6f84f25432c2da25049fb00d18a9d5b51240855aa45157630078f02a5994b984a016edf39c7b241b8adede8c713ef1eab761ea4a2bac521fc229f1e999d246e8ef60db122c4a43541fcc0de8a956dec6320195efec3371730352fcdabac0f9372be84d1fb7e831e2b501aeb45979d1fe19bcfcae3b9bf000000900d157efa8bd9a51be9d467c060ab5746781db4a3b2e061380eab0d4cf66010d4cf2a401519c37a570508d5741ef30989846c9c53f66600971bbd070ca178ae00a55f3408db0059da1a2ba3fbbe619f7519156ea4a7d89b9e516e59a14f5f56af35c7f073610680b3a6779b708a7e18b425ce215d686bdb0d748dc2d7a5548cf817a16503766b44c712f4ddf321efebda000001bc00000090432f1ded3d44abdbe01ed2e89bafbe1c84ce83fd12888412eff36d79004f12d8c5aa5cf6998f9602930de2099096ec24b72003891060293e56ffffc61033792d6d4b556e0bad2e6624cf37ef92e4ca4f05773137660f3d57533cae96467a188770972d3471eccf940669dbf863942beb0810848d08161aa59b931ce25fc1df928083ae06435d59017038ec2374f54964000000901ec087f95def019a6d27fead9b8c62367f0a42f0f824302b6936b4550f3d653f374696ead3bb36a59f5526dd24cdbf8bf1dfb08e8b89bf89242f1ae76a79bd1422dc52ada85bbf65708c140678e3f7222d7b7f8657d5e96d2cbb68fdd06d45c0dfb2829b8ff69a5da3ad31f00dd3a71e0b16dd7146a35747ca925ce14ddad8160d540aa2803897cc722441d3503b602e000000901c3c14c105ff0677c2b7bf1860de56d70f741ca09b49f0a839963f236d958d7ebabdce53d6da91b119fc0da0f8a7d3918a9fdd4eae1ee313fda1566c0c3c966387952db18ed31c0f77186e9b0c67e6ba1422c74690427f65d8f9fd25f55be251beb77b6fecb3f61c9f7b2e3579a0a1ab091f4551d92a140245fcf2dc16111c828b2736d8324e00f64efb617d64277fa8000001bc00000090348b7cadb6aa9f85cd97001f740bb85feca57ee53572b9a56a9d9a1e4e769db7ccdef3debf02e57ae0786d27402dd9a5278ff5752c85b405a846a990636563c637b5236dac5ee0e272df43c5a5acd4911e9f04d01ffdc8819a526b0b359884a573186bf6c969de2c6d9a11d74e49d2782765e69acda1b5b090aa61c13bb6dca062d9fc1a09eb879a3b58ccae8c612f210000009021a8dd1b296aab46dbd0d7336ac88e50a8274dd5a227635b585d31a0733ffe2057c07c200b964c1bca0a63c793094621216447b62462186ea3534500d23d7b8fcbe56fdcb5a8e22486ceb3e62b9e68952846eec38b0971ec951954f28452f406bf260528914f82a7b05ba8737c46331611597218df81e21e78428fc58da592f9dbec3fde5615a8b66223b76ed24b78d30000009004a7b293f9b9a54735caa22d4e730822f32a72ac3114072e275dd2aa3e10e71c8d89fc3d41c10b7558d78d793332586cba01ab7c771759ba407af43201460f11fd189b726113f86bb9c4908556e7968d2ddad4cc3a1234106629acc17c9f1fbb47920d12b6260e26f59332ad056c925f23cb2eecd2773358dd743d732f11a094bf601aac5fe92730befd8d4b017fe1eb000001bc0000009050ca80f334bbc31242863e214c23ab508ba9f4b2f4c6c318ce7f7cd303e34aceaa8e543831819cb1575987598d38b426834612ea5d161657539e1ad5ace79ad7acc9622166d5a67941eb206c025b0f272f9967d93c2e40396574d8603c73304bf7433d34536dfbb635f08df960e394f8131d2b030dea5b231f632513433ec71743c5e0c9a837197924c84cf3e0042f6e000000903e6b7ccb8fb9aee6edaecd83fd6a465f54a9f561199d250c36097a23c74c46c22bac99e6ab6d80fda580c6d9c4a42199882b3a4819b2907f18cd651afc0131e780861448ae81e90c4f92d6c0957395fa0586e104bdcc8fde67272abbf2fbb93a14609d947bcf55f89cc334fe91c6aa6d2589c6d4ec464c2287021fc6b7b8ff630688c8a2d0373c2587ed1b2e3909883000000090d2c093b2f85d296e8671bbc3f6f5391f045b26835609469fd6a83a589bfa2687d79d63e602d211d6a8124d55b55bee99099153428b6d511ff66b37f3b3ee2d15ef9a80cd706fada648a7d1d937c36bbd2879b1913d2d6db30feaf51a63bf177c92a795a848069bbc68daf69319b60a540b37419303e5c8d3cf7975b903de8af1ab3dd703d8346e7ac301fa14c3e68f3b00000e00000001bc000000907ff933d189f81ea3642beee9b48974e68e9e69542a09eebc48b9a4be59fc6fc87a75474afe61162e15b85c0b3a03a564070ea4503cdc512fe86696d40224b5edf6b8b3de24737d5e7b35cf5fe8f0c96c0c6c3ae41877e8c0e1eef6f00d3475ed9ce518b73c3e91279bfb7e57b8c995442551cda3d4ab1e89d4f3c6ada8086ac7904cc2150c135f39b897c5a82b70339f0000009007928174e367b1a7cde51eaee56a0dbd0e65af2e74364e419a7d2b371a3eca01e83b6b2f7ca72fa58de8ed0c1c726cdce8311e9c4866cfe27e6ee7edea2284c1c0ddae1cd9f7a3f353d8b8167cfc9d2c2af85275570b040992db2aa3300b2b3071bd479cb815f3e0d6993506f853971d12f2a9ea933931b1664ee07d80c28a624ac667e95102856051f6579f45009fcd000000905fa9a3caafbedb2619e3affc97847a4a080591b04e2cb361f7f2e55a7f1295940ee6f7b6dc1132f7bfc4805c3abb05766bcc9c8f35db538338fd68e4a3020dc785d4337e2f8370731f293e97863207be11243ae71cae03139efa9e54d811dc21403bf9b52f0887fd95b30e615b85fb21007c03a84c093f0517d973a119e1619e7caec744579ba37f16602079745f4753000001bc00000090987a25b73f65f2ffb8491c4601ca2ca3304de1fac189aec1aa22e53f06c4b325d17e1cad996a33a0ddbb512a5e9529ae65a2d7a94c349113bb530728d589f37a1734f9895db9edbb4e507af3f6faa6c02247fa80098f678f699fe4a4b43ec18dc67a90fa3f974a9558a24665d7a8d8af1b719b78a52593fa1f42a60722695eed537deacf71f4e4f2613d391b473a24e7000000902486518492ca3d9af84919350632ae15ea3acc2e403b1d03598d2c41c7f3f49c7c1b4cd39a6f4b5bb2650348bfa507067094fa53ab6ee3cfe966cfdb7f8286e3a2c4c54bc0ed379c2509da262eecf1e42e60c8e6b78f6f6ff676cd1bcbc4779f4ba311444db1ff73328425081350f8c9265e22695d968daf3961d4460e192cf7e0dfd4ecb35987f26f15ddf384e9786f00000090a035e12deee24a5e08a2495866543f5d3e69aa4dbe1833e5f03d4e31325cc98f2203c077dcce09b9c4bf4c773e537169c0b6c98ca9f72d0f4cf9bd31f474acbf85aff1adbd726e06cb8ecf50764cb02921496a96f309573f72da144935092109f981ab64fe93baf54e26c3a965f3ab8c1251dd4be4dec9fadc08bce3cba9fb05f437e2149251cf69e5ba957333249a42000001bc000000906e96280f3810327378590f7e808274f9e3500a837aca9675d825305bce9b99f1a554c9a06ca60c373d827a468865a127d26eb16286e67959d066c892e4dc7fc367ee7298efe9b66990dc8ceb62f4c126214606c6e4eb48a3c1b4b60461f04382b583553c15c31a82814d751d3d84762418e51f1276e63e174eecebd3356a6a24c22ab536f8dc0c0c119d384c8547f17500000090158506ef9a1b0e59c798120e3fd2aaf1fb0fa649c222d9dafb90126823897979902670747dcf04fc6c23a46c76893f2c27426daeb5cd749f2588738192f84ad5ba20336682d83b768c95e17a5556f2c106b0b8a13199d07892072b6ff24437e74578252bb37121b9051e0ea551efc0b51d1d6b26dfba5600d91aeaffeed73fa2e9ee594fd2cb7047aa4d2d03779152c200000090be71589c5a47bb2106bb583414f6c299d5334de49e1cda93e4cf7aba43b086e1452202f154f198ed55b740b8c6c147ff20da82092899ef2f5aac0b1903808a72c437b275b272080f6a56d0bad9bad3b007edcc2c7789331b9dea6d42cc66ccfab47957c65a53147222b1a679f97856fd224bf31878d31d399b7f807405ff21bad369183fd43539a96dedf0bb039b1637000001bc000000905feaefb78dad13f506904a0a8ddfcde668ce2b96c854e90217fbbe08c52b40a69000d08df2be4d438d0abfa5dea2f92e248549f578c32513cf9a5585c931b70693f201544a2ece54ad15fcba157c16bc02ef6b9bc6d71d434b8e392ae8daa464716b56d0054910d56d8befe80cf6ec4f03b982348f197a68fde937b72bcfaeb6feb679647050fac1c457f1a21525114e000000902f105a0598720611323092571c024ec366dc188231287d98cfc8733689b76c2e0b9ac5b0d9a1f06b14a04b6521db798faebb482ac475fd05515900cb706dd52fccf94e48e6f4c047ca1fa4b1a76ca2450554cf084201b58d05396ebb16d2a727b488cf4ddf54adda4fc2d77bd8e8ce1e1f4189dc56924b2474a9f07b677ae53bee5132e03507a3915493d103818d8cc6000000903f23b02b0b2c344563356dedab9a1822bbaa38472671f66aa32eb96ebc7acc0d9bbac392717301706db1ae2cee765b7a4c6b4bd4f483f2e793c04a91c032a490959f1055389b6e0de568be6749a355432d80e888df790c9758ad4d31944b5283c51f6c9674c637af6a1d668000c91add058df99de856af3dc222de6a7235c1558c904e6ab43eabfacdb5e899ef3083d4000001bc0000009042d66efc1999d9cc3a74958ebeeb00616575c07339a9b85ee9ac70807e2c26f57affd7c8b975b17746a53f38b7291fc0e70ea60b87030aecf9fbc56f69d7e16709a7b0573f241fc0a381b1289d19e9eb08befc4bd29a5c80abc3789ab4965198acf9cd2d316eec45341c852626d39826245909e10a630a5409db99b1b723784a9384c71439590afe2962438264d5bdbc00000090795f8aae2dee0f7bfd1745eb31ae1eb4a51e707ac4e9d94140982969b9d87f3fd708577d7e1432841eed2000242ba67b5e1be6f8c749fd30785982548a8f7a3b96d50175a0f621d0427f4949673736d2012cfcee5067706942f7731994c88fa108a100bf9bea62afc32dfbb40740de802823d98f4fa9d665bf042fa79949618d06c6dc2151f0b6d240ad112107086743000000909f6e5df2028a34951931c049d19597ea2889d835811dd4dcc2886c68679358252fb69433796aa7c29c2948faf8fad1a2d41000f21888005ad4455d7ffe096f9b6d547f99e7c98a2f48f708045ec341342c0f7be6683b92f84480220acaa5bbd233e38ae3e6c4dbfa3d68f0b3dc534c4d1b3d4dce8e9e49caf5d32332043761859db4de6554bd05994282f209e1547c35000001bc000000903f5fc4779ae15b6e4e71bc5fd54a3bd1cc02c0a6bc36fe912017d61af548dcab6856747cd9a95cca8c74f7ddeafacefd7fad8bd40175718b52e50bdffe03c9ade10eeff3951530318127a035b5c254861352a0d60bf8eef77a140c80e2bfd6d52c2c4fd3aca155b8d7b7c9c2c94a494313d812fb44147d114900388a0f453f393a7acf67f8b2147a11cae5e3a76cb22900000090e6a39320687fbb56c5535f28e5191e44fc59eca93af556579b80b8afb40b074d0d6106ac199fc63738eb9e96c88ccb4e6767b5fd38a84f2beed8ffdd55dc4f57aba138771993667a37c2077c47718fd605e755dec6336bf599c1b293fdc517946add0f7b491b95e50ddb417a111d70a800f32c920dd2bdfd9b49a93b1bfa839af68068cdd7e79c823125afc0771b45ce00000090124fdcd9c9ecd351686468b9553806189382da42ddd3b9f9a5c60e57a3a61eee8238e5fe72fdf1b2cf5dadadda519f9b718e4e8630b7556969ee4561365d02287252117d9dac2a534de6890b0b8986d517d8483a2cd815ad35952532d2cd0b96518b05a90464cdd86481533d4396a4ed1780df72d871c6c60006be9f461ff8e072eb88e21826eb57d95c35adf012b193000001bc000000903dc8b81c61e31e46df07e46f78f0692c46810fa584ce4a5b052ece068582a9e2d6b79a38a053988a91b3683f9b95759c253a403a0197f168453aa3bd6111b92b7b74bb832db54df1970a7c85bcdd0c0611e0427135ab6ad2f65dcb52ed33a8e4c4cda1466ad7e36b34cf7e6dcaad12352c8180d68bcaab93c2ac042ecb2090cdbfe09c14cdc35276498e109ac3fee1950000009057607ed1d961be7596f94585f1caf398aec447c13efe341f9efb5541667966a01ea7ae8f68b7c331deb863dbd5377e88afb701d53f27587d33a9d550bfa8a89bbf64491a6c75920e702fd40e1cdd7c62295212b7fabc6777d6398f10c2e26e84d9fce24d790e063b3c45ab10569f13ed1a50075f5eadabe86b9a20519a718d04c70444b1444577f9c66d611af2fe6900000000902fd59afae3531c091f0b1af527123c72a9a5866d71a539f4ec63a92c17f90c29e8e216cc6613ef7b2511a49b0ee30e5fe0e49c3e4cdd715aa1c61648edc0ea63879820bd31c8160b287c9bc45eb199fa0ee1405065bededcade7d7483faf26758d8ce230ecaeaf050106dc489fb3444921ddb4cb2ae5a99c67c5f47ee3146af7507cce360b312931ad00d5c9853c808e000001bc00000090339261e4bc115373cdd81aa97f634f5d7c6946f2e0c66173e0e92cef5271058be9398da5720a2990533dc29310644a1c9286e040cb2aba0c0bfbd9a9aa0dcdbaf3d4f983c1c117493a668dd0f8587d1529b6bf45ac12dfd898adba5c8a707187983bce68f26569352a64ca11fdc7c00a2f5704b437401fb50c93bb239f54c45a1a01020d6822ecdc52a2ae9b1ef0f19500000090c62ca5026fb3f06579914b1bd762c2f7d970dd4a0e1ca53a932bdaa2ada4669dbbe834f155ce915d5b5f9a95c4ff86dd38cf63d4655cb325a96652ce3239ae46d076d8a1e42ad65e1605868fab37c9e9271c4e1c60f1dc489ac1a6760a4d65ceb788d28ec9f9608f6b6b51b669ed7d7d05a68f00bc45edc3bbaafe8040eb003240d829a7ab5abd5c08b704a133c3da1300000090f6aabd420544a76d49845959ab8a7446907c856d36eca872fd03825af49ae1fd624980afbe6cbe8545c9b19f2fc902187053e898ef583863e23b8d75b28d53a589cdd8cbe0485d06ea5764af82c0b50b096d432d56165bdeeed573899ba5e2e54c531ab438fa3e04fab4dfe9c5f33b49029c1a800a3478d456a50d1a65ef205f067a50e14df920267a09da86d6b5a60f00000e00000001bc0000009081b533c19f9ea09698de206e7060910bc57dc8d813ba6c05697fb8e678a5400cc945c5730ddf55b66eb9b2af5d19ca0d2bc1b2cebd24f6d343be3df5124118f8cfd30ba83fe191b2a71580c520d9bcab07a662c630a3c38b094a24dff8edd325b941ffcfbbf5ab3b2a6fffb34e80a2c111e78d60dc5da2f56c5bd8aba5ff575fb54cf015b6c68249abeb3fe6f382054f000000902d9d872378e35007659a028b9932bfa562d5cc9497a290efac692f461e15ca15082e89da8fa4e61a5ed05cb04a05b634a29b8f400eb0141fdd527417db9abccf04983ac0cc3eaf54d54188c99b1acd002bd34173e0955a2070b01c4855c7d09487343c19814ff57d8f6db903b0455d8a1c30b0c4d89d0c25842c00b83c768ceef639a36dacb8e813496d8d74a7aac97a00000090b3645acab7284cbb76e855d65ce1a6409a976ef7eef84076ff3e9c81e082b68f6e30a2442cc432288ed3a8ccf1dd9c95063bbeb9de5bd2c4e0c9ce5a0c048b9df6149cd4b6183894c68189e2830cd82006351d570efb7f797b2d0a0b6f6121d6e4010499c0e923f04e469fb7036bc7152325297a743f2a24c0f38abf0e07675f39c3dff1e49558476ad776765336afdc000001bc000000904cfff83681a7a5873f438da49c480a564760923da235a88b18ec0f61dcd4dc60990b054436b66db9ed6368151c5da1a23c65f0f7f411896bb68946aed5c2abb6dbcdb199ec828dae21c34d70beae85101e4835377c3c25b12533a5b27bbf38a35047101ce00ab135f116f1927224c50712f959fef1a6c88c8d55cbe7a55008ed10747260e702f52b9a548305d4b8329000000090cc1c0fa87ad4d63cf26652627c40b5c54fed5804db179624bc6acd1ed64062e99e50275acf40f5f14f636bef91f5bd06d1b53c74f041e2858a1e6be62e32f872c9feae8657d19f0a5f0d61e28a7cf10a293d2f3d7669c1f6b9239f3e13660638daff0b8e8a1e3b31c1f36b55e4ff00741a54f7c156ad4e5308db482411f67e3e5493c930f2b9a41cbb857fa021421217000000903ee0b537aabcabffb5be55ea148e36d54845c4c184afc6b82a6be6514ea76c6bea77eec81579c5546880400b75134aa330ac5a6fcef933c3998b1ce6255e0dcac2a1d350d36a93c172c13185e0d387860b5de897da7483b22fc9dd4f2cc55eac643f08234737c20c67b2c58d3e208dc226cdb0fbdd90d3d00ce2373d450e7bd9b0296a2cbdd5c1dbf022b999f57ff094000001bc00000090524ca07fe30c8c4b5ca4f5c30b19b26f5d48a18abb3018c3972f1399d26a4920ae9cc13175fcb5585f9a3de7fc5b93111f91a81b7341480c5405af4fc19b186865383120286d32b59824eb6858671f3717a9ca67468b73035512e400896ba5c3da2836243fffdcf1abe906989708889223149110c40f0190231349a29ea1fd5cd90d21b968fbe0175d12ca2e91c7e31d00000090d2b61f4dc7005d290c3bb0e2e29320d8d4f78f35bbdb039a82e736fdf0ba077ec6b61aa79cb4f5da870ab4b09e9877ebfd034099cd674a85b9e3530911105e7993ef21bf6a8c589c710272200885e0c524a40802bcc072e6d43ddcb05f118b4b499104df714e2bb3f8568b16b54712102b65243a7aee8e410875ae13bd78e8746955261742dea8e086b419a16ea822670000009088c521d8b967b463a34b682d0d95113ed739324461bb8a24393bf3d1e34805e1bfbca641c585882c7e7b46905eb52b4588d6550ba0317f180495ef1e48e5e1e2f5c85dc42e88c076803d156a1f98819321e8d52a0b6be6a861494767c0489b704db84ec4d00a3d01466828a1e757ec200a5a0ebb0da0a9f13d4e2c519f1bcb03d1384274c82cae2e4e6e0accfe245edd000001bc00000090ad5652c5b40a2e0ade1c6726b6ac76cc768b00d45a9cc1ab4554afdb607301d0bc099db8723da2dc52734bc4927cd7b335233d27178a21b613dd59435fc801dc77958bfa25910b8063aa34448505d19d19933ca47318945bfa4d6c4f41369a30fe64be98673d558e567b90441c7a147f0c95e731667b7e1d7998ed3d953f22b291bc356abdcd73e7b9039b88b2d74a67000000904780b45ccf61c3de2220cf58ecbec5dcdb5a3a443fa0b7b37d702fd1b8aa8e48ea26ecd5dadd864592c64004cbaf9a2805f25689492d19ad823534a86c178ec191422bf60140fc122ca3d93463c5d6af06e98f63ddc257026763032f400e637b71dcbbe005dcefc29ac33162d028af0c2acc579b0a8c35caf3e249642006a1d68758eb5ea7a6d90fbcda5550d71e6bbe000000902489b951c1a9b520c4b7e5011fa47eb550ffdce7065ea6c13347fd4183fcb7931bb8edcf70fd8e8de3c587072c020cd93bfeecb8fd54cb0a0f8c4e1041bc3bbbda63d0497ff92c489b047e4f01e670cb277dc0c721f2831d00c27d75f5a2ddcedacd04286ef7519275a2042e992edbbb28ea02edb47f972e806a903d52a11fd79d9cc29f0887b9bdb1f4523283db6d55000001bc00000090f4ff9b70f9dee895ca55478330399090da2c9bc277ad4dd105de8ee9609028d4c74239fcbb7e86a35c06e6fe42470da1d53effa1e4c0d7f39710fa119494f6e649d49e2979bc3be19d615c9a953ef4b127a887fc9dab54f3f36cc232325652765cd7e18621b50ad412400adafceb328326fc36c3196efe68e522b61972990c5e8b95eba426282fabe0af94af7c06275900000090bd9fc82eeeace4532ee7da395f58e3deaddfe3deb5e72b092fab45e7626ec3ba338b93e1583061cb06db482585b5469394466f1144af00b45ada25286e855befdd67d455ff4e335492b0b2a5ff6cd8d3259245cc0377625dd5e2e72f504204885816b9c84726056eed1cf72c70634a202937b608a634aeeb05bd136bd9ac24122d8dd3d100b88a1c1d1604350423413400000090f80b9f9afdf659211cab55dcc889930e2305e6f90089afd3d6ec0b7c579f5943fa68c8be02ad5ed2f6a464e6e83f86176337ba8dc214d0b78720901d7695f77f2c1dc82d3829f4e8a89af6fe6a0678c320bcd0b21480178e196081f5f6e3ac2fcb59b26dcf0f4ddbf97cdf9e037e235f1806db8666164caecd51adc6bb7909dd8a1b9e1b3dbfe80f92160f877d185505000001bc00000090ec8da01e88882da9805de3c48de5120f670f68cd634ce5a94ba8ff7706d5457e624c85363657d934a4c129aca182ad9d0ae52f3afc8b9621a2665ba1c1265280d185e9abf182086840e1a405ff3055a70e5df2685d17ec0a168af1f16c90a492a241cb7bfc1276c0856d43e8c38c8c4714928b2ea1beb7cba5f50e67f098fc79dae0eca3a309d824110502b53c146cdc0000009054191925f54c1cb204dd477d4af343a48dbe94262b52f10385866c5328ebae400f18c388b729cff56611ac089091d8206ce3661090832cb66f2af785d014509eba20318d49530be6b830681adbc5b79d0900bf101900f0fabbb597f5da57b818749748314bde8e747fcfd31d70b582d20cc942e31e78b4c565ea5acb9f955133d3a62b5bd24c8d04d635a5aef01bc1180000009000db8c48c3d6c782f324829aac6a809e6445a3b95bfb78f00b8731a237f3e3df79a97bca9dcd93920695b9d2f79860fe42103c2309e090123f15fd626817f554bb3cd4490fe27a01518ab3f9952c5f53296beb7bfe849c319322d0973c865c0fdaf4da5313676d1579c89cbc9e2c4efd1ff5feda6ea27765bca2f756b2bcf325d803056c0b1f569d1a8345f0efa03ef8000001bc00000090e05f7f135fbdf5012d8bed12d4603035f483381bd7ea8d59fb56601b2780e82a98163fe27a804647bf6155bc4e52ea317683b996c31b3c9541abfc935232f9966c9e87c45e75143235c7a8ac69c4366c0f9af16f9efed127442d0e36b5ec1f6eadc2052a1a99fbab79b5fa6e48082c5d091a5f81b7d8541c46bbffaa596c23f3f4daedb33fee367b30f20c027bf7973900000090c75f59b067f17eab4f3b2707b7cb0e3b5434055cd2e7c69d062a45e6bf538b130276f40c54b86bddf16009062c6abde9e796be6311d599df6ce74e37c0c4c75018064532454c43f4f2fe44e41a827a67022434c5dee8b33f66dfea2b57602e7efd47dd73ac2b620ac8059e04c953ba111c014ae2bf8bbc25c954c938819506a534e2989b46d54a12e3bddb3132851a8400000090a276c465f3f517c61b4445494fcaefcd37520602b8e96adffd9275f4343eaab23d88ab0f2ad91b55617c695f327f92bb0296abfafa615958f373447432dc6bee8e383575a942b13de82d1efcebd16d792cb6bdf6050605ebbb7bfea70ad7c64325fc23bd75431fa8dc1b15df3ddff11a09559a9501f97227e77662fd0bb22bfe0d11bf44c6b28324f2b2eb6c267c4604000001bc000000907131a50ebca59ba304aca4fa044f4ba68ad8b80735a8fae6d5f1c922132b5a5c3730c328430149c093ed9f0b7c5969039e1adaa5a52d4e846a745b98f06697c36d51670c9001f50f6c32bfd2960ce0612df65bec6fc910bca5289826210a89b272f598ce3c9ed0530bb5194886ac810d1a6a432785d9f1395750126d0757b29b97461ba3b6bc46285e6504c98541b3660000009014f5e80a2555343a6b38f0606cfc887234564ee752c0abc4f508033fd1665cf10579390a34274c3bdad1fae0a5311f90b99da9ab14507d5f7a1d59cc41a5e5a0d0eb2601c7be1985ef8cdc6d3f2a31732c35d8bba3dd0d7ad16c80ff5b4e8bdb65e274878db40dca8649bd2bf0fe228f17ccc37ec3fc4d6a7ea8121a5861fb14edc4b308adb596dd2aff387da9c650cb00000090c6ff4b5e2431741d17f592fa5d1840cd9700e6bb8696c740c45f34f9aa293f5df8ce4d4c9b8c14975bc056fe4f57cead64cec71b6b8b0ee3b62e9a0f8cc6ec476923eb9e584eee25453ce8f10978f35b064f182025a119f88c46bb469ec385227db0300147333e6de994629fa7de26b8105f0ebeb088f2f6a5bb203d203aa527d42d0224ec9b2d46d0a8b35abd1ffaa7000033a000000ce40000012800000090c71d679925070d32c995da2681eef595e6f53e550027843489d1b0440309a69d14b229674c481b0b9e84abc2c60ec7b837c0342204eeb41512539e059c3449f38cb6e9c86aee38a28b1473573d1dcac622672420ed9e15917b10cdc7b17d38622f211054006f989079d0b0043705e3d727ca9f0d428f68a0a107c2e1915460749edc84eb3b31ee811e34adff1cbfd6ac00000090038efdbdedc31f2aedd171630eef8cd0d244c3be6dd41d4b3ecf61c86175e645fc74affb1467beb8ea69638bc1341da593f9a0bd7e53fee9354992e16d0e6587455b9487e0ae646c06d1944638c0e15c18f9bbf1b441c4d366f954032812d7ed91c672194567076732f8f9d81f8fa182190612331690e5c0545a0cd27a5c8f042642deeb56e37297fa3ccc1fea7f928100000128000000903d7982ec14d1c8358d52c6f6b8bcbafe013830e191a5ab39656154a777d45fd91aa4ae6cfd91707e5933d89518faee66155aeb4ed726bb55dcf3b40b644d53a973088ab3cfe476844a015627a5b09a5a0fbde609dad6b5538f58f50fc75c43208236a3c4ce506254f2b01fda3b15252b2fb6c6247902f0cdd40c0e034e2d36ad9c6d22589a8ad4d5a6ac22f291722cab000000900fc5444a190c9c87ae83bcb9ec3baf6dc141530d84976ab1f4451b4e0453e377e546dfff5d61057b6e57a813160a607f8c1d19aa876143fa103c69cc146c57ab896540a59e7e5978a5d33d8459ffe32c1fdc4b9a9ceeb1252b595ce973b876db1d490f2def2cd7990743e8ccec7e85651d3d222d8aaac525d63967d4a006b7992200b19161f3dc590a910f1474e70ad10000012800000090ab379b57322f587efa10dedb047bd354a431c60b74c36ed74561f0b5819690f528005216797f9cc7246b77a8aee294beb4b083bda3b83fc096590e068f04561fb3fb1f38fa25cafe933f0b3aaff547b21680fd97f4baac392cc59d1a27e71e1b22a44ec231428680618f68d8268be4fb1792c61754e1d2f021698e203c6628a4c638022fc53bcf0bda5fc667a85e624a0000009045a2fa32a7e00ccaa3cdc333d013a35d34e770390db631493aa0f21aa4512e7c123673d469cca0a4ee651b5e84998299fefbb3ecb360e7fa9d3146f7b2d52591f3b11621f39714f4398f75fc7e5b52a62375dd3b9b947ba60426803764fce43970ca4be6217ce5f4ed7389f4e48b72bc0b5516972a0e4771ec103a10d2bbd3152766b278b20d9af01e4353121f30ffc800000128000000908c5686279bb6fe6cc423939eff72183ff10ad85e28ce99f28a722711b9c0b504af55d4afd50ac935ba78793d4f70d061ffe1ada2ea223e630abe7491f547a1914e66a1ee06df7082d4c172abb8c882b21810a5d7124638ee6dc2caf8fc7222c82573e56d34d6687fb2186ed80ebdc4831ea7d86fde094f306539288c8be66b300442b49a59aab66ff5b736ec9a9a4f8c00000090498b2268c9ed61ce6bd4e8c4ef65df0a888902e8b6ca111f9e8d6688c86024d5502332d39f4bbea07e64a308a0378aee61e9bc2cfdf2ab3230e2189d1b835de9d5b150cc914393ac43b7dc7ff56745912a53d2cb6c88c3fcbf6707a485a1852935e80dec3cf0dea9f4eeb75e697f298907fc5f8636796e3d94bdf4b52fe9fc5f07b0f0a17d3f82beae12d6a2222f0e56000001280000009072a82eb0812ef2f320ba109534879244dffc7bd02fe1b78eda49a3a48ecfe03a93bdd580cc2efaa04ce8ba355d1581e8b9afe08409fbef91728a1053b5ee2236ff583ba3ee585b16fa574f9ebe6fcae7179f61f5b79931f1639ed43861f5b4a33a7c41cf2fa55c520f9358f45db7f90f1eb61866514ec833f9b0768acc8af7edecdd4f93992d70da975dff2754b7f19200000090d82046d30f688030a2860b4bc7be5a704d44673d9d6c508532d6d098cb140202a91e9880fbab548f0f87bf0f4b4df23b3a501a86e9fe6e82b896c2def96bd43d23335176e45904c77e0d78d5a8c6d97626c7f06e116d0ff1aab88106d53425ab3ff85999370c19d3dc5c0406864c74f40d102770a0d8d7b737850730d27da5f989cb23b8031e3582d418d36e1b3ab2720000012800000090450f3832122e3af03e91a318865a2b335dd34236459211475a6828a770663785a1e4eaf456f7bfea679561f461f464515d5975363b7ac762cb5b18684a58d4da94b43db18d70cdc0c50253b54463d271244af59856bd7a149fb51e1e5a6e4ce1a5c3a091acaf2f09cf8f406b37854275133242eb3c7f690cc85ca3eb51a84227cf11fd3fbc1b39f668a262f7135d6ed5000000903028f27724261e2750dce0089a8d5d86cc9168b0b1ab852261d6c09844a4a011d06f761c4d85a6c418bd71c2830d10d2510b73bcf31fc5a8002721444fe3d60e9fcb9e6da66a9d079fa57027769ed47f1cc46f59e1b9b3cfda12fa6176db2e1aba945452c4f0c47bdd1070db102802fc2f5d302852c0966d518085c89a4bcdb4f1f487b377875f6161b488b3b128f1650000012800000090c3ced23e895c7656573b5df10d3646ebca00ca93e876938a0f8e1fefd50db2d78313c4cc2fa49cd92335279ab6c501fe301d108dc6c157b8d96f0e1b6ce376dbe7de4406cf1e89631e22fd33a3b7ab1b0fab3434ba1b41db25d020027e28de7e4b00e3f31b58cf00249d56e3561ce9f024ecfe4b4f7029947569976a107c45c96402b762db2edd691bdd2e0f86c4a8930000009015474eec2eba6d58caed4ca78cf4e443e3b503deab75fe074740e9be70d68af21e1aeb2e66850a131b41a942463b1c7dd55206d0b806e91b9fc981da435b9388cc2191cd952d2db93cbadd98866ae79504c935649b6cffd6da114c067aa75c240b93b2bcb23381c62c60b2868b2a13ec1d1f2611d49506039c360a0055cb51a8aaf39449ca6ddc7d63f68aa9d92195770000012800000090865d87f1e469f41b5c31ed1e616c2a0674645917dffd61e065f9fc5e73e13a7f456c2f646b9be714de0e030f604da073b9505ce841e671c1d17ed04d46e5565015a2c3ec2729af33490721c850e3cb950bd68d278d322cac9c489770957d94705252b455022e22890eb6a7056f39d1f82eef60354bfe05cf68306fab8d59ff6cf0ab2c080401864e1a0aebbd7aaee0fd00000090d61da29674c311d4f823a6b2b097b703c0d3bc76b832b2f5d3592c6a71e7316df5085d7826fc108febc8763e004b639374380b4e15a6d483ffcf9655d16c1a4a0dbc48e45573c394ad50b97e77e8bec90ab5d3423a539e719906398fc33bcf6ca0d937297c69bd563a41cdce943732312e6f97104340fafaa6a85fae36a5ae80b81190f3798d8e9bf8bc71491863ecd40000012800000090ffb7ff7af5bc41ea36f85244d1a700a2828ed17f8159cef205d7f605c2a2b563dfdec4b8daaf2d4bfcbcccbdf7a216e61df86acf665e8dc075ee708962cd60c69bb463316ab697783734348c4ad00c5f16a8ac58d2715034eba5af99c4b67fa7781ee27405331dd58c90428352b595dc1c46a6e1f277c2f39668ca628701dc3835c3858df17edff389ea3aa65dd30dd4000000909fb2bade83a464bb1c67b00819d59e2a5b9d41d92bc7ff8fa82c695bee6d5d4339e15ba0c655ec17d28f08a7ea91300bcb4b2cbf78a7ce01464f64a440fa89b7ec80003aafbef4f5992c207448a33cdf09b5ff6a9c69c500b013d12d117bbbd23752a082e5460bd74fe7f4ed1004dc0300bc502c819b127979675a3cb875ffcaece9468836d01abb957059ddf8aa56bc0000012800000090722de9d67d167ffe6df805fba007296a18eca2e2de7a407a7b4cfd4d92713d2ea6dc700dd8f7094c8ba5241d56b5cdecbe6c32a89d1bc666e65f96a4d37144af333928895f8b055dffef4a51bfadd2042c71790d7d76a869015ddda3a4b2027e784690dcf3a0ff6ff60d4f97283a926f03a65cb73f6516dcee170e66adbc7d3274fd50f853e499e5fc1bfa44ada90b6700000090404bdb971cfd878a67852e6664e6f53ce6f6deffdef0607050892ae0b59e7d08ac7603364f47d0dfe2ffda9dd73fadce4c9246cf68d001ed163e08940f979f5c1bf412b6d9795386da60a95185cb20ff2355150975b1a25646c74c1303ebb7775ba620d70e09aaae7f97cb7b6da8f0991853f44135f3cdb67dbf75e349ea2cbf06407f804848090fc832d7c1d7e7c7f6000001280000009007b0677b6d2eabed2ec0e09f127d60d715c2ab741c384278c1f2bbd598ccf8d22e246e8852131aa94de590c0cfabee6629db631f44b5509ada661ac07987092591d59afd84b45f97e1084d87ff6145fe08881d6b651207b9c6a106aa102f66f08cf864b77f17a7b0dec92b6d116734400027074be9638080c8df12cb3aa2aed032065d0f183bbe14b94d5c4729ca347c00000090efa094e21b696a986eac21a4d86999f263b506bb4ecd2cb7a4b82a061bec6bf631f52ff6f33bd20ff552761f1333977b4b2dabfa0bc42dcd78921f087c0fe6781761b338a30ae624899c60fd69da6fa402c085e1d3de548a08c26702ca97de22d430597df903ec8c9205b3822ae395bd14eb9911c0d701ecb994b25bcd98ff9947acc66470c48b15e884aaee4632d86f00000ce4000001280000009063f77aa908b88e3af656373781fb1f7d004b3b2d44cc7b9d19af6db5389f0bfda548770c4adea33ddf8eef774b8cde6b8a7a9a041a86ed15408e108dd5bcd92e1aa2663e4a4d2d7a1aebc0f19aac1f9a0db16679dc2f2cbd378fa2918cd9a36e74bd7b341102326ae62301cdca306131194cfff96dfcb1d53e2c71cb117044cbc09bee6385fa06de2887359a23ec732d000000905623e40fdeb53b03b938ad694b8f785f108a308c20bbb3d829d8a5a7a2a51eddd2be4cb6ac50ebe5f4af9018ed5b8ae00de2a29564bf8fff18603bb289014e39ffccab4126d8b7443c2a764f33c3f9b708fb490f14c065b1dc4f24ca9725ab9a091180de66ce9f65979a81f97523b57f1956b60c989c44138d57b8ec8d3ae12a3a15f5cf0d81607f176da730c27281d10000012800000090ff9f267fe556e160594fc2a5a815c041f2c47c5d827303f7035f9abe7bb8bbbf3d234753a43861321deeb26e1bec2ba4b2f5595c8d3635ad231309784b97616a9324195c31201c6481c2104acc39af8a0a476143a197281d042a696299d4f714360c6c20076e83f441ce7ea6afa9447c15d5cbf43c54a9ff1b3d516e2cd3cfe9de5ce1998bbebfee61cff88c41cb5d5600000090948b7f4dbaf6f2831f75658a6c820c80c0847bd526d9f436dfcafa1afd370280773ba8294542e731c93069ebe5cbf1d6195f7e213c517ba069cfa7d59324f40f745efcb95cdaf858a91b244b0f1f4b84081fc967b62e7142a9d195a9559b2ab599a3099a7e125eef3eba3315a67ce5300f6c54300868c4d7190ea9130d9361696d0bd0dba43d0834e4864e3b7d57f5650000012800000090297bb554da0bdda1d83e89ac27a54b48ee1790c00219cfaa0167c77a34af87fb3fc8fc0d80d89117fe62230de3a72833ee8938d5a0eff8048662b5e45f1e57470a35614563ab65e2857414b634a07a2021a42ba345d06f798efc219b2824d07b8978892adda8b49806b449ad7c3fdbd61131bf968ba49e7e8f1eee5a7dd64f59bb2bf6cc5fbd7817024bc4709c5c159b00000090b7bbf78d1f57fd321952af5f09fc41efae936cddaa198b5f1f71e21d78cb5bd1b563471a0271bed0af52ec5060153bc033920c8c88bcf699fc6e62a5424fbc67ecdbb54f36cefcefb7ef75066f2e71481a9844cb22b4441895f7424e69327fec159373879d5c6b195b7ea352194e555011775c3ed96693bfcf1ad3eacfeef7e5ebc5a57365737bf930fd0a447aebd0bc0000012800000090c24593fe8b57a02d3470403d06b5bb619d6f0d14dc9a4c873ffe1bdd4dc1ca608e3bd4dcfb515ca69ec8e1ba6d0650eea0ad9b8ab7835c0a606ed9afecdb08cc7d1b5fb6dae4d4984bd749708e164ff429a02a143d35f99212f5ea89d1442bce93fe3d0573c30d8a62a078bae1c407621006c8b133c5b40f4451bcfcdf8192575ee5fe38f278b537d7bf5c13d3c28b99000000905a6a50f82ffa27feca446c6cb59193af6377415e82265c4d28f1f3e7215c8ae85d7330a25d7fdeb577846ba17585ad7f1b14980ff7f6762f545903842a61f6c95d1d34eb16933e8a832cc506b82f8c4404f300adfca46f0f5e08fbd0b99e18b908f19a63fb6d6f98e9fdac26aee27e7c2b0ab15de3aa62fdd415c7231a54279ef5d7cf9e405e6d1ec090f98b59a666520000012800000090793a9cd754e8f7f460b4bf5d8dde22a6993914b7cd1389eb80c927cafc5e6272d5c90b1e3170e7569de4849d183fca9007cf8b178839597f8e48d13d0e1106a56e2e69bab949edea1153a6ec3970db0c0acd29b06582e4b2e1ed2de1cf4c32752a105dddfd0095c5214b684041be5add01499cad24b94ca1ec7d78ef349051cb33307f475281d1598a86a30070a9a64200000090e14f958c3020249654374a1f3111adb7173e844f84161f5b7274baf685e12d52901f415ad5c37a1350d05f58b131375afa7e9ed6d57e4ff2dd1945069cf85e1061d4f601a8fe9541f07da351f5d212750e70edd753036e02e2a1278791523aab1f7a7237bc0e4fd798751bf940b2e02805bbb1737c9af7ebc1d5cc99e012ee2cf15e67b3c89884a832ed38ecc4822bb700000128000000902e7d5e82048343981a2bb3cd56f7377ba5bab3d4918205007497e5a2d35f849b16a2572485f42dc4380cb5e1d3eff4e1e30e02a93faab6cd338138ab142f976ec3d8f477c264ca58466d109bbc3856120e954bf2ea346ab0ba5d0c8a9abf7224204ddca8ec5cfeab4ebecb06ef6e8d8909a7d2a9ac183d3c0ea5668d011e9f443ba88e160c90b7e795e015c87105dbf500000090503c75ac6e1f0725f302316b715daaf080b3014d4b19d4113a0377e1190f27e3a589fbc8084de9b03e5e6dbc565441b42484451d8630d628861f6d0fd0c53f9f10e393335ec07594d7910181c90ed6810044f9ae40fb83e41486a2bc6d588f26bd6af302cd368a227dd511bf412544302d2cef03fa3d06b920e9532a50faeef82b6fc3f6fc8321d6375c5f8e44d41fad0000012800000090485f789e23a539a0a2f374697ddd900acfb0f301c991c436bb294e707fb652674006d89052d59d1b9b0ab424f3916cab852056037212d7c7c4f5039f98ddc5aee5926e103cd9df9eb5c061f9603a3300061b67f709c3088e16037fdf0c1174646910e2b6aae3f820494dcdce1cd881662ff7ebca23a35290a2c8dca50bad64c50cda5bdb531dec39e95a3892f835d2e9000000903927209a4951422c3bf52a29ff18d371151bf6be55fc40234ff661b46474cd7153c150d8f96de3f2e04347f2a25ff734c1c60b8d256db004f802700e822a4c4ca19bf6190807e29ff4a895706575462607aa4353a32d228d0ee50c8bb9db027eb833502cbd3207c66a67baeeb39a1b1028ad263f50ddc533cec2c9c85f606e62ea031f055efc15ac484eca930de220160000012800000090eb5c73405aedadbe78ca133680e036939f63af7bac31b94e87461e1b6a86a47d1f0ce79f09884a23a47773476f46640363ee2ace60205d246f415847a03ffec4ebe4665d8e5129f99b77b507e16ca7992673b99d6c89ae4f9565ce47c31835f3cd823f7479a417c24cef96cf99a4165e2d2a52862400ed61e097e5eecd4878cf0eb5b45b82c3d99743a298cabef51b1c000000908a8daf200a00bb31c60fa406ff9e058563793780b33cec32ca6f5d9d2f88581961c0119617997f0db7537cecb603f4e70064043c9d9da6e7b9c46c69d654a1f3d5988dd903e369e688cea1a7f4b7d09f1f46d73bfc23ffbf13d7833502a10a196f54a77016466ebbc504e64b597a139414c0550fba5a4641fce3b83d527d2d86334fa8418b68afbe5ffc6a343505dae300000128000000905d63fcd881456911188f19939a8495e6c78549700faf7a3a6458fd88ef6ce5f77ff22c2dac5f556d52a2fbd36f8a94ed113fc3f8c8a66f868988bef2a00a562a0ccb64cf4a96b27de14a504973e5420c12894e1bd5b9a7b77453596039cc67506a884fe44b2b011d431d878bd32942171a24cc4bf57cbe41fe9327e0aed0d218e032787cfd245b0b403b35dc95c4df9800000090e375ca363df3929003d884321e970109cd9ad391b7c7c74a0aa32767d7602acd5ff235211adb7ecfcda2914559315265c90291243cecd396561ca7f2635863606b657c1a2238f93ebed0f6f8de081a940e6f2007508f12def94d326e615486e0ec209ebd78ed64bcd8c51f7e423b8e7f230ff1b81954c47b70495a1d74736ac12626e688a6d67e61a6f27e51eb6d38990000012800000090de88fd7e12d05566e5cfed1d05fc6013f02dc112aa74f0ac306304cf559236489cfc6dca53776dbdafc185ea395015f0aa8d1ef5f24487fb8f99edae72a72c4e5590e672f502cbdff996beba83dc56dc162bfa0e0a57c32ddc36195a081f9d42f11b1a0e0b09b34fd443b9040a1ee65424d9272ebf6544a7fe9a75b7efc79407cf28467c7b8256e199d2643492addfb800000090a3f440389d4a74107a9501da64a3b5dcf875d9ac8c82aaeb2768d34d3326cbcba65a96a1a3a6af19c99df344149ade6782d3eaff679f3b24bf91305d10827323f7dea256ce10f5ca79147f99e893f30027f7c9ef1f0358a18d10a2d87e98e79ec7061793ae4ca61634fc15903e7a00a509919be972938ad2aa5413b0855a701b4ff6187311d7a0ac8ed66e85f23833b10000012800000090ce588cdd25056e3b2f9201cb7dbe48ec9ab60b8469d2352a35049c31ea77f9af1069f9d9f215942159ab154a8b74e1c17009059b1b8674c341499ebedc27c90d9ae8d01c7d819695da6a58a61a540f8d1e9c57d341ecc20a7cef02f268e9b6746e645823195d47650e56d88f7656efac1c7031fd2e234ac838a8309d5e70a5b2b17a4f68342c597b58a9d64270a218d70000009054c41b052ead3566e398a11e68a8139f830c5701989c97ee2a698b7796fbbffe81ee971c2bcf7033a743f01cb192d281fa215ab5658b61d5585b6670ecc2ca2472ac1a4117afec0877f5d2cefa31f4931fd46db2a037b341e68e55fb8518361e0c238727d5ed761fee9cf09f307f351803a8dc48166f821c06900fbd405731a012e470772444571a005ddb019d0c05a300000ce400000128000000909897a994ba05f0486e038bb585e5571d9e127a6030d4435ccd58f38b0f50d3e5988bbf20f018e12fef961eebc20c8debb6b2099faaba17214128d774be4377705679bdeaf86b3680b88e255d862dd73f0f704e8010d711ee89301d25592d1d4c2aba8716264154c634cf9c850f6efeb204e9c44e005d3ff9244430333bc9c1a6ed21bff816948b334a72b6a924bc965e00000090a49c50055c86e10536b64b3f7e8471e2aec4000c158b54abf089f0223b5d8d999b3983b8e6d30863dddbdf41319d572c6d2f8c6908a2ee7f7d38c97541832e5c8f6434a3b9fbc69a5a16641a33c6d74e1a48c49fd577e345b7297c15a35e53def3cb55b8b93711d09b0eb97a80a065231c80c5b0adfc02cadf986d512f2b44775d696bf1d81db65ef12bb4b0333f9bf3000001280000009053deb49fbf158b5be94cd2a438f3413b0a1fdb10485fed3388745781d94194dfc38464f57970c5f6e52cdfaecaa60fefc35164bffeb909e7d9ea6dd31034fbaad36110d8f820f7dd1d9208aae6fb125d1fc927e159624750a037f41fd49a9d1d693c87debfc2dab1d2d4e94fa8b2c34828e0298fe92306aecfd0f2b5e250837fc8d4b0bb949493b75e138112504cc47900000090f3d83ed8705a04d934c3fefd11bf674a0cd0bb9a9756633791b1b666adb87e0f969c7d9ca9c53562217d047161c226ca8f1518badd719cc009133e9033789fc38db6b6e4aa362ff305a4ce3448e0e9bc24a2fc3189ffb1a0e60dfb6141c8092992b1e06c77fe8a411a061a8daa4b52a714d7e20b02ea6575319f99998a5f7d9c1b40259beaf99f9966c2f34d1be439180000012800000090c327096b3eec0a067bfc1c20a47502c9cfd269e3d9730b7f36a804d0164fec3c9cce56c6210d4143cc6768a58e1f0719dbd09744838559fbf7e716bd092753953bfc3a6b2738c515f7e7e027d031ff432606ba6ca0d2ef38eab336924eb792cf927e016f16c0cf891eafd612d5d9cfec135e5d68f88e994382cc6f400160cf1697d689899f45bb7e3a87bc95cd7eea690000009088e9e7deb8aa55e2981ee9adb7a44612bd7169d2def6d060b6ea1f0ad48caf91c75107333919ddacb0cd71577da15cbc882e21fe80118cdfa627a65dea7c382acec3556d07bad8628940fcf895dda6022dc658e582265c71baeeb0dce7a6ae003ab314f713e0c44823c005986ee0099a15fc512a02471af9e83fa7c7e95815d157abdfe8f8eadb591b3e1adbaa5307ce000001280000009081417056f6e040507a63bae32c2dcf546187aaedd0bf2dbeb1dbd5fe0a0706cc95eb5b753a80a899404daf16923bcda2d0676cf61e4771c1808681a1d8c032c455378c4800cc646bab5d8599a3c7a9841f496aa79516daabcaebb6f15c6e7dd2854bf294c5034dd2c063fa7914c99c3b277aabfdecca615167482f218045e805035b976c285c62c691eca4c8df9ea582000000904a525e70aed1a1aac3e69072a4c3b2671e6a938d455a9f58b3c558a73f50f7f2c5d6649db92acf5cadf941ace8cef6580b2ce3cef9f6fc2d3a8f7b3248eeb04ef8046479be8d8dc63e4e7f9ee35716991ed2d0e0ad40877b764d41395e225445da6e5397a05a5006f8c00ee3b153b58f12fd204c83aa3b83c0ba9b46e6d59ae28c41bedd59abb1bc926bc363cf79caee00000128000000909b037a37d4409a5181e52506747ec1bbb9036c881fd020d3bee2dcd612e68dc1fb0b298bd8aa7ed2cd5f882e9d3246c91fcf55db2070d09c33a6f1219a40e33c47dd91199468f261db47a9f64f210e2e06d88b209f6c3217730704780783505bb79e9c39ec94f3d1f7f0e6257054388f2745903be8aacc22b3e814b50890294a9d8a40b9dc0a3418c85dd2d80a8c6b7d00000090b580b02d3849d33e10ae774074f374461d60f1d6b339bd2d39db0d7c442c22a1af2737d0647c31ff6df4d49bcded921073dc9d229c35d6c87075284f97c3abadbb9d15b0f343ed024b8ce85e5aea6df21279cfaa7c940419e5cc233e0040a0b3a269c4484b31a71e693edb983ce8dcec256eb90fe2c4463bb3f3d450ec32ee3a59aa1b244b57425b9f5eeddb8290174100000128000000905a3a2128768d8d5f73d71a428196735890ea6eb04c881789d5332891a38abf48f243d01cfbc7cce5b149e1bdfba4818df5dbd0a38d7ce2c619408614dd6490e23876793d119818e657d3474b63359d6902db8605bb2346f2164170e8c6eb5372dbff0ff7533c242b23dec54006c5876226debfad08fad871275239cd84679a8e7732b869d3dd1d36b79ea163ff8569970000009091956926e8bf3bc6f6d231b113ebe86e0f5562bb20b83e4b7115b2905dce8444dc55b3fed9831313d578ebae075b7e76b9afc49b48e7d35c24f49b1077f1677d418f5e8de6722a552b556258da524cb00c703e3643fcdee02b1990a394d85da8627bdbd960200d2cff52bb2ee72dd4b41cec456f6190c76b0dc9987e8b578427effe223c07f71bfab7deaeae68ab37700000012800000090c96bafdbc9d729e2a3e41dfba1cf190807289c45bb1351ea9be682c35f72071651c61bed1d08e23d32718dbb7369f8502bf6a0939495b8805c2efa14d0e3c22db5668b1f3cdaccc3a288f5b33f24e74d2fd682578d0014e91b937555feeb8a84dab486a59a7431d628cbbb3d4102cedc009c2a51d9dc73993b322c6faecfefdba0c99bc43ccae92131249cfa5db070f400000090f316558939886b8972c81a331c9bb56e931929716b985bca2d2c01d2535f036f5bf00b8f7bc3b5ff62cf36fb7750792f51e7ff80cd9bdd74f07fafc07170fa1e76721d7d0c34b16edcca6f3c7dcac4691b2853151dff440a70e39c00b55f88a2b4578252fded76768a9b2dc103fad5b60e0e2ee332dfa6341526b959031511e6fe87c9d8b7e94cd864deaced0fe917780000012800000090f15673a8ac2b26b1ea8b0872dcdafaba0bd0cece2f72d76b8d2e2f2d0dcc0e0b72281c339f4d72c00f8c9f54a06697b1fca113961620727494fb50a9ba1fe014b4a86b3d687aededaa520bee1ccc9ddf211af150ce36dd15a72c7cfe44537630b149ab91f630ec838aaaa2f5766ad3e403b61b0af41c0264ebacdad6aa3ccaededfd921115a83086fc1adf24fb22c23100000090aab4fd8ad58bdf17957383860b25110bf237f1ee8426c453335747d9d80345dbeff22faeb160b1fff089aa148e2d364a657bcb86035413cc1b3a13295e35485daed937be9735af02727035f72fa717fe1cdac398541a9d556eebb38ec9676efa8bb4cdb18e20bd28b084644478ae97302d849ef7f47e11e150c6d4d45133cc46538d6cdfc3d10d73ae346307e93869920000012800000090243b45e22c08e2c67bd02ec3094e45372e43425ade05ec2cca9fc280b837dad7bbadae7ea3127d19186329f66cacb183fb8156d2d6ca130b42a2970dcf9cad7fe65523b3cd2ff108fe81b2e58387871911a747eed7afd7b4d2cc3d67a74b8bf970c2d0c1b78b459ca497d55e33b29abc059db6d287a067050c9a7592b893b7eee3312e672f2f29bd7dd906a61b8920000000009097886a623b7bb1f1cce68039b4a899e0e0b0a0451c35bd6be205c972155c12143311d4aebf3e2a9a0455e8bb3e9eb53a7b18784fe540d258730b17b3fc55714196288d0111ddd0910d87914462bad49815aae603595888bc000c5a21e6a11776bf1232a245888594db842a61b0dedb990978746a72f2cac732ce8d6a52c081ff771009067732eae2a3644d3ab44bdcea000001280000009044e0a4bd5e3a78f5f2161dac9d19b79236837160ff98b2d82407bac4bdd0475a85ca56d08edd50aa7cf146f006fec82aee7ae6cf8ad80d974adf6cc333c47d2809f515d3a6268f1f3f9fafff478a154913a9a5fba94787d68b1c90e2c689bfb89d7d76ddf3ba9503182cbdb6f4d9b0a7098f7cde67c54afbb616efb7e6aa62b98a6930bd3ba85e1ecfb0fe1405f569d00000009014db97e6099157f09d0e85ce50765b5fb344cb1fa282d46914157a587c697e8fcd0ff9eb71dd3fa8bca97f12951dfa0554b63907ffb6cada8cc3ba7de76268393cb4ac52e89fabeae2c0ac62ba535ee205e80d247286af16803ee652f2d659c86c649a85ed0b8db322d2071deabb5427224c195b68bd42d81001434d2a52461340201df50ed4184d2649f5b44aba5d4e000001280000009006f42b65816f716aaca8a064f3753982938baeec88e190b69727f4a37a9325812010d0df94d9e91487b8dc65273b0ce2017718658a0bde0257a800679bcf758a218c01f2a2111f1e061ca3eb8a953df02355b3ce1b3c92cbdd0b6393e2bb334d5ac66fc15dc53f6f6384a044fb84db771b93b2ad429ad5d2b133bb7cac88be6d4e2b65f0e9ae70af2d9b9e0b1d21d664000000903ad57810e82927f9e1ae20f1b7e95c26e0fe8d108fff5c352ad1cbd547d0413201075470ddcd2afc08920fa6db662db4f04b02596143a5178ff5981151727f649f1aae93f0b02e784a439abcf9be449c2035212828ef61bd5653efbb6ba88043e78d5a8c96e803936c3be5b0b8d757f31343db61141bc8d15023515cb7fe0450d77b5d5b9b962dac04b5d65123dff05700000ce40000012800000090769b7a95fe04e1f2143155e7ea60be905fc932a1f934e193004ffaf8801a57992349425de4379f9d18c7e4611287a96d34277310223e56b4f5b188130006345a8ef172ac777f7857eeb24ca7fa6a84d022c743e6da0e603bdc94b18f32273263955a733bf98a46e01bb6e56edb06ee0e2bf6e111610d01d28cd2d96ced7929852b871af1629bd70d6abb21db8a93a4ad00000090629d3e61e02ad7e72fd42528a18eb029f33e80a4d464d8963a8b27472ea6386b7ea7ad8122c4d478981fa75becf8211cec6e49543a0c6fc9c4a4728e0ebe656f4005b3b40ea8d9c38eae95198950197c012fce04008591db2be1e00b64183a0efd705dd568e0b1978b3e6f92d0cf54991f8a2fde3dfd508015ac7cc3161a98d9b09a333975f28f39dd86db5ca72e90d60000012800000090b7e11ba7480b5c973fcf207721a59e92e1fa71f0573ec486a3d1728d0782a2a7251fedca509f9506cc84313f5c3f3e4a6d0cb3eee0769a1e766285d6e386e7b90bbdb1b482504cb062bd33b4a46e44521cf3a4099423d1a193cb662f11f28d68381fc162c71a39878f32203c78ae3ae71e85253f1fcb46175e58adb856361a7893f17ce700af632d01f766f002322fff00000090a194629bee6e5297af2d4e81b9552497d96e41c40202bca01dec4fffcfcca19011eb3187e5d273022b4493dda188db20c92aaa7c3f040fbb5077f18cad5276253829979488d68d8b256f8e9dd5f13bc22d07de22053a539c84aef451ebeb66ff41091c59fe6ebc335591db149937d9852e3f5a07bd276a8f3364755c6fe88a6950d723e60b528ce8e3609353044c9037000001280000009041d5f38618d22c35005a4ccbb2e563c85e2b448d2201c688c561242e1f3180b20a70b6368ca6a04a6d6b7bc8af5bb27565922d1bb84f357ca84cd569732b487b050858315370c32fc772389ccd70bb0c1e59361c961d1fec593ffe37e528337819ab977161fff87867b7d817861efd23190240e0e5eb8f20390da04b933208db4cdf59dc6c95c96faf995afe69d6d4af000000901311278c2a29bf0a5ea49620300d70c2e70dc5e35cc2b197f1c0af322847f06c37ee9eda077ab4418bc7fe13e323e9d8863ab80fc84ec15a542c3de17964ad98e593640170a695ab01500422866148481db5414b9e9dc74808543d57b11b0d6c9ef18bd36a20ea3a3a4c295e5e6c61b80b0650c0294647be70a5ddc723d11990aabba34c7473de537f4b13815297c75d0000012800000090350eee08562667e68db2618c4f7e8909c769d2acef55084de48ab1aad2a9be0994930636de38bf302c1bf742744b9e4811e4c6b76dde69bc221458319dc3a82728ff2fc811552ab46879a1b42916f83704621abdb5d3f3725eb701a93b29a2bf46e494ea7ed050f5af474860dcc2f67c045afd17b39e0ed02fdecb7ee41beb93ad62ee812e1fefa53457508f92bcf86c000000908635c62dd4cb48672eba900690c4a2b4d9170059c626ac043447137abf472e308cdc51946b0c4800b800d2bbf8fa5ccd6b88e05d2d3e75fbfe528aa720cce1cf5f2fa3a08ed75ffa1b338760bfeaa1220e2491a9002eaa4a5adba74dc3d51e30030fc38a517d48f059e5cad099a71add28a655df3752f94c35102cf84371fb8c289d70c9e3c79d0923d96eef8fbe01c3000001280000009078944926723027a07938b0560fd9dd6a01161edb84a2b35deca972e341c0c2f99debdad57a4e9fd343dd01fa43b4e5270c4057f02674a7e2379c3676e866aa5d63e5cd6ac2eb45772fcb32c440adcf59266a24a74d703fe60f9f520e0e5544fb0a665ec5533a44c92ea9dabbbb20b977029c51e0fd9a744dc2e2e9e980f310ca042b2078a2e4b78f011e506c52a0968900000090b17e1c111f7d425285fdcfad0ec746cf7bc2f06ce732e74c2ea73c214c689685a34b7bed644015beed00a66d0996fb24c837b6cfbf39402a71fcb3f147b54a83902d349e2341c137af6e652a8be73df32e13ddfb927e204afa375e1411ed811734a59c4e3c84a38e8e266a71ed211d5c0e40ab4aab3821e42d8345fc11d7a24ea7417927b534bb8586e0727ce058089300000128000000906482e87c2faa9855ec501242a3f85a69c86db4f79e1629a57789ecfb57b731a1862630807e5dafeb40bb7114802f1d3ee7804a68e63ed05f968ff91f0ddf76a7c05d7bb28fd92abc18c0f2827187a01d2807cb0c5c8b000fe8ba06baa2dd2565ea295d90fc0f39f7e8d153c99063c034132e663cbea67d110d96f50cf195f8c0b121c21c2ec73f50e6c733031650767a00000090ff3c3a3650a88f58d5041d2a476ccbf9edc9260a2896e4e26a61780b40eab5afc563ffb21838d361fb21731a88d1a437ef9e99cc0a6746cda0766c7bf7846aa417741ef05e712fdda23c2a3a3f10fae108dd3267d80f270b10132d4566237fdc1cd4121258ed8f0098b4c628f5b26d410b7ccadb3d2b5d214201ce41ff79ab0f9c3743001cd55bb53e84d346d90f720e000001280000009089e091d396ab28517ccbdf40a45d02abc83c6a771310ee94385f14dabd50b3239fae674a98402d00ddd41a3139552a81fc6db334d02c87330d9c1f5747d1a5e6c5e566ac2093622d4afd551a96e740f80f30bc649c2e6f25db9cab1c4f53c2688ac6dba4e6d24219fc3fb3e96f22d79d017c16f68e4e15c1e9cc75ded884ae4b870bcca55904c7e4c85b902c48297f9500000090f6cf1a1091f1ff9ed45b86d475d81b47df21fee05708873bc11201c9ab6f8852cbcc8c0e7b0cdc53f1c832a1b277842b66282e57cd677c5b3816d4715de88701865f8b9c6a394a9345b2dde9b3707c141d9e14005c89c8004d3eaf70941aca0fa20d4b861312a665b20dd2ed53b9f6c80daab476d00c8716f32b5138bbaee3755b74b0c265877d7e88caa5bc99f5df0b0000012800000090ed3eafc128b6aa44fa604f4c074b08709a87cbe8b121b18be9179e2c735c4cc57486fc2e38848f45487ea318c5a6f369df389b4f8802023e322cc08ecda80cbdc0d6735416e8c74dd2629b1c9dac44ce23352337284d4430c8c3a91429a707af9f8d7ed80b918f1847577b1ecd2f3805235d4886c33d39070b6e0f0b12236e5548314530034782f86b3faadbd643ac370000009059b5f5ce278d3b179affcfe95c7f2247579ab3a96493c390dbb40ea7746dd9d885e0fe32a951a0c2bbfd4830cba8ffb67a04a5cbdbb75a3e03df77e4fd7b2b3eacbe7ee38b576e87d960ed5d8ac2ae622cb5cff0da9a10b7e48397ed99fd8e11141db00b06c76e83b1e45f7b241c723303e1bfd9cc8d8c3e38b01f622ed29efad16e0e724e8cdca0572fc8c7509eb4ad0000012800000090f84960cad0165e05bbee5df21c974fef634f14c4851dfa847a5f07a1d7a869f68d5d896cc9f261d26973221592607936aac41c0591ec20849c1e33f0e9a5c6426c0b209b9b48a3ad45a7dad87fec894219eedf5aa36c7db0758868993e97f3fb900f6bfbbdf36fd9d8afe47ae5a3283e29674628ac8544036ddebb628629df03ae05ff788fd408f44ca9254d4ff78ecc00000090a4ab332943d66fe625be47b9845e537b967ccac017c41abcbc0c2628c75bc84a02177296f90ac31f71836242d2abace7e5f0609be89c02ee8bae4a0c5f3088dcdf8269d76eed51e15455f4c5fefc79ae084bac2d2d9551190f81d7958298e64527f1c454c972799003856a063adf38c42875f2e864532a0c1a0662671e47b84292b8c17448d6358dff58e4a39c4ad545000001280000009010dd1a56fb7e2caffbf7da1d2494d96497c10f8b83061d2a7fdbf4929f575e94458d285d297462b31a0d327fe7544144851c002001eff096e7e763bb7371b8135a1c25d5b844a932fa712ce861ce4d0d151412c87e1e385a4b6ceb7dda77a2b8210360ccf0ce6aec734cfcf7792c14e917f003e0fbefe22da2fdd4c4370a50eddc7c051aa1781d32d09180285e81e33500000090d04b03752849abd068a041553be26194646cbb651bbd7eaa8ac61b863e7eb17236a5024ce2922fdc74712bdd9b0eaacf534c3e958837b80778eaf05f1a09e8af6464e7a1aa1f6735b3830081509f907b03c563539582713973caec33e047a5e087499f60585d49c66f39a728e1a1d54511ddaff3b2962b9ca053bf76c84aa9ac3e852be5c528c620868f97b770ea1c6800000128000000903eac051126fe83094f9102987843fc611dc961623b49d42fb86f7d5d4ffd58501bd3caabca512eea7ccdf1326f5a40c86fec627a39802b0188d786ee26a6ab57e6b494758fde93f864f6b9925324975f021d5bcd23235fa00ec18a95d73e5daa37c028a904dc89018e8570707e9a605c097e9694b140056d2eabcfa2f21267daf3accba1fc1ec324fb3515dc8ab018ce0000009084627b52fda3356fbee716000047cef7b28b792170486623a6495af3b4c733c60f3e16b16cefe06f53dc03cb98cbc63dac6f25cb0ec9f1ba23cfe5750308e69f103d06c04f9b08998b9e008153714bcd0dae73a7d52e55a2505854865ac685d0ede14c4eb30d56afafc26892c2c903251a7eb4ee19387c1d4790cbfc7ae2a2129d0e336dddd2d51b9438117e2cd31263",
-    "timestamp": 0
+    "publicInputsHash": "0x124b48fbfadbbd213feab5c7dda66f6908f55c3c899d88d0db822527dcbc34b1"
   }
 }
\ No newline at end of file
diff --git a/l1-contracts/test/fixtures/mixed_block_1.json b/l1-contracts/test/fixtures/mixed_block_1.json
index b10b890b79ee..f0147e8c6cc6 100644
--- a/l1-contracts/test/fixtures/mixed_block_1.json
+++ b/l1-contracts/test/fixtures/mixed_block_1.json
@@ -52,13 +52,48 @@
     ]
   },
   "block": {
-    "blockNumber": 2,
-    "startStateHash": "0xed09b43d862f8628640ddc03012c80962c0bab9bf63c4962b7b1ef80e80db89e",
-    "endStateHash": "0xb80cdea4fe6984e4a45d7eed793c19a7768836819a566efe201df2a848638aac",
-    "publicInputsHash": "0x045809133f2783cff5fd025fcb350a78fae4854d441a47c7ca05c1e8355db2e4",
-    "calldataHash": "0xc73a69c8db8a87e0e6b99c6841d4ff717f5d35bc40a70f3130c917a9fde92d40",
+    "archive": "0x2f3fb377fd6181826fcbfda86813263509bceeeb8c606e61a03386a5bb6d0be1",
+    "body": "0x000001000000000000000000000000000000000000000000000000000000000000000240000000000000000000000000000000000000000000000000000000000000024100000000000000000000000000000000000000000000000000000000000002420000000000000000000000000000000000000000000000000000000000000243000000000000000000000000000000000000000000000000000000000000024400000000000000000000000000000000000000000000000000000000000002450000000000000000000000000000000000000000000000000000000000000246000000000000000000000000000000000000000000000000000000000000024700000000000000000000000000000000000000000000000000000000000002480000000000000000000000000000000000000000000000000000000000000249000000000000000000000000000000000000000000000000000000000000024a000000000000000000000000000000000000000000000000000000000000024b000000000000000000000000000000000000000000000000000000000000024c000000000000000000000000000000000000000000000000000000000000024d000000000000000000000000000000000000000000000000000000000000024e000000000000000000000000000000000000000000000000000000000000024f0000000000000000000000000000000000000000000000000000000000000250000000000000000000000000000000000000000000000000000000000000025100000000000000000000000000000000000000000000000000000000000002520000000000000000000000000000000000000000000000000000000000000253000000000000000000000000000000000000000000000000000000000000025400000000000000000000000000000000000000000000000000000000000002550000000000000000000000000000000000000000000000000000000000000256000000000000000000000000000000000000000000000000000000000000025700000000000000000000000000000000000000000000000000000000000002580000000000000000000000000000000000000000000000000000000000000259000000000000000000000000000000000000000000000000000000000000025a000000000000000000000000000000000000000000000000000000000000025b000000000000000000000000000000000000000000000000000000000000025c000000000000000000000000000000000000000000000000000000000000025d000000000000000000000000000000000000000000000000000000000000025e000000000000000000000000000000000000000000000000000000000000025f0000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000026100000000000000000000000000000000000000000000000000000000000002620000000000000000000000000000000000000000000000000000000000000263000000000000000000000000000000000000000000000000000000000000026400000000000000000000000000000000000000000000000000000000000002650000000000000000000000000000000000000000000000000000000000000266000000000000000000000000000000000000000000000000000000000000026700000000000000000000000000000000000000000000000000000000000002680000000000000000000000000000000000000000000000000000000000000269000000000000000000000000000000000000000000000000000000000000026a000000000000000000000000000000000000000000000000000000000000026b000000000000000000000000000000000000000000000000000000000000026c000000000000000000000000000000000000000000000000000000000000026d000000000000000000000000000000000000000000000000000000000000026e000000000000000000000000000000000000000000000000000000000000026f0000000000000000000000000000000000000000000000000000000000000270000000000000000000000000000000000000000000000000000000000000027100000000000000000000000000000000000000000000000000000000000002720000000000000000000000000000000000000000000000000000000000000273000000000000000000000000000000000000000000000000000000000000027400000000000000000000000000000000000000000000000000000000000002750000000000000000000000000000000000000000000000000000000000000276000000000000000000000000000000000000000000000000000000000000027700000000000000000000000000000000000000000000000000000000000002780000000000000000000000000000000000000000000000000000000000000279000000000000000000000000000000000000000000000000000000000000027a000000000000000000000000000000000000000000000000000000000000027b000000000000000000000000000000000000000000000000000000000000027c000000000000000000000000000000000000000000000000000000000000027d000000000000000000000000000000000000000000000000000000000000027e000000000000000000000000000000000000000000000000000000000000027f0000000000000000000000000000000000000000000000000000000000000280000000000000000000000000000000000000000000000000000000000000028100000000000000000000000000000000000000000000000000000000000002820000000000000000000000000000000000000000000000000000000000000283000000000000000000000000000000000000000000000000000000000000028400000000000000000000000000000000000000000000000000000000000002850000000000000000000000000000000000000000000000000000000000000286000000000000000000000000000000000000000000000000000000000000028700000000000000000000000000000000000000000000000000000000000002880000000000000000000000000000000000000000000000000000000000000289000000000000000000000000000000000000000000000000000000000000028a000000000000000000000000000000000000000000000000000000000000028b000000000000000000000000000000000000000000000000000000000000028c000000000000000000000000000000000000000000000000000000000000028d000000000000000000000000000000000000000000000000000000000000028e000000000000000000000000000000000000000000000000000000000000028f0000000000000000000000000000000000000000000000000000000000000290000000000000000000000000000000000000000000000000000000000000029100000000000000000000000000000000000000000000000000000000000002920000000000000000000000000000000000000000000000000000000000000293000000000000000000000000000000000000000000000000000000000000029400000000000000000000000000000000000000000000000000000000000002950000000000000000000000000000000000000000000000000000000000000296000000000000000000000000000000000000000000000000000000000000029700000000000000000000000000000000000000000000000000000000000002980000000000000000000000000000000000000000000000000000000000000299000000000000000000000000000000000000000000000000000000000000029a000000000000000000000000000000000000000000000000000000000000029b000000000000000000000000000000000000000000000000000000000000029c000000000000000000000000000000000000000000000000000000000000029d000000000000000000000000000000000000000000000000000000000000029e000000000000000000000000000000000000000000000000000000000000029f00000000000000000000000000000000000000000000000000000000000002a000000000000000000000000000000000000000000000000000000000000002a100000000000000000000000000000000000000000000000000000000000002a200000000000000000000000000000000000000000000000000000000000002a300000000000000000000000000000000000000000000000000000000000002a400000000000000000000000000000000000000000000000000000000000002a500000000000000000000000000000000000000000000000000000000000002a600000000000000000000000000000000000000000000000000000000000002a700000000000000000000000000000000000000000000000000000000000002a800000000000000000000000000000000000000000000000000000000000002a900000000000000000000000000000000000000000000000000000000000002aa00000000000000000000000000000000000000000000000000000000000002ab00000000000000000000000000000000000000000000000000000000000002ac00000000000000000000000000000000000000000000000000000000000002ad00000000000000000000000000000000000000000000000000000000000002ae00000000000000000000000000000000000000000000000000000000000002af00000000000000000000000000000000000000000000000000000000000002b000000000000000000000000000000000000000000000000000000000000002b100000000000000000000000000000000000000000000000000000000000002b200000000000000000000000000000000000000000000000000000000000002b300000000000000000000000000000000000000000000000000000000000002b400000000000000000000000000000000000000000000000000000000000002b500000000000000000000000000000000000000000000000000000000000002b600000000000000000000000000000000000000000000000000000000000002b700000000000000000000000000000000000000000000000000000000000002b800000000000000000000000000000000000000000000000000000000000002b900000000000000000000000000000000000000000000000000000000000002ba00000000000000000000000000000000000000000000000000000000000002bb00000000000000000000000000000000000000000000000000000000000002bc00000000000000000000000000000000000000000000000000000000000002bd00000000000000000000000000000000000000000000000000000000000002be00000000000000000000000000000000000000000000000000000000000002bf00000000000000000000000000000000000000000000000000000000000002c000000000000000000000000000000000000000000000000000000000000002c100000000000000000000000000000000000000000000000000000000000002c200000000000000000000000000000000000000000000000000000000000002c300000000000000000000000000000000000000000000000000000000000002c400000000000000000000000000000000000000000000000000000000000002c500000000000000000000000000000000000000000000000000000000000002c600000000000000000000000000000000000000000000000000000000000002c700000000000000000000000000000000000000000000000000000000000002c800000000000000000000000000000000000000000000000000000000000002c900000000000000000000000000000000000000000000000000000000000002ca00000000000000000000000000000000000000000000000000000000000002cb00000000000000000000000000000000000000000000000000000000000002cc00000000000000000000000000000000000000000000000000000000000002cd00000000000000000000000000000000000000000000000000000000000002ce00000000000000000000000000000000000000000000000000000000000002cf00000000000000000000000000000000000000000000000000000000000002d000000000000000000000000000000000000000000000000000000000000002d100000000000000000000000000000000000000000000000000000000000002d200000000000000000000000000000000000000000000000000000000000002d300000000000000000000000000000000000000000000000000000000000002d400000000000000000000000000000000000000000000000000000000000002d500000000000000000000000000000000000000000000000000000000000002d600000000000000000000000000000000000000000000000000000000000002d700000000000000000000000000000000000000000000000000000000000002d800000000000000000000000000000000000000000000000000000000000002d900000000000000000000000000000000000000000000000000000000000002da00000000000000000000000000000000000000000000000000000000000002db00000000000000000000000000000000000000000000000000000000000002dc00000000000000000000000000000000000000000000000000000000000002dd00000000000000000000000000000000000000000000000000000000000002de00000000000000000000000000000000000000000000000000000000000002df00000000000000000000000000000000000000000000000000000000000002e000000000000000000000000000000000000000000000000000000000000002e100000000000000000000000000000000000000000000000000000000000002e200000000000000000000000000000000000000000000000000000000000002e300000000000000000000000000000000000000000000000000000000000002e400000000000000000000000000000000000000000000000000000000000002e500000000000000000000000000000000000000000000000000000000000002e600000000000000000000000000000000000000000000000000000000000002e700000000000000000000000000000000000000000000000000000000000002e800000000000000000000000000000000000000000000000000000000000002e900000000000000000000000000000000000000000000000000000000000002ea00000000000000000000000000000000000000000000000000000000000002eb00000000000000000000000000000000000000000000000000000000000002ec00000000000000000000000000000000000000000000000000000000000002ed00000000000000000000000000000000000000000000000000000000000002ee00000000000000000000000000000000000000000000000000000000000002ef00000000000000000000000000000000000000000000000000000000000002f000000000000000000000000000000000000000000000000000000000000002f100000000000000000000000000000000000000000000000000000000000002f200000000000000000000000000000000000000000000000000000000000002f300000000000000000000000000000000000000000000000000000000000002f400000000000000000000000000000000000000000000000000000000000002f500000000000000000000000000000000000000000000000000000000000002f600000000000000000000000000000000000000000000000000000000000002f700000000000000000000000000000000000000000000000000000000000002f800000000000000000000000000000000000000000000000000000000000002f900000000000000000000000000000000000000000000000000000000000002fa00000000000000000000000000000000000000000000000000000000000002fb00000000000000000000000000000000000000000000000000000000000002fc00000000000000000000000000000000000000000000000000000000000002fd00000000000000000000000000000000000000000000000000000000000002fe00000000000000000000000000000000000000000000000000000000000002ff0000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000030100000000000000000000000000000000000000000000000000000000000003020000000000000000000000000000000000000000000000000000000000000303000000000000000000000000000000000000000000000000000000000000030400000000000000000000000000000000000000000000000000000000000003050000000000000000000000000000000000000000000000000000000000000306000000000000000000000000000000000000000000000000000000000000030700000000000000000000000000000000000000000000000000000000000003080000000000000000000000000000000000000000000000000000000000000309000000000000000000000000000000000000000000000000000000000000030a000000000000000000000000000000000000000000000000000000000000030b000000000000000000000000000000000000000000000000000000000000030c000000000000000000000000000000000000000000000000000000000000030d000000000000000000000000000000000000000000000000000000000000030e000000000000000000000000000000000000000000000000000000000000030f0000000000000000000000000000000000000000000000000000000000000310000000000000000000000000000000000000000000000000000000000000031100000000000000000000000000000000000000000000000000000000000003120000000000000000000000000000000000000000000000000000000000000313000000000000000000000000000000000000000000000000000000000000031400000000000000000000000000000000000000000000000000000000000003150000000000000000000000000000000000000000000000000000000000000316000000000000000000000000000000000000000000000000000000000000031700000000000000000000000000000000000000000000000000000000000003180000000000000000000000000000000000000000000000000000000000000319000000000000000000000000000000000000000000000000000000000000031a000000000000000000000000000000000000000000000000000000000000031b000000000000000000000000000000000000000000000000000000000000031c000000000000000000000000000000000000000000000000000000000000031d000000000000000000000000000000000000000000000000000000000000031e000000000000000000000000000000000000000000000000000000000000031f0000000000000000000000000000000000000000000000000000000000000320000000000000000000000000000000000000000000000000000000000000032100000000000000000000000000000000000000000000000000000000000003220000000000000000000000000000000000000000000000000000000000000323000000000000000000000000000000000000000000000000000000000000032400000000000000000000000000000000000000000000000000000000000003250000000000000000000000000000000000000000000000000000000000000326000000000000000000000000000000000000000000000000000000000000032700000000000000000000000000000000000000000000000000000000000003280000000000000000000000000000000000000000000000000000000000000329000000000000000000000000000000000000000000000000000000000000032a000000000000000000000000000000000000000000000000000000000000032b000000000000000000000000000000000000000000000000000000000000032c000000000000000000000000000000000000000000000000000000000000032d000000000000000000000000000000000000000000000000000000000000032e000000000000000000000000000000000000000000000000000000000000032f0000000000000000000000000000000000000000000000000000000000000330000000000000000000000000000000000000000000000000000000000000033100000000000000000000000000000000000000000000000000000000000003320000000000000000000000000000000000000000000000000000000000000333000000000000000000000000000000000000000000000000000000000000033400000000000000000000000000000000000000000000000000000000000003350000000000000000000000000000000000000000000000000000000000000336000000000000000000000000000000000000000000000000000000000000033700000000000000000000000000000000000000000000000000000000000003380000000000000000000000000000000000000000000000000000000000000339000000000000000000000000000000000000000000000000000000000000033a000000000000000000000000000000000000000000000000000000000000033b000000000000000000000000000000000000000000000000000000000000033c000000000000000000000000000000000000000000000000000000000000033d000000000000000000000000000000000000000000000000000000000000033e000000000000000000000000000000000000000000000000000000000000033f000001000000000000000000000000000000000000000000000000000000000000000340000000000000000000000000000000000000000000000000000000000000034100000000000000000000000000000000000000000000000000000000000003420000000000000000000000000000000000000000000000000000000000000343000000000000000000000000000000000000000000000000000000000000034400000000000000000000000000000000000000000000000000000000000003450000000000000000000000000000000000000000000000000000000000000346000000000000000000000000000000000000000000000000000000000000034700000000000000000000000000000000000000000000000000000000000003480000000000000000000000000000000000000000000000000000000000000349000000000000000000000000000000000000000000000000000000000000034a000000000000000000000000000000000000000000000000000000000000034b000000000000000000000000000000000000000000000000000000000000034c000000000000000000000000000000000000000000000000000000000000034d000000000000000000000000000000000000000000000000000000000000034e000000000000000000000000000000000000000000000000000000000000034f0000000000000000000000000000000000000000000000000000000000000350000000000000000000000000000000000000000000000000000000000000035100000000000000000000000000000000000000000000000000000000000003520000000000000000000000000000000000000000000000000000000000000353000000000000000000000000000000000000000000000000000000000000035400000000000000000000000000000000000000000000000000000000000003550000000000000000000000000000000000000000000000000000000000000356000000000000000000000000000000000000000000000000000000000000035700000000000000000000000000000000000000000000000000000000000003580000000000000000000000000000000000000000000000000000000000000359000000000000000000000000000000000000000000000000000000000000035a000000000000000000000000000000000000000000000000000000000000035b000000000000000000000000000000000000000000000000000000000000035c000000000000000000000000000000000000000000000000000000000000035d000000000000000000000000000000000000000000000000000000000000035e000000000000000000000000000000000000000000000000000000000000035f0000000000000000000000000000000000000000000000000000000000000360000000000000000000000000000000000000000000000000000000000000036100000000000000000000000000000000000000000000000000000000000003620000000000000000000000000000000000000000000000000000000000000363000000000000000000000000000000000000000000000000000000000000036400000000000000000000000000000000000000000000000000000000000003650000000000000000000000000000000000000000000000000000000000000366000000000000000000000000000000000000000000000000000000000000036700000000000000000000000000000000000000000000000000000000000003680000000000000000000000000000000000000000000000000000000000000369000000000000000000000000000000000000000000000000000000000000036a000000000000000000000000000000000000000000000000000000000000036b000000000000000000000000000000000000000000000000000000000000036c000000000000000000000000000000000000000000000000000000000000036d000000000000000000000000000000000000000000000000000000000000036e000000000000000000000000000000000000000000000000000000000000036f0000000000000000000000000000000000000000000000000000000000000370000000000000000000000000000000000000000000000000000000000000037100000000000000000000000000000000000000000000000000000000000003720000000000000000000000000000000000000000000000000000000000000373000000000000000000000000000000000000000000000000000000000000037400000000000000000000000000000000000000000000000000000000000003750000000000000000000000000000000000000000000000000000000000000376000000000000000000000000000000000000000000000000000000000000037700000000000000000000000000000000000000000000000000000000000003780000000000000000000000000000000000000000000000000000000000000379000000000000000000000000000000000000000000000000000000000000037a000000000000000000000000000000000000000000000000000000000000037b000000000000000000000000000000000000000000000000000000000000037c000000000000000000000000000000000000000000000000000000000000037d000000000000000000000000000000000000000000000000000000000000037e00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000380000000000000000000000000000000000000000000000000000000000000038100000000000000000000000000000000000000000000000000000000000003820000000000000000000000000000000000000000000000000000000000000383000000000000000000000000000000000000000000000000000000000000038400000000000000000000000000000000000000000000000000000000000003850000000000000000000000000000000000000000000000000000000000000386000000000000000000000000000000000000000000000000000000000000038700000000000000000000000000000000000000000000000000000000000003880000000000000000000000000000000000000000000000000000000000000389000000000000000000000000000000000000000000000000000000000000038a000000000000000000000000000000000000000000000000000000000000038b000000000000000000000000000000000000000000000000000000000000038c000000000000000000000000000000000000000000000000000000000000038d000000000000000000000000000000000000000000000000000000000000038e000000000000000000000000000000000000000000000000000000000000038f0000000000000000000000000000000000000000000000000000000000000390000000000000000000000000000000000000000000000000000000000000039100000000000000000000000000000000000000000000000000000000000003920000000000000000000000000000000000000000000000000000000000000393000000000000000000000000000000000000000000000000000000000000039400000000000000000000000000000000000000000000000000000000000003950000000000000000000000000000000000000000000000000000000000000396000000000000000000000000000000000000000000000000000000000000039700000000000000000000000000000000000000000000000000000000000003980000000000000000000000000000000000000000000000000000000000000399000000000000000000000000000000000000000000000000000000000000039a000000000000000000000000000000000000000000000000000000000000039b000000000000000000000000000000000000000000000000000000000000039c000000000000000000000000000000000000000000000000000000000000039d000000000000000000000000000000000000000000000000000000000000039e000000000000000000000000000000000000000000000000000000000000039f00000000000000000000000000000000000000000000000000000000000003a000000000000000000000000000000000000000000000000000000000000003a100000000000000000000000000000000000000000000000000000000000003a200000000000000000000000000000000000000000000000000000000000003a300000000000000000000000000000000000000000000000000000000000003a400000000000000000000000000000000000000000000000000000000000003a500000000000000000000000000000000000000000000000000000000000003a600000000000000000000000000000000000000000000000000000000000003a700000000000000000000000000000000000000000000000000000000000003a800000000000000000000000000000000000000000000000000000000000003a900000000000000000000000000000000000000000000000000000000000003aa00000000000000000000000000000000000000000000000000000000000003ab00000000000000000000000000000000000000000000000000000000000003ac00000000000000000000000000000000000000000000000000000000000003ad00000000000000000000000000000000000000000000000000000000000003ae00000000000000000000000000000000000000000000000000000000000003af00000000000000000000000000000000000000000000000000000000000003b000000000000000000000000000000000000000000000000000000000000003b100000000000000000000000000000000000000000000000000000000000003b200000000000000000000000000000000000000000000000000000000000003b300000000000000000000000000000000000000000000000000000000000003b400000000000000000000000000000000000000000000000000000000000003b500000000000000000000000000000000000000000000000000000000000003b600000000000000000000000000000000000000000000000000000000000003b700000000000000000000000000000000000000000000000000000000000003b800000000000000000000000000000000000000000000000000000000000003b900000000000000000000000000000000000000000000000000000000000003ba00000000000000000000000000000000000000000000000000000000000003bb00000000000000000000000000000000000000000000000000000000000003bc00000000000000000000000000000000000000000000000000000000000003bd00000000000000000000000000000000000000000000000000000000000003be000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003c000000000000000000000000000000000000000000000000000000000000003c100000000000000000000000000000000000000000000000000000000000003c200000000000000000000000000000000000000000000000000000000000003c300000000000000000000000000000000000000000000000000000000000003c400000000000000000000000000000000000000000000000000000000000003c500000000000000000000000000000000000000000000000000000000000003c600000000000000000000000000000000000000000000000000000000000003c700000000000000000000000000000000000000000000000000000000000003c800000000000000000000000000000000000000000000000000000000000003c900000000000000000000000000000000000000000000000000000000000003ca00000000000000000000000000000000000000000000000000000000000003cb00000000000000000000000000000000000000000000000000000000000003cc00000000000000000000000000000000000000000000000000000000000003cd00000000000000000000000000000000000000000000000000000000000003ce00000000000000000000000000000000000000000000000000000000000003cf00000000000000000000000000000000000000000000000000000000000003d000000000000000000000000000000000000000000000000000000000000003d100000000000000000000000000000000000000000000000000000000000003d200000000000000000000000000000000000000000000000000000000000003d300000000000000000000000000000000000000000000000000000000000003d400000000000000000000000000000000000000000000000000000000000003d500000000000000000000000000000000000000000000000000000000000003d600000000000000000000000000000000000000000000000000000000000003d700000000000000000000000000000000000000000000000000000000000003d800000000000000000000000000000000000000000000000000000000000003d900000000000000000000000000000000000000000000000000000000000003da00000000000000000000000000000000000000000000000000000000000003db00000000000000000000000000000000000000000000000000000000000003dc00000000000000000000000000000000000000000000000000000000000003dd00000000000000000000000000000000000000000000000000000000000003de00000000000000000000000000000000000000000000000000000000000003df00000000000000000000000000000000000000000000000000000000000003e000000000000000000000000000000000000000000000000000000000000003e100000000000000000000000000000000000000000000000000000000000003e200000000000000000000000000000000000000000000000000000000000003e300000000000000000000000000000000000000000000000000000000000003e400000000000000000000000000000000000000000000000000000000000003e500000000000000000000000000000000000000000000000000000000000003e600000000000000000000000000000000000000000000000000000000000003e700000000000000000000000000000000000000000000000000000000000003e800000000000000000000000000000000000000000000000000000000000003e900000000000000000000000000000000000000000000000000000000000003ea00000000000000000000000000000000000000000000000000000000000003eb00000000000000000000000000000000000000000000000000000000000003ec00000000000000000000000000000000000000000000000000000000000003ed00000000000000000000000000000000000000000000000000000000000003ee00000000000000000000000000000000000000000000000000000000000003ef00000000000000000000000000000000000000000000000000000000000003f000000000000000000000000000000000000000000000000000000000000003f100000000000000000000000000000000000000000000000000000000000003f200000000000000000000000000000000000000000000000000000000000003f300000000000000000000000000000000000000000000000000000000000003f400000000000000000000000000000000000000000000000000000000000003f500000000000000000000000000000000000000000000000000000000000003f600000000000000000000000000000000000000000000000000000000000003f700000000000000000000000000000000000000000000000000000000000003f800000000000000000000000000000000000000000000000000000000000003f900000000000000000000000000000000000000000000000000000000000003fa00000000000000000000000000000000000000000000000000000000000003fb00000000000000000000000000000000000000000000000000000000000003fc00000000000000000000000000000000000000000000000000000000000003fd00000000000000000000000000000000000000000000000000000000000003fe00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000040100000000000000000000000000000000000000000000000000000000000004020000000000000000000000000000000000000000000000000000000000000403000000000000000000000000000000000000000000000000000000000000040400000000000000000000000000000000000000000000000000000000000004050000000000000000000000000000000000000000000000000000000000000406000000000000000000000000000000000000000000000000000000000000040700000000000000000000000000000000000000000000000000000000000004080000000000000000000000000000000000000000000000000000000000000409000000000000000000000000000000000000000000000000000000000000040a000000000000000000000000000000000000000000000000000000000000040b000000000000000000000000000000000000000000000000000000000000040c000000000000000000000000000000000000000000000000000000000000040d000000000000000000000000000000000000000000000000000000000000040e000000000000000000000000000000000000000000000000000000000000040f0000000000000000000000000000000000000000000000000000000000000410000000000000000000000000000000000000000000000000000000000000041100000000000000000000000000000000000000000000000000000000000004120000000000000000000000000000000000000000000000000000000000000413000000000000000000000000000000000000000000000000000000000000041400000000000000000000000000000000000000000000000000000000000004150000000000000000000000000000000000000000000000000000000000000416000000000000000000000000000000000000000000000000000000000000041700000000000000000000000000000000000000000000000000000000000004180000000000000000000000000000000000000000000000000000000000000419000000000000000000000000000000000000000000000000000000000000041a000000000000000000000000000000000000000000000000000000000000041b000000000000000000000000000000000000000000000000000000000000041c000000000000000000000000000000000000000000000000000000000000041d000000000000000000000000000000000000000000000000000000000000041e000000000000000000000000000000000000000000000000000000000000041f0000000000000000000000000000000000000000000000000000000000000420000000000000000000000000000000000000000000000000000000000000042100000000000000000000000000000000000000000000000000000000000004220000000000000000000000000000000000000000000000000000000000000423000000000000000000000000000000000000000000000000000000000000042400000000000000000000000000000000000000000000000000000000000004250000000000000000000000000000000000000000000000000000000000000426000000000000000000000000000000000000000000000000000000000000042700000000000000000000000000000000000000000000000000000000000004280000000000000000000000000000000000000000000000000000000000000429000000000000000000000000000000000000000000000000000000000000042a000000000000000000000000000000000000000000000000000000000000042b000000000000000000000000000000000000000000000000000000000000042c000000000000000000000000000000000000000000000000000000000000042d000000000000000000000000000000000000000000000000000000000000042e000000000000000000000000000000000000000000000000000000000000042f0000000000000000000000000000000000000000000000000000000000000430000000000000000000000000000000000000000000000000000000000000043100000000000000000000000000000000000000000000000000000000000004320000000000000000000000000000000000000000000000000000000000000433000000000000000000000000000000000000000000000000000000000000043400000000000000000000000000000000000000000000000000000000000004350000000000000000000000000000000000000000000000000000000000000436000000000000000000000000000000000000000000000000000000000000043700000000000000000000000000000000000000000000000000000000000004380000000000000000000000000000000000000000000000000000000000000439000000000000000000000000000000000000000000000000000000000000043a000000000000000000000000000000000000000000000000000000000000043b000000000000000000000000000000000000000000000000000000000000043c000000000000000000000000000000000000000000000000000000000000043d000000000000000000000000000000000000000000000000000000000000043e0000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000640000000000000000000000000000000000000000000000000000000000000064a0000000000000000000000000000000000000000000000000000000000000641000000000000000000000000000000000000000000000000000000000000064b0000000000000000000000000000000000000000000000000000000000000642000000000000000000000000000000000000000000000000000000000000064c0000000000000000000000000000000000000000000000000000000000000643000000000000000000000000000000000000000000000000000000000000064d0000000000000000000000000000000000000000000000000000000000000644000000000000000000000000000000000000000000000000000000000000064e0000000000000000000000000000000000000000000000000000000000000645000000000000000000000000000000000000000000000000000000000000064f00000000000000000000000000000000000000000000000000000000000006460000000000000000000000000000000000000000000000000000000000000650000000000000000000000000000000000000000000000000000000000000064700000000000000000000000000000000000000000000000000000000000006510000000000000000000000000000000000000000000000000000000000000648000000000000000000000000000000000000000000000000000000000000065200000000000000000000000000000000000000000000000000000000000006490000000000000000000000000000000000000000000000000000000000000653000000000000000000000000000000000000000000000000000000000000064a0000000000000000000000000000000000000000000000000000000000000654000000000000000000000000000000000000000000000000000000000000064b0000000000000000000000000000000000000000000000000000000000000655000000000000000000000000000000000000000000000000000000000000064c0000000000000000000000000000000000000000000000000000000000000656000000000000000000000000000000000000000000000000000000000000064d0000000000000000000000000000000000000000000000000000000000000657000000000000000000000000000000000000000000000000000000000000064e0000000000000000000000000000000000000000000000000000000000000658000000000000000000000000000000000000000000000000000000000000064f00000000000000000000000000000000000000000000000000000000000006590000000000000000000000000000000000000000000000000000000000000680000000000000000000000000000000000000000000000000000000000000068a0000000000000000000000000000000000000000000000000000000000000681000000000000000000000000000000000000000000000000000000000000068b0000000000000000000000000000000000000000000000000000000000000682000000000000000000000000000000000000000000000000000000000000068c0000000000000000000000000000000000000000000000000000000000000683000000000000000000000000000000000000000000000000000000000000068d0000000000000000000000000000000000000000000000000000000000000684000000000000000000000000000000000000000000000000000000000000068e0000000000000000000000000000000000000000000000000000000000000685000000000000000000000000000000000000000000000000000000000000068f00000000000000000000000000000000000000000000000000000000000006860000000000000000000000000000000000000000000000000000000000000690000000000000000000000000000000000000000000000000000000000000068700000000000000000000000000000000000000000000000000000000000006910000000000000000000000000000000000000000000000000000000000000688000000000000000000000000000000000000000000000000000000000000069200000000000000000000000000000000000000000000000000000000000006890000000000000000000000000000000000000000000000000000000000000693000000000000000000000000000000000000000000000000000000000000068a0000000000000000000000000000000000000000000000000000000000000694000000000000000000000000000000000000000000000000000000000000068b0000000000000000000000000000000000000000000000000000000000000695000000000000000000000000000000000000000000000000000000000000068c0000000000000000000000000000000000000000000000000000000000000696000000000000000000000000000000000000000000000000000000000000068d0000000000000000000000000000000000000000000000000000000000000697000000000000000000000000000000000000000000000000000000000000068e0000000000000000000000000000000000000000000000000000000000000698000000000000000000000000000000000000000000000000000000000000068f000000000000000000000000000000000000000000000000000000000000069900000000000000000000000000000000000000000000000000000000000006c000000000000000000000000000000000000000000000000000000000000006ca00000000000000000000000000000000000000000000000000000000000006c100000000000000000000000000000000000000000000000000000000000006cb00000000000000000000000000000000000000000000000000000000000006c200000000000000000000000000000000000000000000000000000000000006cc00000000000000000000000000000000000000000000000000000000000006c300000000000000000000000000000000000000000000000000000000000006cd00000000000000000000000000000000000000000000000000000000000006c400000000000000000000000000000000000000000000000000000000000006ce00000000000000000000000000000000000000000000000000000000000006c500000000000000000000000000000000000000000000000000000000000006cf00000000000000000000000000000000000000000000000000000000000006c600000000000000000000000000000000000000000000000000000000000006d000000000000000000000000000000000000000000000000000000000000006c700000000000000000000000000000000000000000000000000000000000006d100000000000000000000000000000000000000000000000000000000000006c800000000000000000000000000000000000000000000000000000000000006d200000000000000000000000000000000000000000000000000000000000006c900000000000000000000000000000000000000000000000000000000000006d300000000000000000000000000000000000000000000000000000000000006ca00000000000000000000000000000000000000000000000000000000000006d400000000000000000000000000000000000000000000000000000000000006cb00000000000000000000000000000000000000000000000000000000000006d500000000000000000000000000000000000000000000000000000000000006cc00000000000000000000000000000000000000000000000000000000000006d600000000000000000000000000000000000000000000000000000000000006cd00000000000000000000000000000000000000000000000000000000000006d700000000000000000000000000000000000000000000000000000000000006ce00000000000000000000000000000000000000000000000000000000000006d800000000000000000000000000000000000000000000000000000000000006cf00000000000000000000000000000000000000000000000000000000000006d90000000000000000000000000000000000000000000000000000000000000700000000000000000000000000000000000000000000000000000000000000070a0000000000000000000000000000000000000000000000000000000000000701000000000000000000000000000000000000000000000000000000000000070b0000000000000000000000000000000000000000000000000000000000000702000000000000000000000000000000000000000000000000000000000000070c0000000000000000000000000000000000000000000000000000000000000703000000000000000000000000000000000000000000000000000000000000070d0000000000000000000000000000000000000000000000000000000000000704000000000000000000000000000000000000000000000000000000000000070e0000000000000000000000000000000000000000000000000000000000000705000000000000000000000000000000000000000000000000000000000000070f00000000000000000000000000000000000000000000000000000000000007060000000000000000000000000000000000000000000000000000000000000710000000000000000000000000000000000000000000000000000000000000070700000000000000000000000000000000000000000000000000000000000007110000000000000000000000000000000000000000000000000000000000000708000000000000000000000000000000000000000000000000000000000000071200000000000000000000000000000000000000000000000000000000000007090000000000000000000000000000000000000000000000000000000000000713000000000000000000000000000000000000000000000000000000000000070a0000000000000000000000000000000000000000000000000000000000000714000000000000000000000000000000000000000000000000000000000000070b0000000000000000000000000000000000000000000000000000000000000715000000000000000000000000000000000000000000000000000000000000070c0000000000000000000000000000000000000000000000000000000000000716000000000000000000000000000000000000000000000000000000000000070d0000000000000000000000000000000000000000000000000000000000000717000000000000000000000000000000000000000000000000000000000000070e0000000000000000000000000000000000000000000000000000000000000718000000000000000000000000000000000000000000000000000000000000070f000000000000000000000000000000000000000000000000000000000000071900000008000000000000000000000000000000000000000000000000000000000000044000000000000000000000000000000000000000000000000000000000000004410000000000000000000000000000000000000000000000000000000000000480000000000000000000000000000000000000000000000000000000000000048100000000000000000000000000000000000000000000000000000000000004c000000000000000000000000000000000000000000000000000000000000004c100000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000000501000000042ea6fe02855d8c72905f35f08604467117c037962e324c9a793505138558b3700c94efd9afe573212f9bf596ca3a4b42ae57f59e670a7cb5b9440c54bd8ea2961856bc4892b0b3f156ed2aa87463c389bfce0fd675a37cec77ae5d753fcf593c12f9d3f397c2edc9e4a6a5e485641163525ca802e3bd93994af997a9b9a44f98000000000000000000000000000000000000000000000000000000000000114041414141414141414141414141414141414141410000000000000000000000000000000000000000000000000000000000001180818181818181818181818181818181818181818100000000000000000000000000000000000000000000000000000000000011c0c1c1c1c1c1c1c1c1c1c1c1c1c1c1c1c1c1c1c1c1000000000000000000000000000000000000000000000000000000000000120001010101010101010101010101010101010101010000001012e5643e26da426570dd999e0e044e5f83d60f3cd813c55059bc0ea0f4a7c9d413b2d2cea949fa0876265cd8eee3a4dce1e243783562ea07e2de537f469f7bf627abb3d4560e786bafd52f77ac52dea36c50419f32386567bd969b0c38e1bd7405d339cecb99fa74bfd631917f965357f0341d8c4dfe6a8f4b621d8df54c82941d560ac24523012499eeca2594f20ce238b7d21b98ad5c638767d70ee05532c2183e6d64e69b005709dfc4771c7ca5981adc54f3e8bd1b00222461ae90e44eda2f1d4572fe0b0b23100a7ea6d4780b25e826e41ca9e71897e010bcb218887b3d036d44eb30a430b5cfc6660270eb5fb7f274689ac73dfa53ba9d0739fe38637f01f7130af8c5888d4c65ea68109a1d58fe8d7d1ae62098857b0a3a3dcd393ef80ed8bcba6eb5e3b4887a32c51c5853b97a5eb59c87c520f36423c6d7be06071821ca1719330de5e3c51a521778b49cbbc1d53f8ed42e0562bf21ed72e8cb9a410b0e82ef5f7276df41353faef675fb408aeb246b6e2f704cab99bf28d1427e7b0fec7b9929c6effdcd045d3fdcec1d1b73faed495444699fab936630d69b519f0bf4f1453db36439419dbfba703b849d1aa5774fe9a5325e5bf3e7cdda9d1f7f2a9c2a035c72fd4a3e383306aff03448f9accc08a2c665837560cec8675fe2512bfaef35a8fb7df08a81001a7fd4903849c0371dedd87f31295f46269c5205dd0000381000000e00000001bc000000907c1b3a08a2cb8683fcf76e45ae9de5c9d696408c53a9939f5064e661500cac4a2964e0e00a2d6c71f958321068266a0ad7706eac1a5183572be5c3d53ba45ff1734d012091c1faa4caf66c00b6a0b4252ba53f2ae331779ec2b332e67f3b10a097f4c74d6bbcc69fabdbfc1a07956b820a762eec034f3519c6615c7ab60a150c811c029efe9b594f2412a29b64105003000000906bab5e23dbfe7a7696c7090aff4201627797929ea89bec9d6a17ec930fbf0f3d42708d82717dd5dbba0e06b724470f6a9ecf06918af478b4d92ba01a3bf5cc97e531181c10128934d4f2a58760f863381de408544e4b35200214e5bfbb7d191f689934289a36948459656b72b025f2590cf71cfd94c6c0b479f85ae74bab0f42384de7051fa4405e3e1663e0cadec48e00000090b9d3e39d91ad008916bef1383e0a7a18314b2b778569b1bc650be76cbaa70defca5db3dba7234ee8c0c1ae77caadbe6e4d44aefc9016a6ebcb43a30ef76e614ef6072bbf1282ac465c0a7d8f1ad081c523aa58f64bb496593f493c5e18084cbc343f9cce765f11cebbb9f08aa524aaa0107fbe4f10f8fc4d5ebd6f34cc5b6a718b93b35c3cb971b033d51dbf3d71a1e0000001bc00000090d65b1026d291257fb639ab3bd2bef618b0b48a8a0011f78b66ef61da931d3e98d7476e5b783cd04fd256c2ee48e50e6609423babd46f0d4128e062251f200f5efebd8874fbe9803428ace9441ad6be73024d04270212a21b1e315671fd50cecf657008784a40e6a945d0c9933b0b751e0e4270bdf3d96f5660bc332deb55c1d69efee98575540775b0bfeb1795ab0b6800000090c428df8558124ebad08202b4e9df93e9aba73daf792c1c5778d7db24eae062d1f96e40068f382c241371fe92222fe65d6079aef71144a6b5200b640fda76576707df17436b91e16e3702b234bc3b5db2148e9b10bde68adae03ec7397db66e9f38d9b6dad770ed9a4cedd10af990193d010d7ee63c3673e7d19a1a86c85b812a77a27960a061d34b6d3603e9be4fd68b000000900dd0a2f23deaec926322cf81653b6af17ba64cf0771512f67cc6254d5b2655c57ff8bb485ea8b7800db96eae65f0a7c88bfc2106b9bf899dad80284afef5030402d374526f89145f851b824fb54289e50964cc0cfa74628f766fc485bd77b2fd8d991243ca4df56a0d2961c62bcfc8b0143b56669c4243ba4b8a1b23eb6d47baa02a5018715df1ba04c901c8c8bd0177000001bc00000090a90243f2ec68e4f6e6b21048876e4a1312cdb3af73a5cfc0dbcc269d26985fa2055897a67459ebb74f3ac45aa0d6ff3f63dcb9e71f0884497c858f0ae15cca019fe6e93e9baafcaf945bd069a3a5c98e0865700131bef16cc4c47e389f5e0f8c5222696be1a1c09029c7e1ddcf643fa617304820537e972a15547cd43dbc826304a85d5a9fdd345f4033f326fd8b317e00000090a6f785621cd1f8bd394ce02ecd3bf72e1652b7dac8434e0f36be19f5067923427af900b9d89d75e0693d121c4ee41ea5c7b3c3768c2aec19c6db0476c0290e50028b11d31ae04ecd702125a29fd857db05a3826a0ce0a9d720f46e24e33f95c1ffc966b90a1d2d83c7ae9f28e538cacf0cec4bf0ef40d262f77360406230b9456a7c14321fac15cd4dbeaac0672954d500000090ced89c13be6d034f1f3ed73c871c41bf79e2b6f9c03652ea3562484101d06c0fe592debbdea9ff08a4a8e242c3e31b3a39b0b503bcc29f1f3da8c90fad9240b701258f7cd3dc750418cdb045d6f89070259677559b050bf6652a4b3c88edfd90a208d80286a3a627432fbe2bca3d07e5196c31f8e14d2443ed9eb8a12ccf2f2d3f90af296c346adf5e874042f50b8e58000001bc0000009036b8114db5d25a74f20c28ec8fa372279d3de9bf48e22a1466a0e02283af96257e863f638359ea3f4d5626af79ffb9c3755f0201f31deeb9082c5d4bf708589e66edf6386bc795ba50d50a23daee25eb1492ce5b5ea7bc5b2692bce3fcc4d75ce59f4ff60a1925b26288230a41a085d7192a0d71649842bfd019e17062a1b606dd09abbaad2ca4f2d8e19c591583814900000090f448cf92adc1a09fe6a43d3532627994990b9eb5aaa76a43d547045d73c4311a476773a0642db295b91823296cc8eebedf1c9fd738e612e2c07b2b5770618e696f6c4f97e6714ace745c013e68ea1a7317b03ca9059b14736059b181ea3d2d4b35b02525ce4127e892259748c01a81912e694361b8f22c0484b545ec4e2bae6b6b9a04727ccfc5976597374e891ff50e00000090a422ede5cb0a1ee27d05be320b90bcadcaf47b31ff2723625145666809a67f3c2757ee3d5e56ec08fcea4ccf9cd345e2281dd362935cc246680a3115f8b9df3301c3b1e9b8c6a8eb2cb869f8e029b8462a2cbd9f5b38a69ceaedb87e7777e8edcc0c6bdeee33ef17b3fc5dd8d74fb097010b54bc3509deef732f49927ca924a212fa97c5ae076dd285e9f5001bb3755b000001bc000000902388e4f77b866464924fb5d3eb9bb1f4cf8aeee2327dbb5ca6c94d7469a8a4cf955d66341ca63cd8b74b1b81c87fe727cc79d4c52dfc33b8336a6ab5e88e5460d3fea2d8af8ef176c91ee898a1ea3b501af82247408797c0e1b3d309a271ad98109038e1fd88da421de1be702af1c94a2868d845580151b770a3af1ab2ba4ffa38e4696d1174792ceb8169c0e3a40d3f00000090eb7def151cd9a4004475ad0ce963e7e34cc75ddc8689fb9466c4e9ced59197dc3fb3c25a43fa9c62bba236f989e38bfcdef819eba5dcf89d17f6c4025beba3f988497c0b9639b765867338d4b096dc811f1f35b19829cea2a0999d2bcb28db6d3204ed4b7acde9785129e72af98439d31035fe030458a481ce33a27dff24a1ae4796b041643c0c80afcccb1b03e9916e000000906968b696d07368fb5400ea065d9602b3043800c1440c79689952ffd7797d5c614568420845cbc63e9d741e1f5fffa1d9851d30c01c29b1927611f795cf88d2237e7d4ec9037aa9d0d2bfcaf4b5a9355c0c8e9cf86b1c2957799bed4517fd6e7678a52789de5e7d7bbc50b1c4819f7d452f2d0fa9ab1862b6e086fdaf8870a4b1a0720cc10f545d8b1a80d2f7bbd4a03f000001bc00000090c66e589493203da5dc904131056f39a754308b74116ab5ff61fbe83ec2eaf2029b6b617bdae1462ac1c00ce5411ec65c0c5234d7def6a7e8ad98a15b73e2a9c02f50fcb32dc91952a1256a7c0cfe7f9821e175d48758ac9aba3cdca31f3c6fcaa0c616c8fd0736a1930ef29ec83d40c800e48f95794a82dc3f8ea3fd2a823bfb297e541d1b88783cbb52046a5c0f562300000090768193236ad2763b5873968cf429dd9904fbd0e566984a93df8d19b31fa6c7d97b685669fa571770d1104e49deae20e878a40c0836bdb779b82935926c6fbdd1d0a5a0313eee67f020ece80df5e81dc42246e9f9a36c8515a4d80eabc793bcbbefcd84bf5d10711f35971580e81c41280037c6d6da5cfa8c3eed023f32d55c48d0d4294ad7c030781aff4f77b94fcfea00000090c912532e7c09e0a8dab5f7a0c0e3f8364025505f36dd512d2ba05909f99b04cfddfeef1175f65eeaec313c4eae48323611d7b40b7f52bcb507d0c4c80563c66bf52949b1496b5fbb65265a62e7b6843f02e21de4e1dda3aead13660ee9e5b2cb5aa9e614f2bc9c086a0eed7cbaa710b42edf80e0159819eaaf21d15dcfd2f94efeb9525fa6a0f99828876e91682585b1000001bc00000090ef1b83a2fe15a224b3cb05418b3497e13856d86ec0def188a4cf0ced86edae1002081453f26b97ac1691c20788d6c4746f19f06e29c5b23b0e887777b6e30208971d0f2cbd0ed8d91521f4a3c7045e34076df337e47e9fa507516ef13f03ada0c285b92fb61d70e9a0db40d3e163c45e2ee3a7b9f4f6ca902e3a7e98f18b0299031970689089bb5f21c08d2fc94603da000000903b62fbc69c73bfbb0c0443bcf4624f807b1ef4acec60db08a8bccef7f0833e1944cd2ee8644678af13f82e7014c4c728d36bc689b93d5856cd21d4c005bae82d726d64da49fb830601b511e9cef791b62e54ec2d95817842163e2f417ff9cada18ffce9e4588208fecc05500ad078f09057b40278ee50de377d0a121b23a928ecf36c42d1e609261fd79c6c853cf304000000090570872564617956e481624ece8f9f8fa7bc63eba53e28fe4c3c06dc594cb0672e9530b3214c8983cafe960bc97fa3536e3ef44132d8721b793efedb3a17578de05a354348a2c25e83357c4682a39df3206d44fc44579a5ca0920f4196fe08e2d00377513e7ed4145e51de3836faaaa4e181002382bf3915f558af58266a43b2801a97c127dbc10b2840c2e0df5949bac000001bc0000009094212cd20c5afb93ea77dc91e6ad2ecd5dd55ea4e8e7de7ce66c2f7d496f9af69d07f2ffa402f093d6bd3c2d5d246c7763de341e81e5b654b1c29714e79b02ed8aabce6892903ec40e05e0bdac20c8c2237a47816a3cdc1fc64fb4052c9192e2493e19c8a6f2c639aec710ef74b5ad2727850860db08e994d6dadc8f773a7487cc99b29f65b78e76874842e18c59cbc100000090d22273ab92a64992204949d374718bce467241f4eaba3dd635a3b03469b2cbec16e5c37e80258e9b1985cb4675450f19dc8c2b3c3576da96c4ce51a08aa4e3bb3c8015777e3300fe7e2eeb1f57b8675f01a998d4256eb12fbacf0157cab4dbb9f4ccc9d15d5786f2c14d5b453cad59a828312c4bde964f8bf3224a34d5da9c65652b754d3e9db14d985923114c3ae8a70000009016e64044ce8bc509083bb3a8bbd4546a349850ac8c4c2a4e3c1f2b6bb12f46a2069c4bc6fcf80e208fded4592feef5da5448609bec68fbf7e1314b3eb76e5cde198af34a03a051e92b586452758582a11ccdf709902a39cc8940dc42e3ef4e0afc2ad07b53337028ac9dca172b7f475421b2eff3b6c4da731453539197b2d016903d4d1ff7361ad5c5c2fc35ecdc6a2000000e00000001bc000000908f5f5305fbf3044e058b0694519238796f9e67dcc6927252965c4792d1642bfd740e05eccc60eeaa8e4a5b6a085385b2947b7e9f0ef5de46869ad4136e88fbf07123f9570b54623787cefc24533b49ac0e01c777811bd9cac13a289698765bcdf90d8e965689cef3e2faee319c3eb9cc1242762410d2041e045715375e0e060dd857fb744e324b653250e850ff35845b000000906ed36c1c9b2d8c7c394f5c0024cb8510f8558c17d6c83111ee0d4077bb0fc10033c45319684f00450424e3d77369f15eec6a65156daf316522cf5795f0d21c326640da47834e04eb9987af73772f864027aea09f7d3a5e79d39ac7e44f7e2a83ddc472d7ad4d6ac4cd2b235e660eef9115773b7394dcd03632821701533dda5be844f897845e7781985fb961279153f5000000901d10a151dd0b0aa3b5b8d6463174260fdcf462d9a53031d828c4a6e2268c05500373e6a19654b0196fad986d4a1a5fb508596b86081143487d11a8914c16c8a3be4b5ff912f227619cbcd5f0fa9bb3472d659391f8ab820070814fdf2008597dc2feb5a180ff856cd705506219e6ae8512684f4a8fbc073f5cd556bdc28b514a728ad6643d63d0b2a73132e333cda1c6000001bc00000090bf18211d1bf13578fd2bf01072f7331e7f1fac3e4082875ae7e7e7b3ff0b4b37164425b976bc4938a6cf59086ceaf55cfad4d17745bbd7667939b438ac95cbf03c6d7363567a153cd37df714ba7e304004128e90f1076177cf7021df6819fd1fa05e4fc477ef5448abbed7425d02d5cd2120ea74f76498b5771de72eaa6062c4739be7bdbcb945bf50f923295bb84110000000909e92a40e2d7c0803a9c1c2acd2fd309d5dc6a664ed8d8a19520fce1cb1c04a70e77b37e5ab8b86d510dc91d20c590f27e8695f14e3e6280fca591b91fad636e6e0017662a77908d614963b89692a5b2509a593a79f44e6195f385ecf367583615e5e57cb0e0a64e94eca0feb06ebfff40a570a8b8ada1ce1ec4ec1d41816ad5a0e0eb5f5ff60424a342b692e3e00003200000090a488ba549f733799ed5bb466cbaeee0cb5f92530d0fba69ed7d64857893c162834bff5636267fced644542d9ce29cd01c422a9bb136580b369a4b807323f3b3358438e5148fb094a70eecd217f515dd12a94a17a4220490b31e7de13113830cca9a36e7be60e304e53f94ea4a4345a7427cff8058fb4b484e0bc5f4c4593ff22c4329d33d5bf96d2bdf9a152dab4f2c1000001bc00000090b2df28904b5b72cfd178670ecc399d16dd3da01f4afe6d735a7ba5de51d5aa826355206ecde69e6dcbe87e4aff2629ecc23fe3c69166ea1171572fb172f2245e063b0e46dc59e49996cedd02283942ca192a166d30c3418197da6c907f2cf2bf423e066f0fd68c1018af6dfcea86c04e2217a1fb08251948cbdf4b26ad27a5a47fb634267f5f1d06715a41ad3031b31e0000009096c5ddba66f37c8e7761c5cf195c140c6edf6235facb9dd07674edd48b646119a11e05e3addaad9949704f7942d246391fd7743bcf17bcd5e6ef5afdbcc60b5ea13a3605d200be3922f68f84c879d56318a1306cdfa7aaa518661fe032ff2d043113e594bb512552705b20024f7b4f070071db291994809f527f91d79aa40b18046c265b12165cac3b5bde0214220683000000905bb6629675b1d01997f6f33a8bf669e30540b49d31e4895c3369cd810ce5645e5a3e585ddb29382ab9209dac3e68f954423c52cd148ed3969d7e7ab819063070a6dfa3c135a45a1d080f47c428bd69d50b6630d5d2bda9730c9fa5f32cf8c81c03b1be6b30b7de3669b050423c7e132925f6b0bbcb1d5bb0af2c29d8ae2574b196e6e8da740293747f5e20d6f51585fc000001bc000000900e9b1b8cf0d0175eaf2276c35dc87b99a330902503b3bf88a756b750f4eaea3609a401968cf175a77454836cbbc5525ca5ed14edb753b54524dce85926933d149322a31e37102aa8fc1ae44103757be91643d3161252446bf073978f1bdfe311bea78257d05fbba0b263c842474b9da812eded30907e614d95d53856099346a65bc21b56324f01dc9e3bcd98f6220f8b0000009039d7912fc0239dcf903b219c27cdf364c33cd37a30a94afbe18f2778cf2d0e3d892976206e2ebcc2e6d55673d978e65b76461e49ad281d58da534a83c2e3a4f99ffc1848da89a8d25f3fc43775ba84f00baecdc0fff6867148dcffbf9db34bbcd6c1365182d56429f775b70633023e761c2dab8f1069db54ee02ad670457b2d5363d0c7f1408f8b7241e9cd9637da5cb00000090bfcb048a04b754ed6499c538a5e7f5171a93009747e879c6107841670f8ba2effd3ee5a443701ab6ec7f7cca7f1b903e647b64c1d23283fc7ac21aa2e0248576e759e58a8092d866d9c6af7932761c6708b38158792e6eec7fe194f4867bbfaf9bce9e7b31736646bd6b75bfdf57caa21ed0cc1a5ed3cf23e49680957e6ccfe145bca1532019a9ba465af64f12b9b1c8000001bc000000902f2439e3ebb2b14781fad9616f31013916786861336cdf02d81ea1a2d0f82fed8e1a0352b7b5f76699e8a0429c874560b857915338d03c98eea3ce383e048a072b4b030fe128f64184d6b11747be25bb1822e95d9487ac8d32b34a772a4504b3e98dbcea2661ae9c4c7209647d10a4481aef78c9e5a2f06dba8b8f1fcd22868b3918ea74d2181d61798f10fc9391fe000000009038ca3a37a4f433486ca51033d317a37be014d1a960b33bb16b54c6418f2df1a55573ca9e052da45402f3b7bc1b1718073c581eaa6de90161f9de1359763046fa9eba5872f0559d3a40df31678b93605d102029a421b8e9c0cdf8b9aeb79a56694ef916396329000996a10af3551edb4a04887cea168a15ea8fcf8b9b3693d34f34744c6cda7ab63c2cf0f74f04a8660200000090d9f3ff5b9412956db9a6a98a8536aa08f13b2cfd675a0d1de26d311a31ee234d25daf3ac9332e20838e735225908efe42dd6391b8671380b73941fc6428e3ea61f24f9b56365ed89320e72c1a7c3dfeb05b0cace2b85c028619e40c413599155a9fd882caec77f4af38fb56e608ff88d02881fef1658f1a55f6dc1c0db724e6b3930ae928311c7da07db238923a7ab3d000001bc00000090e81f94ae53f3cefc91e9e1dd0daf188e8cd3c9ef1c6e78f9216ab5ed80c48b5546fc5e13048f64bbc159b0c621dcc73048f6dc215e09e00242fb5fc5c5adba821bfb38f7e48706be200ac8ed2e045cf608e7001683439e7575ebd3fbe2744886c97e980f3b76890c32221b8e15b4fe1204b5abb50c5c40526fc850e99deac16d0996bce31e412039eb4e5e41409c5eed000000902e07a04fe6a351dd0f4885901e4c964d58d4b90c041ca27768e0fb352ea7a92cef1ce4b7b78a4c3fd04c78df3741b9a393631b7f305b850d3b4684adede74540cc36ebf64be5be1a2b7aaf858a7abdad1cf71dd2625503f41b2aa6cd8bbb02ce8fc975f6073c56a7d5665d57dcf67f2612dfc622493b15fa2ae49735c9d77eed90b069ce10f26dc7a56be0e27b5dc72b00000090b63ec5dced5d374975f1268fb76ebe294fe413110af5861f3d874c4e2159d712b53d44d7bb594e5e06bb20805a0b83a718451784acf8fe7e2a488f77eb0e5fb232059daea041fbe8c260e772b1786a7120792b5d421cf88206fc781a212554ecb4dce9d3d0ce86ae6a0c3370242062cc0f71c72149897b6c3d023351104fc338f0730b8ed899ec4e9478495e50a79165000001bc000000902a45feef1f690573b1adab340aefcc3718aa5f5da6246496e3a27c0ec30cc19a4c296667a0bda271c960cee763d5c50a79cf2db8680f6fd6b153b557642f2561d92e1a983154177fc3dd576dfce6484c3060e2cff23d56b5400e981ab57bb10f086c8ac4c4b16be77f4a8df2b71e125e02949b090f32a9d2325cc0512c3a29fe917d6532287377c1c95c88ef0c992fac00000090a20f6fc346c15e7e890959858476a0f15f2b3fc318de61e12ba8c5c8aaebd6c1cf9702548b6b930b3a32d37ae19ba0274d11434aac08208618ccf457f457a8e986c5922cf5d9499167fb5bd2125387800f2f9a04f1d5310185d5cc420a9485852747a5c8966ef1fc2998a2363f6219812f0beb7e70c8b49f7fc10b88ddf8cd4e9ac9e6e0891b13e645116069560eef3500000090784818f1d8648c12d54a9c59fcd7be95532ab8af2845f6d3ffc9ad6784dfc7c34468905e2f2a58ff4979401d25309aa43ec338c3648e151cc091800ba72dd541e8e57566a59e0c44bb929591834b91202aea218ad2dde451ce9fc17969662765fae79213a63910b819cb298ae208a25301ddcce3170069482b8253e649daed00e6bf05c2dcb2b55b9410a51187a503ec000001bc0000009004690b61c90265eb3a91db5fbdfa7c7eee1f4b4f359b16e803f41e57a10ae17287feea5c17910a75d7408849bbf6480ced31bc122abfc20571586db97b1610ee5d0fcb287e6975b142cf38b0cef96d3c2e1abd49e8bb69f93f3b49930deb05635be1a971c3fcf56d072964531f803d540e97cd9e5ed3a4c6ac2699e8a0e898b67cf78733ca44d1be440818826562b8d90000009012624585c036d5a50bfeca21aa095b1a7912126044130f201e7a9a68af5ccbf48980797ebdbc0e25324ff6a4b30001836a9ac34087da23c0cf54d97ac2303ea36e4641a3085a017748a1b16a2c31ce8b23f4ea5eef22964dede68b25d97993af88af796df8f3ca9d08c237245bc386430114e431f45c18b7d6cd2679d4b0c39d4ea21a422f0d65698f826bfa12828d8300000090efd36a1245df2761f370ac183478511343d07cbf7c3e48c25bf0974f5bcca31957c2f9ba1ec709cb88d86ba8b73c5a7fb159e1fa87f200dfd7d177fe5fb644b230e9d16d2d9fe530b3195333abfca4241f8a1960a844bcc46abd9e916998086bb5b61dff2a49841f390b4124aec67ade1fcbd225e21183957ff1233fa7bc0ab65f5e6b923bae64a17d85d3780295900d00000e00000001bc00000090947684198f65397ba252f9dbc1f8af99c32aeb32284f3de49c547b0b3114f328502977ca818a2b4a264a487456ce29d0f1418a548e71ca58240a97ff5011de799d72cd0ec3a48f3a4ce6403399c37f330e55917691e8414f521d38f3ee63ba5c24e191e871b406a7a112ab11fd79623106d026049fc195d5f6d13db61db27ce7275f50c6db01e2f6e827950602a835760000009091249f549962d71734d4226ca3442ebd1be20ec7a8ebd8ac4127005879d6b5b692feca8335583a4ae0a6a9ca2ef890337f89de3b0d0d9cbabdea11713f3ee8f44843e8bf98a36c958158456ef9bec22314433d304114fccd775dd84f937283a904c9e34cbb00f1b045894ed2690a29f3094814b960bb88ccfd8fa201627dd9e6dbe1113b92f6ad611721075c318a94bb00000090d07c621e6271708621a319478d0795bef45f713b6de2c471196685c0594594a609db8d5db559a1649a8d1758fea1467283fb6c01daf08762858b48bf0615c1e116f73f8bfdee730c72c56af959018e2a02acb10d80458b041ed34e3022e2b3b398ca07a4650e3201f16b7a03e4ed316e2b8c100851e08a74e8a44bef8292271bb70a527e7493107c7f6137a1eace849d000001bc00000090cf7ad5c44a117719a906954ba9babc0edb51738770b4ee763b16786eaf24fb49faa32760f99342e1b5b5bf14985ce6fae0a7de2e3220f6f11fd89dd1191daeb109fe74b046ff913a6256e0368b26c15b0353414edeea5052ccc39ef500f69baee2a4d866ff0687d450a3dfebda4dd16a2488dad669abb84abcb8304e791a0123943c62be536dcd139543693e23b8f92900000090ca8eadddacf1b9634370e2f35e4041b50fdb7bc6509d633274e89c9f20e46cdc7839f39b7bdf1c86eaaad5adeaf2cf4fbce53e28622234e28b0a7c29d925009a5d95a3e552b90504d2cb2ce48599be7623d6957f71a06e48789c3405c17319c231e5d13059c74e2046cfcb01b195d15e15aa436d9b166a7ec1bdc4c5f80e3d9dc70580b20514c9630b65a71fa4c2b2c600000090ab0d42c3fce474d24597ee47c7f10a98c9f68bfebb211d2a352e84ab938d45bd69759f2a76690f029be1aa30730d0284941de3f796dccdfa1f0529c95e4b6679354dab63ab48ecc79a5e91b3d7d3f95d1e07799e9397ea5d2a6776fbeeaa4ff79c65c4b06810e20ecc2686de6c256bfb00531e2689364b7b81f7692432290d757e4caa95775d586da6d24d9f0fd460b1000001bc00000090d2a6f20ae66b3c42770388248911cc2b69569ec915e4ab4fe8a6c7e1d4aa0262bbe1367360a2c8d201e445d361f4311bfee4871f95b4ceeafac0bd20d229c523ebbe060cd13835e5904e0bb4cce865aa283dfe8dafa40181f02a5ca81541b4e170efb21a66ab761cd4943d42947657c927fe1d12ad7c2a5ddee85c8363d3edba175c87e2682bbdfffe993c9fcd2577eb00000090f14f756111656f5896f07909a24f208168a7175dfd7236ee3d50a11d6aaca5f4e02b0ea1348bd834db882a10dea0aa5bdcd78cad15d555f4f7ae29d79e188a9b0e82264b2018c2cdafa2787a29c4b12b2b7af03f94b35cd827d0745732ec211061a26c6b73eff0bc3e492c1910f4c4dc0295ab73daf1af831b407be133c243c12f7faeb13cc54c177cfee8e2ec1d9eaa00000090221009bdc1b35d2c1f8f98e9c88ed6272c09fe0a5050b71b11600da54e262c86892616e7117ae08df212206b1645442a179796d63c3babb16178a0c64a18daa1d09573cb0035bd68971b00de5d5570a000c90626fed9dfa6f56a30c8983abbc55f791cacc21a91eafd0d4d0f26553f8c253f58e1313862b32be1d830116757b4de42fc122e76367b8bca06b524d1a2d7000001bc000000909f812138b9e775dfd5969502abea67268af1cc21c9bbf14c24618f74e8bf66cbc3ffc22659bda2b6f286ebaf0ec4dcad2160910cf444b5ec4162d4e69a6fb8eec2331c41ad0b10177b2e8e4c2ac98a180a72bdca115a8f467ae53bc69b561f37f3415376076097b186e62c24e2977d630b40c1e975642f810d232937964ab2149babecd8c39b9faa9b946b14638a4918000000903fda1fa8f291baec2fba11067cdf4e363a1f0ae6d2e168fe8445b614ca3e8669ff1872d7d774e11fcac97f48cff4b199c047661b22af335c2027539859262c0feb865fea60aeb493c07bd72459caf3820e170c456d91f8fb70f1097807f76a1d3c3552dcea437dde4b4336d117de2fe6084425c996aecf3bece7742325e4ab116a23526edeb91451923b40769ce07b4700000090d49dfc5cecfbef724d97e87b5024a1057ff0b853835ee0931170970b6ef0afe3630fd198020f91a75de23bfe72621fcb1112e1e315d32cdee93656c96b0463240b988f392e210d8d1235dc76e652308420900759e115b20af866c93192f6bb025c35f9ce5f8e9d607a2918d70aa231b32c7211be4ecd9ebb31b223dba5eee9cffb2c14d002bf4e6c8cd2617c52f92209000001bc0000009052cd51b86e05a112185fcee59644c7868239beeadfecbcca4d334a1546904f4cfb3b16391cf17aa1fd543fca15681a8494500c1b341277b96bee5a43feddea9f5b5b968f46374dd616e74b96c20173410d3ffba84290c2230696ff06819e6cddd55a76a44a710c31ca5bd9e95a5f215314d88ec363fcce41e0556b5f5037cb9ba663626ddde3fba5ca49a18397d2861c00000090195a187ee83284094d52b6597b76a9de1950c68a4a20bc0e1a958b84f3dedd893db8d68af7abf948c04cc946fee7dfd3e98df98cd435c7c0616097c2ebd550f7c3e98a7341315f53468c3a4f7516ff8d23c160006fe19e7637c2258444e080e9c54753dfac170b7c991d734659748c4a09328f81b03ce897fbc6dd4bf283093f526a65e24cfcaf5532756a85e3f0980e0000009057f70fedc5778b142232a47726cd35c4623e7f440ee98e92d918491d17e1ef9ac8de9c6c9d2dfe5d0b38181b709172fae1e9970808ecf061d7a8dba520905d2f8dde99cfa9b6a527596aa783c7d21dd5282708cefb592cf2c17cae26eab29728101185f515f6033731b1e0c050b6b0cf0bfef40ce87ef4ee0412bee0503b16995cf7a5bb5c4100d6a502f80596c1f7ac000001bc00000090a87159ed5a28b9d2876ca81908a405c4d4ce69b04f5c585c787cca6e4e444c7389b1d8f9bee61c6cc5d40a65cb1c66235ef5bb36e274cd24b8b8be107759787935eeaebd7e4f7bf42e1d9e4d1b2cff8215e079b4c27c1bdff61b19ee1e7455df02e2b9d44e6d0113cab1018e8ffc2fd00079cf8c0af9a2d431f1ad14ad1d45a7dfef8080515f3506d0d7123fac6957a7000000903ede5c1517d46f450f68002c97d595f5a35fa49189a8346927926a4be396470ab70757159ac64fb5d215ce07384e3bd7af352c7d63b3bec10627f7072345d365bcd313cfe82b1f6b11088492bf9ff62d27b752571d6a5adbb01f290bb70a267ced42ac421070fea792f6963d2faa1f46112903aacd31f3c8239648fd9a308ab493ebcba7813ee3c1fd85b234bd293464000000904dba3f8d5253847e0410880b0e94de490bfd7b274fb8ff1a1d19da50ca4ac756885cee121f54bd05d4098b6139f0429bb44f8e9298125c7ec4936565ab5ee625503acd59ba4fb8384fecb1faa487ff332444b78ee8b1770ca6e7d8d4a5033c5a841e0bd137dfe66fea79921d8be63d3c17046aa6b02de3ea263e784a01331ab59390396006610ef6249ca469b3b256e5000001bc00000090a318178fd7c767175f9a386439bd1753d04b8cd05fc9ee599f2b3b8b6f4d49509e588d27ae0143272f13f60649625c2cf65e7c60b707f155a1f2d7adeb4523541aceaeda83869188a240ae6f96626bba134792fc15db82bd296c98781fa4187cc2235b9a81683c51719cc7089a62e249191486dffd24778d0d42b360f53320d1396a4535a21c67dabfb7ebab6829429600000090ceebb89ab853d54b103f12d65f145dca0b50e079974b3bffda72918d65ffbf2b6f56773816504aac7d18f645c7a810c2ab27755209342bd1a3d3c7bdb4a0a9f3bef70768fbfe0048f19599382100791a2d3ead79c839dca4469a8e1ab7efad9b49c9c921d5d06ec688c38290cfaf41212dfd1fa3f876165e9e2e4501fea39515129b1920d61deaff829d5c8fd632e40800000090dc880c0a8b4345e819c34e4d4cee8f9b655bbe54ab1fc7086dd2dcdbb92c0abe931df0b7259782b8ea3db0cfffa341a43fef48d99532e19947e67d7a99d1964f7dca4b077387ef4dda2556ecd948f5da2b420825296ac7e697f327e031c600826ef2085458e49c20e39d4abc647f5a642ccfcec29b3e8aeda89451df3bee503b9a4185b54516d68b8c393102242e7d82000001bc000000906c7c882a148444a9b4d95ccd067d18b3b7f3976ee606456437dd3503fcfd8e65a3a0b7149716d3178ebb574a3579a56337ae43b55cd8f89e7c1d1cfc076e28fe3628f2f91ccf6092de236aa93432029e00321c0b18fd00222b7218c0c6974321b5dfb7b9a37be815e77d0ea4559a2f60178cdb0a2cae0e4c6ad3b7eba520b09f74cfbc559826e3499f49918e6da231f90000009081ffb2cb3bbdcda534d9c100bf64d41c630244fb248f255da994c977ea3e7a2591398362d4f8a70860460d5d65ba17aa0e312e47a22f6d6e0e96667ba1ab2b02b898bcea8a5f991e25878b70392514950e237cd9ef6b504942ba6ee37e97de35b072e92afc0071f3362e4f6d7667330c1060da0b1b6d98e5c0873c1a0b8725d85017415cd2ffe4b018d77ee46eaad29300000090fde71d5101f8606e5bd8be1402cae1c9f6fb500d1f6eda8144878cb10f44c93171bb2e96ded3a1d1a6320349a6d5ca84677773742dc57459a772dbabbef35a96eab54f7ed1b4353bfb02ca53c68c1e3d144c6a1cf3e56a76c46213c589008be1dea90938d6e2e20f47f4cfc852ca294d0fea1bc5c52eba75821c70d98a6f6dab13de0624bff4f75974ec7d7f4860e3b100000e00000001bc00000090d9f207c2e4ab524fd2e7b51dca4f4fb421bbbdaa372793c766077aa8545d83bbb6fd42dc13cb1faa91900c92b683bb527414a8ee06ca3bab0ce9f935885198a88bc1ab065be3c41dc936685c6cc8fd6f102711ae2888d2391ceb7391d2773f1f22642b3b8bba7b356734ee0cd13a3d5a095bed4c7a18b005c895b25092a1281879a77e5876af1a56965934f1b01ea01100000090f6e66e9ab940c2d660abd12bf1ac581e825989598ec0617bad0c61fb54fd1a23546d7eb7e47c65389a32b86a7636532255b7567d19551b31451ab28c53665e122b88fbcc80ec0b06f26508ae1bbb82082b2690761b9151ded3f00c3534d4966bb79bd49c193757793604d75d837b3393023b9ad219829bff8798bd903a86bac85d4b6ffe1a4a7e68997248a4121df0ca00000090d4b4c16da25ec69b67ad5075f5f4caad48d49d2fe1dc9588f5809e4266176873d373ff68d6aafaa419693dc8a5f8347f25191b6b0e1aea68caed8331ed5f20d4cb46e7f35f714c7d8750ba404abd768e03f3f2394ed30368b968112e6ef4de0f98d860637b91067f9ea3a1ba95ae459b126db09c405009c60e1ef968e4d359d801d672b8450bcc13e5e58130412995cb000001bc00000090996af5176d961e74e0317c4d426c39f03f1155e8a4ea71df264f7e2765cff15853370c2d324c5cda0ed4fec33210036ef8c6afc30d98bc2fd62a4b42c20babccf769231bd8014508a1417d05bb1110fa21e542a26c0c88d844b9dd00f65989f74c02230087c7941dfd80e33aeb099d522b144046133c21ae3abd46b750220083a524cc0b83791c496beea3433564241700000090bc0474d57f12eb0063ef2c63b1d9e2c29b1927305b109cdda2e344633db5ac45d6642a9f9cb07bd4ea10c7864b9063e886cfda45f4951a8716bdc3d9287d3e524ea82281d2e1463a473d3bbc9a22810617003f5fc24cd8c7b3fb385dccae36562c8495e1daee1241ba6795e6ac98658d23c5fc5aadb784c29bf11e6e3d16801ec2f73bdc6c3e502de4fd1d51243a03990000009013675fab13dacd1fd805c4666d09775c253a761a9279d9d7831289bd7ffefd5ff6f1d6717efe15829aa86cf17451755f48ae5f68bc5f04800d65348993d20e2af9a173b4d67836f70b8f99e9072669b608373b2fd442a610ed78abe40f31b2e835984fe9bc1229293f202f0571a8d9831d43f087d6bfab4471697a8fd1a7df7dfd7beff70b02d5eb70f6f447fc5f0a49000001bc000000903956dcadee164f892e2ce17f5c3350cae9856d708aa761bc58732afab746b49f220021fc0c58a0a4ba9e8d9969b084b9082bb1c8fe2e65fd36620145e208cdbe7a8e1ef4409c40a810934f8508744eef2f838d08c309b3f07a8af4401388000b6e69ea45b326abb2573202de67e5cf4c064e4b9ca1a8514e0dffc98b69c493a195b918f70f79461f692eb8831a6dfb900000009070d9aefb3da2dfe00a7d2af651e2acb69df180cf66eed166bed5d1faf3e3b656517e22142737d2ac36e9ab812f04df082873328d44b77390f183f326f0cc8d2b3b15c6e4f2c29ecff7ca4a43b155e48828e284e51f6521becfa95f55252575b19111b30ab145fb1c7a6502bc59e829c706782348094f0c0c7b163839133d319f784e2d3303aeaed7ddd331faf711f951000000909743d75d6ec72d4297dd828d0f52dfe07f0091facbce0228271033dde57511a839a22ae30cd7c4f6609a2de0e871a581b2e528b0a90db8ff871af2475b8985d3a04afd894c356187f386219610b7fb180670a3a20f5b04af6c5a765462a6844cbbf7d0c72eb5da66321f3311fa95d99d045f2bbed604cf948545266c1f296b4bddfa1d487c780c58d8e71953e645cfc9000001bc000000901eea6f04d80babe64b4795ad61a35c08d32f67378d2380b7bfa04f46d06e6208c1f28d2303ea2c4e8171f3bc2d2c1a9910508baddf162dd9af42c8f7604f886fb7317b025f273ad78773b639af1958180989fefa2599b70c68a028ef4e31ea067b38444a98cc276aa404dc52fffb57712670d1f19e7b7a0238caf85ece99752ef1b36898775eec4bdab128fa10181266000000904e0b81d40cfe9d1b4c3315dc46394adb1a409d447202e106f372d091d481425800026683cc05cd01a4ec5152c44965954bb81cb66463fc61018c549226fcef6d5ba402fa203aa353a965ff9e2feadb7125b0a6d0f5f17552ba90bae6be27efa386db8d807bb07eb388bd1a981f4c9f392f030f279d5e557c7d6051ac0bbfe1868e91541eac030abdc009967c3a6724050000009013041cded588c50538a529d282842e54ae057463f35f2b4844e5dc77761c1920ca5a41ba99b836a664f5214e7fbb4b9f4f06a794dd726f133edffd80623de4077acfa0887865d9cc6d89a1e79bd22e500b4b39c12bd5127dbe36d7153da668274613a31e8ab0683947fc67dffd8e720002e46517bac2a598f2712fb8f529bf6eea93c4772660bef673845e7e756339ce000001bc000000907d2b78935e99681c27d68d2d196425afc040eae419fb3efff2498070d1376a24708f657d887e88e493243bc1012016866572433d3525ab42ed3c69d51336bc1b62ba508a0fabeead6a0fdcd6615d1b011aeb54bf48d725c6c938abc9340863821f656fed760468c8b24b87ce84f908211507b8b4f819af0e73a81d9e3f8ab9ef52394fb3f2a84ecb50004356347ea40f0000009040c20a9d2ae8cc24816017c41a22d9da9c2135d2c3a5b71c82383a8d7f61ba080a6d666d12d5cfe8032a6acd35835a1f03bada40df38cb0419ae80bf2ee0c9efa4b02863f10e37e9c441a359d29dc3130297260327f43b962afb5b6406dd3456b260a5b1b58ee80b9381b17050b63e042a86d67555af1bb334a8d2a6f825a17039e93e8d620afabd5ce9e0aa6412da1d00000090063df44adda8384565dfa07941d978435cf1ad2072ec9b9d79fe5b39a947b7ad68ea617daf9471dd0d1d225d7a544b69c9b38cb894d2a6976ce42bedcc8d3c82c3d177922139ee8103dd4113cfc40018043ee6a9b3d18e56a679f4070799a3cd94fc90063be7efbd85f7fa76e1b5bca92125f9f881b6626b43cdf2bd607a43ad57e83149979332407a32c9bf27f81cfe000001bc00000090f89605945dde7a518c2aab34b78f0831a346c0ddc0bb9734b4437b2ec319093f3bb754fbdce71e62b9f0cdfaa5e1589dee6ff2e9e124f8b4bdd39765dd4a1a4480ea4a792f4665c858c5d9624ded3ccb25eccf8fb852d32a08b9e1e5050bfca43e25bdb2129b1047df887b35ff08d64b165fc2ecf4c27d7825ea8df02f0bf9283ba66366a61de12245bc49116aef6b9600000090068f8311a118ca829a61ce3b443cd79567b12c93cb950c9222f039b112242dc3410f9cddbb555faa0ba3ec6f534690b824a5af190ffbe772162152a7cef290bc6e198ef04d40d6fc6962f3bbe5ff8cfd1bd6447d7ac68ebaadff48ce3296b68fb5c0ace2b42e8649d900ef4bdab307a30b00850ecde2e9ca4e903e32adf86c723393f658e5f45f5dc4d5f703720abd5e000000900d493c43f1f52ab642a486391dc8c7fe4d182e21519865e5cdbd0923bbfba771cb7e271e516167f0918e279b860073fa0c1eb283767d4e159591db2f23bf49d67f93534adac491be319ba9d480eabf0107e9d63c30be1c587c2419b4f3a1f941660b0893528246ba701a6a657daa4837272aa3f90a36648b1c756f19beb3e681b75310fb5e5d8abaa5739dc87d8b8a13000001bc0000009001ffb46e21b01f52ebdbdafc158f4361ef390c0da5615e39dbd15ced8be78d182733e22100b6b14d244a05a332645c7a53f67c814bfc1d8bb246e4f3030ea00d282590fd36a5e104bf2095907cb84cf2157eecc218512df1cabfef1d42218ef2f9ebdcf2ffb79029d050bbcc0103a6b607d7407b4b1902d34e0e53113b4d0c6d360b9231a1f3676ae6ecf09d2c2362e50000009024e6af36bbd2e462b9555cf380fc687a902fcb6d9ff57ee70f3b588132193cf8632b0b6c74b83d14528ebc550c2cd35b19e6ce58bf9993a499fff20d5c7f74e6f340eac36d50d100fb2b9218ba5627b72fb1579edeae78cf2f7c216dbd4358c08cd1a0a295e971c35d798e12c194a05a0f88e844ec1bc1b9452396b91cee2df848bcae4e0b36fbe51725c7b1ebd386e800000090476b0c2836ba8ad84b96a276a398824d54c077b7fbb306013b4f295eb903e467caf963c475ced241d1c32da91d0c0d583896d5e09f46be5959b84deb56a40271e19792b469a402559b816e3ff005dc8b1b57e5db0fb7828f0b17fa47ca36bf2232ec8bece5d8793c7fb0f4e13afc66ad2eded52dece2313bc725d4645105380e4af3309ecd66fef12a76bf674553190d000001bc00000090019a48c420d89ee53949b8e920fb200e169e70536b51adb238dc6f0e2f855073c070690a87908f41d85bf5f2967759fd4fd6a047788274fb75d2dc4484d207ecd19f30819ad59a851be85e5f48cdfa21071f7e89ec63f62dd9e814a8e75b069979e4a8c8f28c26a8e20b95c2008a8c482a565dc01359dfa71490371251c73efe5f2f99c088daaa10066222a71c4d42ef00000090a88a455036b68ab135640510b8e39395977e1ce20588bb0cc84037673b254e35e4792c9c8610337a9486878c6de8bb3528b218d34ea04ab333528e98dcf7f9360f50a1ce0ed54f9f86ade5f2037d7ee12d996dba01634e24558444b31a5ac15c6ea414016b37eb469c40322bb1c7334a087821b940a9de22ffb729f513bc66c20220ea52d8c0be1f5be1c08008dfe7e6000000904308c6b8eb3cc92e54434416aa52413594869ed558f1e02efca0e0ec84a48f04985e3e1d92b88252a680da4e857e4328be9350d3c874c451f5d1e5cf181f9f31bcb1f81656b9591cb07d4f3dbb0d22ea095066a9f9d506cc030ea7cf13c43c3d615d6abbef1708501532e4ee54d3e6d01ef61a694f3c83eb9701ada874b1b43bab8647d05284e030acf7dda064d5c14a000033a000000ce4000001280000009058a11dbbaa33dc29ada68385fb562e19c0248be7a5018a1b7913fe9301989e23e6d3d6159da6a7cfd14d379230c553f4a5fcbacafbc829ac0476e63aed34a81e3d5df51d2a443ce47f18002d149136690c5c1d7b2e5ba79717fc2c3e88f11397d1b5204ee11a5ae3ac773539e81f11a80a57e67bdf5c61472bfdd0d19f46e6a8d5b4bd09fd82938be8d3c67e5f8419b90000009061c505cc43b343b64c6ae23d2d3a7f178f86fa4de2616658fd7444b7ad6d36ca7529cada529342f81ca222781671e52f6da1177d40ad92eb10c1e151e2e70b0942113e8f9f1d80050e9f5968e7098f2d26c8bc433ce063dd5fe37502aaae904a361878356c3dba2440ec803d7efe09d72b3030657aa269d9b0a2fd32f98515cea47fb936be2dcfb05330fd28c27eabef0000012800000090aab3fd20f1c2b74c0a98e44ec5b6d5871a39d7bde3be7c9e305a1b78b5b69e34e96ad2e54bea7bb7b4f1d1fd330b98f057e3e051bac002b6e049d665b7ac853e44b6e85d3c47edeb7ab8e0694b414d572bd4f6798af4632bca1763303a0adbdcb67e80025861638b989bf69b3cdba19704d8b2640c678e6d77f322609349d859e1d079f9592f82d7366bfc8fa1e3d09d0000009051172e8e627c51843f09fbeb88d348b86f71074cb76bae310e8ae139e94693ec0b768827676738a93145102913069cb19fce5739f39cc708f054297a4a11e392f08278baee64ccc7e7ff0ee2767ab3e9010fd066e5e2f91cacb7242a93e0d0cd216f47e0aa346caadbc266d5f5a3e1f909778820fa4fcdd4afe02c26fc232b1b65bc33e8b6ba41012be34e65dc9bc1c50000012800000090dd000b6fc17ef00318e1d655346368f29e0f3f017da41b43666f6e3802396ea1258a57f78f0fd4dea34b23950c0b5330b80109242d9202f0c9ac050fd8a8b481e8edbf4a450dbfd9676cda4323eb146f0a5ac92f52bf8bcc5a0d6f70ec69af45c4fdca41d5591e751f6576c5dd6769930b9b31c156cb0136cc17ad3bf71cb45f1e0c4fcf2deb699303c1b63f330efdc200000090a1c653fc27ccdab5f3a45dfd0b36f5e6015f6c33d709d1bdbf443e656bbd8d359f90d6631eb6ce489d6c25cd8696259add18e66e255c6af271fb4a4eef70a7bd0f1a2ba52dd0c8a818abb615ba1ad868047a84dc3537a251faf4435c25cffe516de034cc5f8300654ddbcf2fb5c688991e988f9a2dda3167b3af648a94690998d49d3f616c337cbc64b5efd9615b44fb000001280000009015839b2123bdc678bad7544bba6605575db0b4f73bd769765ab09ba984346acdbdd66e1e99faa7f104cf9913257398a18bd539f603331e3e4dc10496588a2754e30c56a9baa525429e9d171f2477dbfd08e003a672a180bc75a44bcc92e41bfd9f0165769d969c641ad670cf0b92959708f4365b90cf35ef1039e27a6df2e8c40965e77393d71c5b98c3c54f4cf7c109000000900683e98ef9cd8964ec56a6ed2682b8e94a85f0304cce4072ed7a00a6983c056039ce8f68de1f51e7daf63948cc4b633798ea0cacf136f0b2f56beac7938e3b2dd58c98caa99d99f7f5252b50209aa5e806bb3faede475cf356767c3dfea7fd3c931067b6a0232e864d194371d9582c7009127ac2a0db5a8a0e66ad47a0cdd8006623f63740877f3481139ba407f47c200000012800000090c7d794b31669d4c78c5d77312e2785573675e7b6bab6a54853d89a9d1e08af640c405a361288910a105df8f8c8a8a4afc1cb34237a43c761f05d63af042d9cedac42ce82d683ace0b573e5088f67948a03082cd6b4a4ba24469e8a8932db27390f3c34691288a561e305240a1d71db922bce51b4cb6b3e574317c31c0d465c10a4236a2de41776bf2ca2c28e8c5e4ce7000000906083258d6acc362cb3461027e3300318c10bbf85acc9f3488e8209376f9d0d65c6f07e4a65d1850b76e3f9326d6a87b9ca8902deedf3a66646778d7dd8b0a67ca55aaa1f0ffe24a4f54c415ff1ec9ce62a7c4ff1514a7ea00bf463ec7d54ec35227c15dc583badb708ed54fe42e2155202b3534c0679ee1e923658d3f7995f4a17feac263b60690bcc5d2a2d78f8b1500000012800000090814726dd7bb5c4b5c44f1217c622441ea0ea38db88ef24d7b031c4b207ca5bbb41d1520c63e4f2c34a6f317a32c5ff1585c3b5454fbafb074b13583c90e3f864e668acfdd4fb66df11d6a71e940d41861e5626cd5f7ab0feec7e6cb4887cbc40043efb49b3e15ebd7d5a7a612960e6bb0f01c6e536c9148595d9a52d0d5ec59f2d17920d31d98808e0c1d4bfb7d8cded000000904e81077dd43d002a7e940609558b0e6f63f491162b0612d799c48dad8139f3f06e596dbe2211ba8d3623348a5288fd719e87e37261a8a4c46ccb50483e7fafedcb6f823fff16850e6689488975b49ea91a7742d6c3966ad8956755114b54dbcb8d1cc01534c20611b2b1606ac0892e252050a63ce91a7ab7f6da691306f7599819a877c8a5dcd214127bfba43750ca4d000001280000009043d8e87f88881efbdf9fe3d6d981a79321c69201d1a001f9227724d2385f94402fc30f40d6bb5f5abaccf737e096bec2aa8d808a991c3457529968e6c2d686a2314a187ceb581cc75b57b53e66c8c6843040c55f61701fada588be2f69340cf3443772c2b81327d61849e4f59830898f2ee53f7c840277a979de5db5df84ae770836b68606eeb89114c3b88ff56922ba000000906f8ea16cc4c640c6b5b86f7c2754cefd623cd7789bcbad86951053e0b2bc355a4a79ac7ea269aefc8044a72022a3904be1a842feee01570f0a0be83ac9b81f04a7471051b7a20a197ad893e3f5eec0cc2adca5d6f09e10809238c3de4363c2af7c8c0f54b30f085d04626af86ccaf2bc2d751f44645e44cacdf9eb4305354aadedd930f69a6557d6a2a60d347e37f1b20000012800000090b848f0e992cff482ca897f00e436b6bccc99e4c7ed3e0875c737ce9aaf7bcd96699ecc648ec9fcd724fea3de7943e5653a34cadef91645ee312e75a116d742a1d85de2d7738759acdba78c58650a3b1c094d522339cbc97d4d01620f8c9b5c8e6650072657643becd21e6232ccc23ac617b0ebcdce3425019be128107fa1ba7ce245c0c2f8507f8394c36d365044b6a8000000903f57984eecc6c4bb21f3c97e7d6398215743f197c2c0e5a79fd044f349a0f955a18b7274ba74625c7b5472a02c2c1f0f64d5aeb1b5fed2f64db05f04c0b35fc228160ea7f1d19b7a00365d5af17c2c270287411d24dbe078e4b21dc38be0cb9a8f6465ea8e5b200bbb3bdfa71bce73981d05895cf5b95c3f932df37d8edb80e4c69a49def556bc977f968ec3eae505ee0000012800000090550d964357f7687a3b6d9126f765b4ea42887294396a2741fd0c759ce74376c33d54f5e4f221f0bd939d3281edabe62df3afd9fd8b4ecff170126b26c35a505b4f5915e0bdc91a138dcece72d6667afc2250a85061d63741d069a5f3f91b5608a2385b1e8c6248761b83c5bb65e4229e000e324222e3e295e8305f19bb9d462bcb3a216c8c61de6110f0b1460abcf68500000090d49a1c992f5162de4a3ee22df00939240ee88891919c65994bec0c949de8142c24269151e4ff4eef30b0a287c8a3f5a74e4d7abb215f442c2b21bc223b37830ba243b155663e5b15a39cff7dd3bd025017e80b3fac8e23f64cf2fa43a33a8bdeaed4680c346d79bd2ff1e57df284a09d049003c94c6d25743ed0d5c4fd89a0052f71db7d4d78232f2b8cb92e3234900b00000128000000905be3d7ffc8c42048601533ac19ac6c8efc11c857eac4f58b4b87dce507507e317c4bb5c2c3f1220f8922ac42ebfc321ed7dc23980abffb3c8389aa43e97525b4f559fa4e125120b8cb7679965ecea3dd113303b002d5cb07ec622e8fa17e4fa66f9f8e6b18c24189913715c30e17f06115246c45f34962c0c71310bbbb90f10b08e061746dc165cb8ab5536a0e9b4b6100000090ea8bb348900aaab0c7f4b6cb5afc2b2e6564e55ec4a12465de7aaf174d19f9daadefc949bb6a61634f0c14c804255861e505c8592e96a3790a016081ce3f92c434ad76883f68a1198eb83f93beda89741e85a95cac80c9db098828b23727635780285d94da0caf2e27f37edd1db7fda00f82b9577108c38230e8ce249e51f6898f5324f8ae3a708a464a68658eed3fea0000012800000090d69d3884d9fa8db5d9a0aafdd14096fa5f5e07f0fc2f471eb7ceb7e63c843450b314280aa0b6f3f1bb394aa5253ff8f9e61dd0604ddc6dbccbb9b232b83ea6a921c60ee49a5461d9dbe51efacd0437fd1b6f66bc78f6c35e513bd1dc3250759f138ff632e86034ebe805b5e40cf97afd208ebf9aaa5b079ad436957ff87faf48effd6f806ad31992fd597607e549f95400000090077660556e07674cac5a4eef3bba09ac0121d6aa597c2bfaee86d5c1939f02e9a08ae03d6b3833d03246d9a60965316c6b7350c5025ac2ddde4b5f8a3909894868fceb23008fc3c6bb9607e22e3ccd93137f2d16027be26d718852a0fe5da7875d0aa4e1461c25b29167ba4fa8cdd8fc29fab5f6e55c0e67321b9ca5fa5cab0c4f915046a3a29c1b8d3d943a2a54493000000ce400000128000000901f717e16576c5c10bd8a10c564904c84b046fdca1cb8c83da1be094a9434f747ab51918108f291b53d01c7e48c6c50eda1057710ffaa765a18dfa1d3823575f1c4d21238d44a11f6e112394c7d3e8cfe139c215a641c10ac6ab6c4fef72b5905e62c334e733cfea1d33d2de4fdb79c110b9306b1497909d2f89047de58cf661f86bff436b80ce3e9036cb5593358587c00000090c61c80377b209c6da5a831b2c525a59a14a13cf6cd6e50341fb5f2c21a70da9162847b9f6502d7a51d345ce3098d47f6462273f834ed8a3d19996e1b0c436185e5b4815e43a784eae77bd52cc413fa5d0725d5ca61384ae1abb0462d86e1d71f4f929ac8985c83ca42b0c7350b569d70081e486464fb1503638a53bece15315d1e4132d647ea6cf7f140fb0a2c02dd340000012800000090c860d8efce5b43084983049738c12c4781991242f0e564fbb21d010bc036fd088ea2ba31b627d30279553c74c1c93e84e9abe6fa76c126353bc608ff2b66d76cd376891b6813191ad758ce5f1d5d706d1bc21253d7bc9037b6aba329c82182d5c2046bb20f69c483dd1425ab7386ffd72b1ca2d72a4d8ff1b1e1357d5a00f62023bf7dac6782d3563e5005bd375484280000009020766effa4d23acb703176dc21bd6d2bbda2418176cdf4d14998c6fa6085fbe58a4f7663892dc8863a45cd364ff06413185b383ccc8d4b8e5ab4e0186cc125e420de3fba775a2e7ce19a8fc581949522046c5371b418f9c60180329e473d4f1bebea901360501c27b58c010bfb47fc5a04e855250450a084c00e39b848fce60eb149869d44f5139c86ec19643e503f7f000001280000009068003d2e207fe1f4f0e2903c7f12a889cd97360cea337b73dcefdb3de788919e6975714dfaae6b68977271313cca2bcbecc7b036cf479b846fd7e3a528b8b90aac856589fbead14d91f63b8754c27df11d33331e2930c3a7cbc1bb32e6a349b853fd9d484c27f9d8dd02e390bb4ce2a20bcbabd186e62e3737fe3c9a51011a3a5920b47ed0fa7a563dffffb65dffd77000000090f609f0c7359598df6953914fe57a31e020154b26b4aa28204896e3528a95120740b072bee852be432f772d671bf9f92515192aee0dfc5a5856321c21233c8d7002a03833146cba22d0a4190a08d1a47208fb071c276dafa999649d42b307cf5d86771e8490e452bbefb1baefb573d3762c742280580d7376e9f4ea1d1486bd0c541e3fd46c0b1ee0d09888557bf6d6b00000012800000090e5136e1c5018bdeaebc8a84386131425b551ed9376acde8199f5c48ecc2cef6852185999d2485763ac1b1f53967a90c700bb9aee823b4c656b595edfffbbe1d6d353b587f3054b59a0c3dd5372eb3e370acda847a9d561e15226a15dc9d0f9a5255426e4228b79daf88d5e0e2548760623073a3a3e5177ae05f1197981f452c6190759a1bb1418adf90b13003b95b8210000009031fdb894dad83f81f86c6a179c564c34e8ecfd8b22afc9514c129b9dd58e0c0a9d758063fe7225cdf04075a8323cf1551ab0c2d5304703b053e150e5924eb9679f1279b3b5144a6d9273cd879023ca6806442973f54405ed8cbcf285c3978b5e6510d3cc3c3a08efe916086c23be14c116e0a7a779e86bb9b5f4669e3167ba095bc41b7402ba61931555be1506a892b600000128000000900ef862406629a92c15574c89727bbb7ac1cf45d987b905923dd49a9523cda2f6af918410c959402239a323d54ad02c049dc3ebbcaf8b75a7a6f56946a5bdb39c2762855a72a91df2f9ff850549940cf81333d8e138c20de0899285dc5051a3935384a2190ba786082974296f78b662c114b4f6915fd5a5617de5f05f922bfeb56ba57eedf2d97ec6241f0289dae7df0c0000009090484c79b1e0b61a92ec61ce4ef2c51f480b28b7e2aa87d1b2c1391fd8bd4a4b8aa64f562dc6d35882348fb1e10d76fee3cbf2b4cb1c4480f95a617e7b6347223aea6b44eb532a69e880d288eab281c914debf1a6d0dca7fc5393bae0e930d5425ec17d97b030c3d67fdb23f68ed602f15e95682c5a1eb2088dc7e82a8ddbb589175af124909e9a2d0d4b0769b9c881d0000012800000090d3284c9c659d8b0707267e8b10bd9789f2556c96260eb05798809991c94ab291e727e73ca8f4477b830202315f99233b99c68951eeeaa94899c60f9c6dac4b3f52f436d80945839b3ef755216a37b7aa156c509162c1f88541f78e4e56805ef8a29d564423b719ae3a0a50307ae7f1cb2aef790844732fd1936c27b0f541114364b54dcb737faa15a175652950032c5a0000009017f42abe31639bdc24dc7d9f212ca97c6443784871925f35b8f4a6fa43d4989898fd33ba5275c61e4a2d5bc55cdc335f96e4070bcb8ee5b4107b72886a3932ea89ee9e94d556566e0b0af98388ebfb380e029ebf47e9a00680b51363b3e3a864e1674fcab446cf3d1d01b628f9546b890618779bcdf57db5b499e46b6c00ef69ea56efdebf94e34d594407387111556f0000012800000090b132e62183ded1c670bc4bd895899cd38f06bad9b8bdd4cfd672e20c12c8afc5839ac380c6fb6e68fd0dfdf19cde8d342ca01b34d947b83c652ad8c69a70786fa828c9e9cf21006d30c0de6c72ac6dda0eaf6f4f39fdf3029652ed4eeefb4d8ce2bdb445bef9a446d0c39b88a124bcaa2f03b5fbbee509abacf7cb4b7422575e3682ca5634e496432abd48f5d19c512c000000907c87d96d0d9394843d242f5cc6c163c061fda2dae63e3f659ec53a6216fcfc27767fc426053b1267a6faf53ca8d95cc2efa72eed3f33e215cd499a5c2e75fd5e6931349ae1fc12300ce47e8cf1ab8e9a0629c6a0147758df2b1205878553869afa05c2236f039d0b8a97c0010bfb8827210fd1d69d077d5766a4f7744d48c05a6c70ea1cb5bc73df0701fb54f5e06dd30000012800000090e47e5d22930f7723ca2ed676f15853713f5305623ff0b379bdb579995e997c8cb75cc6d38b20265238ae77728f50ae219e3ea94e91d61cc8ce975cb2401ccf2651ae0d90b7469dc7cd4728befd0a6e860c629dc959061804615987f4fc99c2cd054f02fdb523bb61d90b20d4d551b9561f1ffaa28c3670545c1cb04b86d800066127c64abad06333b7f2910c6150988700000090bcee3f930412919544bcb8eea41b6d5cbc811e0f859575723836ab710f3dfa7dc2336b8c587f63cf549c7199e1274e83e4342bb679a4a310c2d8eee33807f49d1e1d9b71686e031dab782ed97714d981149d1abeb4cb01b550ddf6230d282aa12dde65a87a4db8c851158d88c961418411ed1479306291de7392a48fb0993e96564c9279aedfac6d7b0cfa4ae8c8d0c90000012800000090cc95253f57e1e449d799d9ae88f705d44fe26e4b5bebd668c618424ba0ea1768d44dc1a7b3cd7990561e78e69f056b8e19264ea97f446a7d4fb009616a5b255ecd6d191fda872fd8b9f674f442d890c92448f12b249e081cebdde579134dc7a48874aa64dffed480906145a7c1113cf3189daa1781874bee162ec5f16ee312bf976cab53d24c04016f4dac5b4480f9bc000000904776d02d6cee37a71ec4453e2952e311d9bf36f0348edd0d5b4a3730400525aee6ee5e68029348e088e7c175ecd3bbd673b6a812a7b696c6971d62beb98077b63a32e244fe8c3751bcb8d659c935b75229c50e1735b182fde7ebcc6c9fe25471c50f2f3f95842a6d37dda83bf61c766112c570fe6cc0680ad71d79bd43e90d22e9b1619077c717fb591a9754692996100000012800000090a26e57830438298dd3838384705cf18b35e3a15039693890c52c431e51448366de6cf815d9d04165e37eb33cdfc4273ef58c12398cdd2ce7b9908b2658413862300518f285306a63ab1e9d27442106b320cccdec81c096e7810ee198bc79085f9e92167998213d3217735b229da0034b15d50665a1f0f1928674ccaa57aad3e56aacfd7bbc6e8903f8d2fc56e58df8580000009091aaf6da56e346e06bc185ae1b4707ab118e17c44e837dc7898902e3513b75e47f08a4bbff9c4946fcdf9d9695958740f705c0dcf714dc386d694052e491009611ba3654c18c650bde72c4b0e9588aaa1ee848824c4047be7d47f194fb3ee26e9effc349936f6de348155eabf208f10822bab739e4ed52d9ecf749c133a17cf892b6ea460ab9d1c2d141353553ca7b420000012800000090542778661ad1536265596e9b9acb62c924daa7d39bc9708f161cc30a193d1c26e48de678cd62b96a7adba0eaff03892c3c769a5d3afbe98504326b0218355bce4d8097f73a443c30f674ea9d16b96e7826908b96d258a3db1ca1d7d3e1014acd9233deae60afe89e7d34ccc4be8a23ff1b6cadf34bd65a361fc9ea082dd9ee0fd3fc3295d7250cd31260362ef41b9bea00000090b71c893fc2dfd27bb72055bf2b5da1f092a8b28c7cef6d5c0daa9a535e038fcc9ec51b6c6e7f4b5aa65a8813d75fc186d99b6d2714cec0fd39b4dfe8d9063d314b39950a7fadcd993df3cf226955274216a0aa1a50d95862ace4750bacfdcf95d8a1b11fe38bcce3d27a8419643e3ffa278f5c4ae4597fe9ed6214c05b6559913b06b19737467b977d9c04e6354fde9d00000ce40000012800000090df814d37251e81d9529dbb210309f4a0b4fe9917300bc980db42af0eebd1b708f3911ce74a3b2cd0fcf258894d04382c48d47268ce668a558f54459347c0a0c1bf0359727d927f928010952c0d611cca1cdd23b76143e5305a250be2f3f54929a3a18759ff59046597a6c9d877076fe10aeb57b23c9c454b9bc26ad78796618fb619bc361f38aefc899eea4a187cce6e00000090a8a060ef4b5f61dd86ebc67dec1726c3096d06d6879a2474e055de985cdb00ed0c0af11506162f21d39199bcd886bc17a23df10142d4575c7820d889de0ef15580ad003192010d261c38646a1344368f2a9dff1ae5b23072b70871cd2b7588fd65bd8bd44ed7719eec4e088334e5986021484946bd90786fd4fc39dc52fa86ed7886d001d3ee64206f0c5de7e517dd560000012800000090093af15fdd24dc60a17c63743a008945caf76d4fecfb8b973db7864fa2d23bb18a75df0d7d0c27bb3e8241363f4c2b252264173e1c6478617f1513528342001d4cdc6bafb17ab9799d0aef54910fbf3f07dc8e8f7fbb24b2422fbdf5dcff71a3104d34ab492e30ae6e229fbe3b2a18f510e28ce2d665f568c14f67b707526eb6c5423057221c87e57364d4f929d92a3800000090ea6bcb48020f5d194f522ec07220f2859e160a4def93c50d9b2e3838d744402cc902a12fb836458aa3724d521fbdab0f7ce5f2cad792baa06d37d9b880a3c3a6f39b760c0e6386b2ece755b0b70709af2e6fd20503219361878ca733d0846970bc36fd66c2d65a115d05c9be0f1895a5068551f353629807bb187b328dcb93610d1676470ff6692f37aa2c7a1aa78277000001280000009045fd3ab0ac586a55781d3ad84b47bdd448d4312c21b58756bd6e866d6a3aa459c8c08b3751a69d4ed7dad3494b61cfd4c40af77d69d0f4b74480b1674d47b5c052b0c823d8c6e270dc548de8994cba06135c22ec535e8fd699da3dbb013c8104c07b036013b9733ec7999a99908fb6af14c649a5f2fdef651151524f247f4cc868ff54c895683c6c06af0ecc5352f0cd000000900221be3ec7a77ac0c02a89f5f6afc7ce0d400af4c7f3c9e8f333db0f814453bfbc72cdbcb802cc6dd87b7d2402a70f0750355f7dc44bb5638a71b8484bebc29d26855821bf0bd5752717205f44b6083220e091cd96d0aae102d13623770b3694efcada6486d31e271be9f6ed184dc138007521e86396c8167bf1e0769292d6eb44205a4e7b8d7b14882975f8c852b8ac0000012800000090f621215cbf07f263742ddf8bcf10c81af2a3ba85c2b830458573aa064b63146cc865e2bfa6ece775548f16918f922ed4267fa6c5875fccc25077f561f75b6da876e4dbfbd32a4b10af407180a73c1d04081ca4c9efdd437e2db28e2d4611bcbac333710462cbea53c2481b75bb04e95128499f0e8799df086708db8234819064cf51c67888896ba7bc0d0e89f763439400000090293e6dbdfc2c738098231b4f1c8f0d739be756ad24dfc1bab7245ce3cab2cee0293f34adfc6b2b8545cc225caaf19ed3298dc00bedae7dc5de5516804661b960984916f9b978e6700b002dcb201ccf471e22f3ff617c4874ef51397c30dde547818a89b211f9dbdf3dfd8fd0d8d3a21a09da1a1161f46869d65008c3a039637cfe18c39a19df1374483b42b6cf9767b80000012800000090985d646180b524e4b49ad555323bedfc082613c7d6979162b43fc3c7719c15c801685bcebc7e855b18aaa215f014fb290812dbe0c720ce24fdbd0f4b4953c8a9bc8bf4c2f9ca4bcf73afdbb7430fe659282277f19c72e657c3dfeb0492e55caa22ab062f983eb417eb74fa6e518e6a30150854eb71d0a8aa344b1de99ed6afefdadcca0b97bc7c1c2a9d41997fe83530000000905d1e0305028278eef7df7c8df1d39a9945c64a925cdac4b7247a7724175b3b1cee30168ca5234b6efc50c2d23e7877924e2497d6b7e4ed826686e1a8093aec5ab08ad36cd2e04ef235cf7a30a08ef19c23fb2add0dd306fa4ae8881e91ea81b7db90bd32e28829b96075805fa1cab6900d9e963ff5232efc60f516bd73a5158cfa7a29a9bb07ba3a6c20be2e8315c5c0000001280000009007faeb8e333cced938005055ae4a104329ae809af5e6dcf92c13d351487c87d3915868c20b87e59cbaa6eccb9174d56f1ad6a4922be01d2671f5cc1d1d160d9c03611572b49bde324538fb7dd8e24687297e6490ee16de68a15f0f3db95955d8bf104cdbc6c90c5c76aa1ce1b27109552f0b09ed4e193f5cb47b3f68c5b9aad2e59b3995420e3bc6540d2fcf26d30af700000090ddf990e84cca0077f0d8c4ec255c2eab76c668e84cf5ae5ce39e06aa31ea6bebafea2fc22bbdbd2f227327cdaac2118731b620882606e69069db26b1773eb2d4f245227c34ee85ce7b87f19bc235e58723aac9fda228bf5260b1e9d8c64b1e4ac89f788b294e2a800ec83824e152379a1408b5e850966e49836a51af8ce92c211b3ea936557152c88fdcc16f3e398dbf000001280000009010002d75ba1ff4554ad77a06af2fac51123649ec050a90597c7bbf478b34983b6f7b15944b5efdcd8d54e4ebcf40a56026345a578bb526cff840fd54f335c002673717bc46c72a97dcd059a2d611985e1a19a8367b402f52524385a5ec56e6207a9e7c4a10e84fac572d70e9b3cd1dbb1fa7fe1e39bb6415bbaed8f6303a99a23ec054507ad79c9bc29d0dfc0bd9447b00000090f7ccb463266a4ff7c273e9c0a136956b7c6c429e2ab773a18576ba75a23b8f8f543493d5adc9e49ad9d30b0d3f23932d60020d2f2847ee8357fbc6533eedc9be6b55d81d87500628aa400d331de9d83d2a3fda76c9bdfc820d094625a4596e02db3e604da144fb834934a4e2d93d133e0d404301278631650b7b68bed665cb50e03f214684d822e14a300a71457778e5000001280000009080b451e6c9a2c420625c89eecda47b21b03a949e5315c38d9b1c39e59f5009deade992bfd878ae2397bac5d4bf2d0284aa9f860a70e6f41ac3b1dc5c0349c2b5585f550a5fe67b70b817657c92579da82ab5ea0d7f61481f802c65bd54b3c87f52dae10c80db0c79d9fa1cf9b45b7da51fce4e7fc0463b489c0512b1165f3f42c75ce5eb050843318907374e280d31fa00000090b217fdc174010515389583c88d932d0f285943bd9c3357335e36caee6b9730f391e6f34c191f74f64d501bbc72d370e08cf50504dc2ccef5073ce027c9ab057da6338d64db7891f135a8033c395e9e53206e12f5ebe3796201c8c5fb6d0953641c5a2e89efd038aebcf9a0c4f50d1efe2464346e02ae75c843c6b11a1cd84a1b996417e45d4b9632e9dbff6b8db094650000012800000090e93cdb4a85f24cd964586f1e9702d831f03a265294325040cb2d5510d18d4a5186074cba2d5a70a0a862590867842de3baa87c6ca244fa5e18445f78d21fdc092b3c65a21f34c04f69e10c201013efa12b63b34d3a5f84f6ed2ceedc99608fbc6877950e61e5c971e5d0d70a8a6c65440c083a8218ba4687f3c1c60a94a5a5fd312276373e45a4685282a59c347a5cb200000090e2b0dc32f29f76e093c78c03bd76fa41ff202875dfd2d4dc7b699c2bc3faf4bf2456d6c69ecb03c27f23e8a08f6234f58aa364dc86f829db03509e4076a1f2aa9937c64cec202f020616b3afb1808acb154ae4da1dba87bb1f7ef9ec18b4f81c93699422fbf92201ebb8d6a9051da20d09fd65e6a5dd210d275d2ce5812a6938fe864ddb6b2f2eda2f97eccc7e270cb90000012800000090dc850cdd754d5562d2cd0a79a93dbeaa8073e8c59be2570e7baa1fb1c4708bf5d247b4c48f47da5504112331264d08219e885e7fa72af442e567b79cb2e47bb074f50ff258252ed089b52d73999ad1c6016079807c678fde5d22a5882e20e8444b3bdac43c815022ad11918c83b982cc23b269e045508b459b0147df499459b9cf406fc80a366fe92eb48fae1ef2f020000000901d1f47c4c1cb18a284d574eb6dac526160fce963527d2762b13f81e4410969a6fddcc1f847fc435907806060857bddd7798b4b04001edcfab63ccb41ec96fa3ba28f8ecae989f85a444f4dbbc226a69a24c309b920b961ba352e9ebe153e51137ff5afe88a0c6e1b1e1044d51904c31305b4180fcf006cdeae8184dc4b5e2e0f1fbfeefb57d3309d45ee8d924f0438e50000012800000090c00446a7e4204241776d5234a2bea9ed935e437d9ff8d31cff62c072c294cd709336c171c4d2008a18633174e321640679b645b4cabafc5702f8936605d9825eddd72a4aa53b6899d22642e58486ead90e7f35b24a3beaa472dd3f8be3c8b65c001b10252457d252120c8273f645f52c2a2cd4485def46cf3368fb5e4703f130cf1b6ede3df24c3cba58ccfbfb5c1d710000009022a8ef23801ff2e837f3e5db3361c6897db0cebaebfff4bc19fe2de194ae245718259c23897359d07e8594d4086da22c0969b3cdafdfb20b6df113841c3e2520b776025831c68c0a2a1dd4bc581df7631d6a743a468d357ea936317efca7f6ed04c1be2dc7e6a1b829e3c9fbb423224c0813db64b88a639a1e2bb0d28c118f29d9aea07e5f7eb68c0e6c044d92e6c5a200000ce40000012800000090e2bc3a48af462e994976367fde39209c31d47fe41a4f37fb644f56fe6421a805cdc7cab167dda0238e4b2d6fe9ff7190d5b00977da7d3bbff603adc831d7b5c2991bf9b8fa11f7b0cea097d0f2f4437401198ba8112a0bd4bc1f536d844648050559ba594e2221f41ff991b831afc04c16d1e2987434b415a200227d598641301debed676bc98f6fac8dd6b00ec3d5ef0000009090adc3bdfc913e1e8f6fdd10fd6e3b62f9a64220c762fa0e0074c2b6fc4f61c91fded0e9f550dd1fba9ae651f1ac0450a72f1b41be401fbf02f969d1a3358514748f32d4093cc1c301db661942c58b49274dba34e513a07634442e055dc224fdd4954bc4f5ec39b56f263ef83ce6d81105dfbcf76b28810a08b23399c067c0730cd643ca0a71c14dfd7fe6a7ca4c7cb80000012800000090cbd5b3d8671123dc24f039239bcb164750d2b94f9e10b011bfad3231ea137b6ca803f15a5adddac120f372364e74f8fe2503f3ae41e6e159d22e02e86eff74db1af028b4d491ab8dd8ef1b712c9454291d8e74b1faa3a9a3a2897661d52b5d38c879f0ee6c25d9a4cbb334b344e0c4d724c3310ad42fc29094d89c434ea332abc10a1b59469f892b4fd60b01bdb4fa9200000090183be88ab1402a8105ce14826e74cfd26ac966dd9c06b2fa1cdf0f92d2837637cb37826e4c05c5207220d0eff1a8efc95d161de351749daffdffc974d40d50412fe80440ad1f03fbeeca8b4169086efd1710aedff6957061c9a814b7c86fab671102290d3e28786784e925f5fec867cf1c64cb4e4d2d7e9719ee7ef0ed4b1cc0e4de0a4d6372de36162ba9cd661436370000012800000090492b1ab03ad6554322c047f02efbdd83ed97509f1820395508471b0df7ed58d463e3b73735051b72d82c513eea1b98d4d51cb7b8ca4fe23651f3f5155f18e4555c093b1eb6c2a98171b714c6601f440224e4f0a5e1cfe404f51d314024cf5c4b1424a7dff3597204720623c0d03b83552ff2b3f159e3764f400465a9637d4d5ecd540df7f378b00858927e1df1c029be000000901943fd9faf476880c444febbdb07802a24dd21a945512a7f86560d1acaf786801b297ee3fdad4d14db06afad27c5181aa8c3ed4db540f4f819866471204e2a7efb9903839e71df18c998f3bba2a5c6e504f43bc05c038d0e7301a6f57bb73e9b3d346dd24bfad2cd28024666d7aea47d0a6edac531b795820968adb825f07da1aa3da448e6bf57880f81d830698f1f0d00000128000000901f0b90e626f010f5f9b965348175df86cad98ee79276e02f5a8ab74d96ddfdb75f1da24e300f6252ddfc53c30b7d57c58977a242c8bef37ecf77e7afc8527172780ff4b8bc2e1b52696dd1c6b79faa1e243e88c996d3cf7306f4e3f0062a6c5ddf4d1e0efbc34adb2bea97f1904944270fc64104193d0210726362ad9fe624bd2953651ca3ba77247afbc581b35df64800000090e7ce6a2a5ec7cc4b32e12ba70c1c491206a85c6bf637dbf7ea3e9ef5c52fec6b421e71eb44fc46950137dc8f780d2bec886dc91616afdd2c700c24832cd53fc692a92a3aec923e85eb8a1421877347cf1678ef20365b09bee2f356edeb6066db70c6eaccf4e1afc436136c5acc6ef42f0a64e5fa94a66f3c7ee8fb08debbe7950b0d0307dbc49ebdd86d5295f53bd58d00000128000000905eed1effd49b3c182fd72fc371f22360fafbc935c94329bbea121b76c3f47c10d7a24852dffbece757558a2a906fccf152698cdcff1368c5ffb433e3b9a16135ca0058af88ca48bdcdc00b6e7dd0532511783b35ee2e85bcb2b5c2a2a0178b8bed4b7dce99d2ed823e9ce610b19b8cc62684e4c14c6085508b7e2cb240fa6efd4ea0e755a720a019e47a1b9ead8ebef0000000909861d898f71affefaa9c24629753b3e6988263567d48672571bc46f69b65f35e0371c72a53ab087fede69bcc9bff623055ee1426ab173447a6cf84ec2fdbc151daa772f1c24de647d606fe99bacff8f000b17c743ed65e5abf0d5f7eba1b53adf37c43c6dcbfa399fea776af3842eb2620fe73dd99bde3c733b7966b9da121511e389985f51368d69dddb05d8ca4a45b00000128000000904f4079d8a2b1fef6ab268d17e10f748d360790081658a4dfaf52931efffe7c2f041923dd29a8a0b5ae7c0a16b1915d68921698d3c99351d8325f4da2422360df766a7bf49fab1b29b7d873951f21d3840f521987c97272fc20d483ed63f6a461273ce23bc3aa6dab2976243655248c0b2923163e782dfb8bf27c3171be7f86da6231fb2992e539dd1f4743558826d2e100000090a98c0b3206e0ef65c45ed93069c78aad33e45aa2bfb121a7e5a45313cb5758c6cd78dc20411fab5ce6cfb52413a4593a8afd3b8198cb753cde0a4d96d3839b66fafc974611b39fb9aa04a640c4e251800fa3ceac5567b9421a19ed92da33ec3a9b145ed09ed058837cb8d51da7bbc879052258bdaa60e493eea98e24bbb556d300eb0206ad4a2b336f3ecb818534533000000128000000908aa7ae30702c869425bde7798ed24dadb39c459ff83ea139d9f6ac6e06a984475cf323d7d45e95c240e346e393174c3d5e91ed9a4f05f497bfbb68a6168fb83d82903c1a5bd9513253a2049abd087d5a297db4b7a90452627a890a7fb5b914af3733951cd13229e60c4c72b7f8be532021cc9049bbe19b38a40ca1f5c1921060814928dc8383345821e4fe686c3d30b6000000904811797f420982fbafd20c05b67a7ba97ad472240e24b1539f533fd790c8b31559ba3b593391ce329096c708d20cd8104e7c834b646ce963c5f634cc4c97b85d2a923fca24d6282c01eb098c33c81f8829c69b93ba28f54c7d0bf2bdb9fa695ad3e2fce86f02adb1aa053ac1848fc01e04776495af37c4115237a3fb0e833cfb47032ba8ab4686a7796d23d5e36f9fba000001280000009026dd418e127c509cdb836ab92258ff19b76bd5e36ff73901eb16b3a6bd3a84df61b3657d3f317f95852e0d723ccf96f19b7fc91655a6a597755164266cf8b99becda4a71d594a7469349cc0bc34e3f10062716c1c60b10662c4cfe78d21248409ec50eebca288509c0a0dbf5f320a21b28dec7530b02753f920944d3efdc7d7e59c0a4204ca900e22aa59e04c5c5a6f20000009097ec2bfba0e6dc44f0c7fde2a6b8c08da93af4b60313d597ea441cac361dae66799037a1fc9328b37850cd730a6b2895d111bc7a80c7d94ed8dbed022736042e579a8a0c96e40abb5f61abb1536718f51d87b83c4d69ab74c99be50aee9ceb67d2951a16b265e9356e264c200dcfbf2000967f66bf7f490bba839a2f4a73fd5c15677f6cf311b65672e708eaa2503d5400000128000000903d05177da328f50a6b1735b7f3c7ee275b145e2effcc456a0c5a2b6b85366acdaebac9801eb0510cd1823bd01139ab5d3db0f38d2cec64e653a14a0c5461c5e2a904f640d4ca3bafbb0b0f4be9739cf80bffbee46f92294abe5558926bab3118826687aac02ffbf1d68424fe9af65b2916ed9211d0d3d2d6917c658545188720424ac98fc35342de7cd07429def9422900000090e1d45e36164240913087d829bb92535b93c0ffd41386ba5c3d276dd57611f6e68b3244f1cf5f75764992c8c456850c135e3aed4486dc85eddafd4921cccfaacda04c274181cebe2ed0e580d1350d8a3e1b4777640a7126168ce8772f7ad20463a3d5b9c05dad1c26afd2e9cf762c3e6304f289ac1d13c4edcdae63f8277af15e80590889a55337e81b118ffcdd9982180000012800000090f0f12e1fa0945b93a198c6631fb878417b46cb176a2bbf347eea9ef4d1729d28e940a208f2a1132325f403a3d4661da1e1d0b2544ac39ab2c6023e5fcb2ca1737e0a545703bfa9c4ef3f90dae7cb42151e25fcbd5964fdb9002517105469c59b5482528fcee58c786344c30cde4caee9040346581b540d44d1287d963b5889a0066dcba50ad62940317292d9794cfd530000009078dc1348b125a76fee5aebd336661e4d0214c5cbd94fcddd08c1526f67da9b789cf7bb879f6296647396073b4036b462e0d66e6b45c3e602494b8c99024ba54090fa7d6cf9726b49b6d22aa7bee4cc33096bdd8e3015a9561d352e009dde3a772739291878b2b17e96ee8c415bbb6cad1ceea85f24360cafe7a28cbe08d8074605a72facccd92bb307fcc855d413f8ec00000128000000908d2a8d2e41f9d850def8241eeb22d8fe08c2555c618b155b75d95e96bdb0b0b377cd0ca2376eee3307cb50328931faf5767ff80eddb2ce21f184b7942aa019bd8e60a881715e6c382433e77761296bbd025dbf23d1b00f9d25dbcfda67f9b4ae86a387fb7bdf3c5241e0b78c839b90322a7e03779942b0dbdf47c34b13c7d671358b008a96827396b695f0ac3e32894000000090df5748605961a0e6be2ff2e92b6280110752d8a76a8ec69bf9b7f4d916ca4a5dfede149be73b24e6426e993ded9af3dae9ca39f2e43363dbd1b36a9ec44d2b7736a4936a16096c151be8f8a3f907ac33116b667bba9a8297de6a994b2b7e34ff897749999724668a3753d5caa80d571b0bedc76486de3d07973636e9ee1897e7e62f94352d22ec90a956a16db6d36027",
+    "calldataHash": "0xf4525fad966caa2a5a1c5c4ca03520c2652aa2835f67fcad64b97e05cfb2870e",
+    "decodedHeader": {
+      "bodyHash": "0xf4525fad966caa2a5a1c5c4ca03520c2652aa2835f67fcad64b97e05cfb2870e",
+      "globalVariables": {
+        "blockNumber": 2,
+        "chainId": 31337,
+        "timestamp": 1705501882,
+        "version": 1
+      },
+      "lastArchive": {
+        "nextAvailableLeafIndex": 2,
+        "root": "0x1f1de772c009f5b1660876343eb57b7a676a84c695b0c526de2f238c41810907"
+      },
+      "stateReference": {
+        "l1ToL2MessageTree": {
+          "nextAvailableLeafIndex": 32,
+          "root": "0x06c76caee115a61eeb6788977c68a3bea359061b678a1a4f5ffde13e0451717b"
+        },
+        "partialStateReference": {
+          "contractTree": {
+            "nextAvailableLeafIndex": 8,
+            "root": "0x022612683c6c4a0955c8248d409bc8ec8776d96a3bfe5b5a7e76e492a4f26cb0"
+          },
+          "noteHashTree": {
+            "nextAvailableLeafIndex": 512,
+            "root": "0x24c6dc6d357aad01e10fe1adb877bb28b1df97375b874116e488086ca76e5f96"
+          },
+          "nullifierTree": {
+            "nextAvailableLeafIndex": 640,
+            "root": "0x268020a622156e2beac47431b0cd70e1c81fef9a6aa3c365bfcbed9aa7301c5e"
+          },
+          "publicDataTree": {
+            "nextAvailableLeafIndex": 160,
+            "root": "0x039e689049f104493f0e819b00d874663f0724639f854b8722e8ee829b0f136a"
+          }
+        }
+      }
+    },
+    "header": "0x0000000000000000000000000000000000000000000000000000000000007a69000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000065a7e4ba06c76caee115a61eeb6788977c68a3bea359061b678a1a4f5ffde13e0451717b0000002024c6dc6d357aad01e10fe1adb877bb28b1df97375b874116e488086ca76e5f9600000200268020a622156e2beac47431b0cd70e1c81fef9a6aa3c365bfcbed9aa7301c5e00000280022612683c6c4a0955c8248d409bc8ec8776d96a3bfe5b5a7e76e492a4f26cb000000008039e689049f104493f0e819b00d874663f0724639f854b8722e8ee829b0f136a000000a01f1de772c009f5b1660876343eb57b7a676a84c695b0c526de2f238c4181090700000002f4525fad966caa2a5a1c5c4ca03520c2652aa2835f67fcad64b97e05cfb2870e",
     "l1ToL2MessagesHash": "0xa10cc8559615be5a44cfb608374b1f84fd11cdb5844ebffafd92a77c068350f1",
-    "body": "0x0000000000000000000000000000000000000000000000000000000000007a690000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000659eb2370d944282e11bdcfa5e8f2b55fe80db4c586087bfc10e0bbba5724d30b8c15e2e0000010001c16141039343d4d403501e66deecff1b024bd76794820a43dc3424087813a2000001801a3d3e40c90cd24822b9c268154ef14d4639febdb7af81b554cb2d651b88dfb100000004160ba3a7c15d7dd592a24b3f14bfa76a0b45378877d4dedc5f126f47844b99b2000000600a241c83a063083fad29b6c333afcd968f71f8a875544ff1f1f08cae7f770f51000000101f1de772c009f5b1660876343eb57b7a676a84c695b0c526de2f238c418109070000000224c6dc6d357aad01e10fe1adb877bb28b1df97375b874116e488086ca76e5f9600000200268020a622156e2beac47431b0cd70e1c81fef9a6aa3c365bfcbed9aa7301c5e00000280022612683c6c4a0955c8248d409bc8ec8776d96a3bfe5b5a7e76e492a4f26cb000000008039e689049f104493f0e819b00d874663f0724639f854b8722e8ee829b0f136a000000a006c76caee115a61eeb6788977c68a3bea359061b678a1a4f5ffde13e0451717b00000020006d87d3393cf4378f937c65b8103be6d2376fe77e1f17850cb76b01d30fed0900000003000001000000000000000000000000000000000000000000000000000000000000000240000000000000000000000000000000000000000000000000000000000000024100000000000000000000000000000000000000000000000000000000000002420000000000000000000000000000000000000000000000000000000000000243000000000000000000000000000000000000000000000000000000000000024400000000000000000000000000000000000000000000000000000000000002450000000000000000000000000000000000000000000000000000000000000246000000000000000000000000000000000000000000000000000000000000024700000000000000000000000000000000000000000000000000000000000002480000000000000000000000000000000000000000000000000000000000000249000000000000000000000000000000000000000000000000000000000000024a000000000000000000000000000000000000000000000000000000000000024b000000000000000000000000000000000000000000000000000000000000024c000000000000000000000000000000000000000000000000000000000000024d000000000000000000000000000000000000000000000000000000000000024e000000000000000000000000000000000000000000000000000000000000024f0000000000000000000000000000000000000000000000000000000000000250000000000000000000000000000000000000000000000000000000000000025100000000000000000000000000000000000000000000000000000000000002520000000000000000000000000000000000000000000000000000000000000253000000000000000000000000000000000000000000000000000000000000025400000000000000000000000000000000000000000000000000000000000002550000000000000000000000000000000000000000000000000000000000000256000000000000000000000000000000000000000000000000000000000000025700000000000000000000000000000000000000000000000000000000000002580000000000000000000000000000000000000000000000000000000000000259000000000000000000000000000000000000000000000000000000000000025a000000000000000000000000000000000000000000000000000000000000025b000000000000000000000000000000000000000000000000000000000000025c000000000000000000000000000000000000000000000000000000000000025d000000000000000000000000000000000000000000000000000000000000025e000000000000000000000000000000000000000000000000000000000000025f0000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000026100000000000000000000000000000000000000000000000000000000000002620000000000000000000000000000000000000000000000000000000000000263000000000000000000000000000000000000000000000000000000000000026400000000000000000000000000000000000000000000000000000000000002650000000000000000000000000000000000000000000000000000000000000266000000000000000000000000000000000000000000000000000000000000026700000000000000000000000000000000000000000000000000000000000002680000000000000000000000000000000000000000000000000000000000000269000000000000000000000000000000000000000000000000000000000000026a000000000000000000000000000000000000000000000000000000000000026b000000000000000000000000000000000000000000000000000000000000026c000000000000000000000000000000000000000000000000000000000000026d000000000000000000000000000000000000000000000000000000000000026e000000000000000000000000000000000000000000000000000000000000026f0000000000000000000000000000000000000000000000000000000000000270000000000000000000000000000000000000000000000000000000000000027100000000000000000000000000000000000000000000000000000000000002720000000000000000000000000000000000000000000000000000000000000273000000000000000000000000000000000000000000000000000000000000027400000000000000000000000000000000000000000000000000000000000002750000000000000000000000000000000000000000000000000000000000000276000000000000000000000000000000000000000000000000000000000000027700000000000000000000000000000000000000000000000000000000000002780000000000000000000000000000000000000000000000000000000000000279000000000000000000000000000000000000000000000000000000000000027a000000000000000000000000000000000000000000000000000000000000027b000000000000000000000000000000000000000000000000000000000000027c000000000000000000000000000000000000000000000000000000000000027d000000000000000000000000000000000000000000000000000000000000027e000000000000000000000000000000000000000000000000000000000000027f0000000000000000000000000000000000000000000000000000000000000280000000000000000000000000000000000000000000000000000000000000028100000000000000000000000000000000000000000000000000000000000002820000000000000000000000000000000000000000000000000000000000000283000000000000000000000000000000000000000000000000000000000000028400000000000000000000000000000000000000000000000000000000000002850000000000000000000000000000000000000000000000000000000000000286000000000000000000000000000000000000000000000000000000000000028700000000000000000000000000000000000000000000000000000000000002880000000000000000000000000000000000000000000000000000000000000289000000000000000000000000000000000000000000000000000000000000028a000000000000000000000000000000000000000000000000000000000000028b000000000000000000000000000000000000000000000000000000000000028c000000000000000000000000000000000000000000000000000000000000028d000000000000000000000000000000000000000000000000000000000000028e000000000000000000000000000000000000000000000000000000000000028f0000000000000000000000000000000000000000000000000000000000000290000000000000000000000000000000000000000000000000000000000000029100000000000000000000000000000000000000000000000000000000000002920000000000000000000000000000000000000000000000000000000000000293000000000000000000000000000000000000000000000000000000000000029400000000000000000000000000000000000000000000000000000000000002950000000000000000000000000000000000000000000000000000000000000296000000000000000000000000000000000000000000000000000000000000029700000000000000000000000000000000000000000000000000000000000002980000000000000000000000000000000000000000000000000000000000000299000000000000000000000000000000000000000000000000000000000000029a000000000000000000000000000000000000000000000000000000000000029b000000000000000000000000000000000000000000000000000000000000029c000000000000000000000000000000000000000000000000000000000000029d000000000000000000000000000000000000000000000000000000000000029e000000000000000000000000000000000000000000000000000000000000029f00000000000000000000000000000000000000000000000000000000000002a000000000000000000000000000000000000000000000000000000000000002a100000000000000000000000000000000000000000000000000000000000002a200000000000000000000000000000000000000000000000000000000000002a300000000000000000000000000000000000000000000000000000000000002a400000000000000000000000000000000000000000000000000000000000002a500000000000000000000000000000000000000000000000000000000000002a600000000000000000000000000000000000000000000000000000000000002a700000000000000000000000000000000000000000000000000000000000002a800000000000000000000000000000000000000000000000000000000000002a900000000000000000000000000000000000000000000000000000000000002aa00000000000000000000000000000000000000000000000000000000000002ab00000000000000000000000000000000000000000000000000000000000002ac00000000000000000000000000000000000000000000000000000000000002ad00000000000000000000000000000000000000000000000000000000000002ae00000000000000000000000000000000000000000000000000000000000002af00000000000000000000000000000000000000000000000000000000000002b000000000000000000000000000000000000000000000000000000000000002b100000000000000000000000000000000000000000000000000000000000002b200000000000000000000000000000000000000000000000000000000000002b300000000000000000000000000000000000000000000000000000000000002b400000000000000000000000000000000000000000000000000000000000002b500000000000000000000000000000000000000000000000000000000000002b600000000000000000000000000000000000000000000000000000000000002b700000000000000000000000000000000000000000000000000000000000002b800000000000000000000000000000000000000000000000000000000000002b900000000000000000000000000000000000000000000000000000000000002ba00000000000000000000000000000000000000000000000000000000000002bb00000000000000000000000000000000000000000000000000000000000002bc00000000000000000000000000000000000000000000000000000000000002bd00000000000000000000000000000000000000000000000000000000000002be00000000000000000000000000000000000000000000000000000000000002bf00000000000000000000000000000000000000000000000000000000000002c000000000000000000000000000000000000000000000000000000000000002c100000000000000000000000000000000000000000000000000000000000002c200000000000000000000000000000000000000000000000000000000000002c300000000000000000000000000000000000000000000000000000000000002c400000000000000000000000000000000000000000000000000000000000002c500000000000000000000000000000000000000000000000000000000000002c600000000000000000000000000000000000000000000000000000000000002c700000000000000000000000000000000000000000000000000000000000002c800000000000000000000000000000000000000000000000000000000000002c900000000000000000000000000000000000000000000000000000000000002ca00000000000000000000000000000000000000000000000000000000000002cb00000000000000000000000000000000000000000000000000000000000002cc00000000000000000000000000000000000000000000000000000000000002cd00000000000000000000000000000000000000000000000000000000000002ce00000000000000000000000000000000000000000000000000000000000002cf00000000000000000000000000000000000000000000000000000000000002d000000000000000000000000000000000000000000000000000000000000002d100000000000000000000000000000000000000000000000000000000000002d200000000000000000000000000000000000000000000000000000000000002d300000000000000000000000000000000000000000000000000000000000002d400000000000000000000000000000000000000000000000000000000000002d500000000000000000000000000000000000000000000000000000000000002d600000000000000000000000000000000000000000000000000000000000002d700000000000000000000000000000000000000000000000000000000000002d800000000000000000000000000000000000000000000000000000000000002d900000000000000000000000000000000000000000000000000000000000002da00000000000000000000000000000000000000000000000000000000000002db00000000000000000000000000000000000000000000000000000000000002dc00000000000000000000000000000000000000000000000000000000000002dd00000000000000000000000000000000000000000000000000000000000002de00000000000000000000000000000000000000000000000000000000000002df00000000000000000000000000000000000000000000000000000000000002e000000000000000000000000000000000000000000000000000000000000002e100000000000000000000000000000000000000000000000000000000000002e200000000000000000000000000000000000000000000000000000000000002e300000000000000000000000000000000000000000000000000000000000002e400000000000000000000000000000000000000000000000000000000000002e500000000000000000000000000000000000000000000000000000000000002e600000000000000000000000000000000000000000000000000000000000002e700000000000000000000000000000000000000000000000000000000000002e800000000000000000000000000000000000000000000000000000000000002e900000000000000000000000000000000000000000000000000000000000002ea00000000000000000000000000000000000000000000000000000000000002eb00000000000000000000000000000000000000000000000000000000000002ec00000000000000000000000000000000000000000000000000000000000002ed00000000000000000000000000000000000000000000000000000000000002ee00000000000000000000000000000000000000000000000000000000000002ef00000000000000000000000000000000000000000000000000000000000002f000000000000000000000000000000000000000000000000000000000000002f100000000000000000000000000000000000000000000000000000000000002f200000000000000000000000000000000000000000000000000000000000002f300000000000000000000000000000000000000000000000000000000000002f400000000000000000000000000000000000000000000000000000000000002f500000000000000000000000000000000000000000000000000000000000002f600000000000000000000000000000000000000000000000000000000000002f700000000000000000000000000000000000000000000000000000000000002f800000000000000000000000000000000000000000000000000000000000002f900000000000000000000000000000000000000000000000000000000000002fa00000000000000000000000000000000000000000000000000000000000002fb00000000000000000000000000000000000000000000000000000000000002fc00000000000000000000000000000000000000000000000000000000000002fd00000000000000000000000000000000000000000000000000000000000002fe00000000000000000000000000000000000000000000000000000000000002ff0000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000030100000000000000000000000000000000000000000000000000000000000003020000000000000000000000000000000000000000000000000000000000000303000000000000000000000000000000000000000000000000000000000000030400000000000000000000000000000000000000000000000000000000000003050000000000000000000000000000000000000000000000000000000000000306000000000000000000000000000000000000000000000000000000000000030700000000000000000000000000000000000000000000000000000000000003080000000000000000000000000000000000000000000000000000000000000309000000000000000000000000000000000000000000000000000000000000030a000000000000000000000000000000000000000000000000000000000000030b000000000000000000000000000000000000000000000000000000000000030c000000000000000000000000000000000000000000000000000000000000030d000000000000000000000000000000000000000000000000000000000000030e000000000000000000000000000000000000000000000000000000000000030f0000000000000000000000000000000000000000000000000000000000000310000000000000000000000000000000000000000000000000000000000000031100000000000000000000000000000000000000000000000000000000000003120000000000000000000000000000000000000000000000000000000000000313000000000000000000000000000000000000000000000000000000000000031400000000000000000000000000000000000000000000000000000000000003150000000000000000000000000000000000000000000000000000000000000316000000000000000000000000000000000000000000000000000000000000031700000000000000000000000000000000000000000000000000000000000003180000000000000000000000000000000000000000000000000000000000000319000000000000000000000000000000000000000000000000000000000000031a000000000000000000000000000000000000000000000000000000000000031b000000000000000000000000000000000000000000000000000000000000031c000000000000000000000000000000000000000000000000000000000000031d000000000000000000000000000000000000000000000000000000000000031e000000000000000000000000000000000000000000000000000000000000031f0000000000000000000000000000000000000000000000000000000000000320000000000000000000000000000000000000000000000000000000000000032100000000000000000000000000000000000000000000000000000000000003220000000000000000000000000000000000000000000000000000000000000323000000000000000000000000000000000000000000000000000000000000032400000000000000000000000000000000000000000000000000000000000003250000000000000000000000000000000000000000000000000000000000000326000000000000000000000000000000000000000000000000000000000000032700000000000000000000000000000000000000000000000000000000000003280000000000000000000000000000000000000000000000000000000000000329000000000000000000000000000000000000000000000000000000000000032a000000000000000000000000000000000000000000000000000000000000032b000000000000000000000000000000000000000000000000000000000000032c000000000000000000000000000000000000000000000000000000000000032d000000000000000000000000000000000000000000000000000000000000032e000000000000000000000000000000000000000000000000000000000000032f0000000000000000000000000000000000000000000000000000000000000330000000000000000000000000000000000000000000000000000000000000033100000000000000000000000000000000000000000000000000000000000003320000000000000000000000000000000000000000000000000000000000000333000000000000000000000000000000000000000000000000000000000000033400000000000000000000000000000000000000000000000000000000000003350000000000000000000000000000000000000000000000000000000000000336000000000000000000000000000000000000000000000000000000000000033700000000000000000000000000000000000000000000000000000000000003380000000000000000000000000000000000000000000000000000000000000339000000000000000000000000000000000000000000000000000000000000033a000000000000000000000000000000000000000000000000000000000000033b000000000000000000000000000000000000000000000000000000000000033c000000000000000000000000000000000000000000000000000000000000033d000000000000000000000000000000000000000000000000000000000000033e000000000000000000000000000000000000000000000000000000000000033f000001000000000000000000000000000000000000000000000000000000000000000340000000000000000000000000000000000000000000000000000000000000034100000000000000000000000000000000000000000000000000000000000003420000000000000000000000000000000000000000000000000000000000000343000000000000000000000000000000000000000000000000000000000000034400000000000000000000000000000000000000000000000000000000000003450000000000000000000000000000000000000000000000000000000000000346000000000000000000000000000000000000000000000000000000000000034700000000000000000000000000000000000000000000000000000000000003480000000000000000000000000000000000000000000000000000000000000349000000000000000000000000000000000000000000000000000000000000034a000000000000000000000000000000000000000000000000000000000000034b000000000000000000000000000000000000000000000000000000000000034c000000000000000000000000000000000000000000000000000000000000034d000000000000000000000000000000000000000000000000000000000000034e000000000000000000000000000000000000000000000000000000000000034f0000000000000000000000000000000000000000000000000000000000000350000000000000000000000000000000000000000000000000000000000000035100000000000000000000000000000000000000000000000000000000000003520000000000000000000000000000000000000000000000000000000000000353000000000000000000000000000000000000000000000000000000000000035400000000000000000000000000000000000000000000000000000000000003550000000000000000000000000000000000000000000000000000000000000356000000000000000000000000000000000000000000000000000000000000035700000000000000000000000000000000000000000000000000000000000003580000000000000000000000000000000000000000000000000000000000000359000000000000000000000000000000000000000000000000000000000000035a000000000000000000000000000000000000000000000000000000000000035b000000000000000000000000000000000000000000000000000000000000035c000000000000000000000000000000000000000000000000000000000000035d000000000000000000000000000000000000000000000000000000000000035e000000000000000000000000000000000000000000000000000000000000035f0000000000000000000000000000000000000000000000000000000000000360000000000000000000000000000000000000000000000000000000000000036100000000000000000000000000000000000000000000000000000000000003620000000000000000000000000000000000000000000000000000000000000363000000000000000000000000000000000000000000000000000000000000036400000000000000000000000000000000000000000000000000000000000003650000000000000000000000000000000000000000000000000000000000000366000000000000000000000000000000000000000000000000000000000000036700000000000000000000000000000000000000000000000000000000000003680000000000000000000000000000000000000000000000000000000000000369000000000000000000000000000000000000000000000000000000000000036a000000000000000000000000000000000000000000000000000000000000036b000000000000000000000000000000000000000000000000000000000000036c000000000000000000000000000000000000000000000000000000000000036d000000000000000000000000000000000000000000000000000000000000036e000000000000000000000000000000000000000000000000000000000000036f0000000000000000000000000000000000000000000000000000000000000370000000000000000000000000000000000000000000000000000000000000037100000000000000000000000000000000000000000000000000000000000003720000000000000000000000000000000000000000000000000000000000000373000000000000000000000000000000000000000000000000000000000000037400000000000000000000000000000000000000000000000000000000000003750000000000000000000000000000000000000000000000000000000000000376000000000000000000000000000000000000000000000000000000000000037700000000000000000000000000000000000000000000000000000000000003780000000000000000000000000000000000000000000000000000000000000379000000000000000000000000000000000000000000000000000000000000037a000000000000000000000000000000000000000000000000000000000000037b000000000000000000000000000000000000000000000000000000000000037c000000000000000000000000000000000000000000000000000000000000037d000000000000000000000000000000000000000000000000000000000000037e00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000380000000000000000000000000000000000000000000000000000000000000038100000000000000000000000000000000000000000000000000000000000003820000000000000000000000000000000000000000000000000000000000000383000000000000000000000000000000000000000000000000000000000000038400000000000000000000000000000000000000000000000000000000000003850000000000000000000000000000000000000000000000000000000000000386000000000000000000000000000000000000000000000000000000000000038700000000000000000000000000000000000000000000000000000000000003880000000000000000000000000000000000000000000000000000000000000389000000000000000000000000000000000000000000000000000000000000038a000000000000000000000000000000000000000000000000000000000000038b000000000000000000000000000000000000000000000000000000000000038c000000000000000000000000000000000000000000000000000000000000038d000000000000000000000000000000000000000000000000000000000000038e000000000000000000000000000000000000000000000000000000000000038f0000000000000000000000000000000000000000000000000000000000000390000000000000000000000000000000000000000000000000000000000000039100000000000000000000000000000000000000000000000000000000000003920000000000000000000000000000000000000000000000000000000000000393000000000000000000000000000000000000000000000000000000000000039400000000000000000000000000000000000000000000000000000000000003950000000000000000000000000000000000000000000000000000000000000396000000000000000000000000000000000000000000000000000000000000039700000000000000000000000000000000000000000000000000000000000003980000000000000000000000000000000000000000000000000000000000000399000000000000000000000000000000000000000000000000000000000000039a000000000000000000000000000000000000000000000000000000000000039b000000000000000000000000000000000000000000000000000000000000039c000000000000000000000000000000000000000000000000000000000000039d000000000000000000000000000000000000000000000000000000000000039e000000000000000000000000000000000000000000000000000000000000039f00000000000000000000000000000000000000000000000000000000000003a000000000000000000000000000000000000000000000000000000000000003a100000000000000000000000000000000000000000000000000000000000003a200000000000000000000000000000000000000000000000000000000000003a300000000000000000000000000000000000000000000000000000000000003a400000000000000000000000000000000000000000000000000000000000003a500000000000000000000000000000000000000000000000000000000000003a600000000000000000000000000000000000000000000000000000000000003a700000000000000000000000000000000000000000000000000000000000003a800000000000000000000000000000000000000000000000000000000000003a900000000000000000000000000000000000000000000000000000000000003aa00000000000000000000000000000000000000000000000000000000000003ab00000000000000000000000000000000000000000000000000000000000003ac00000000000000000000000000000000000000000000000000000000000003ad00000000000000000000000000000000000000000000000000000000000003ae00000000000000000000000000000000000000000000000000000000000003af00000000000000000000000000000000000000000000000000000000000003b000000000000000000000000000000000000000000000000000000000000003b100000000000000000000000000000000000000000000000000000000000003b200000000000000000000000000000000000000000000000000000000000003b300000000000000000000000000000000000000000000000000000000000003b400000000000000000000000000000000000000000000000000000000000003b500000000000000000000000000000000000000000000000000000000000003b600000000000000000000000000000000000000000000000000000000000003b700000000000000000000000000000000000000000000000000000000000003b800000000000000000000000000000000000000000000000000000000000003b900000000000000000000000000000000000000000000000000000000000003ba00000000000000000000000000000000000000000000000000000000000003bb00000000000000000000000000000000000000000000000000000000000003bc00000000000000000000000000000000000000000000000000000000000003bd00000000000000000000000000000000000000000000000000000000000003be000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003c000000000000000000000000000000000000000000000000000000000000003c100000000000000000000000000000000000000000000000000000000000003c200000000000000000000000000000000000000000000000000000000000003c300000000000000000000000000000000000000000000000000000000000003c400000000000000000000000000000000000000000000000000000000000003c500000000000000000000000000000000000000000000000000000000000003c600000000000000000000000000000000000000000000000000000000000003c700000000000000000000000000000000000000000000000000000000000003c800000000000000000000000000000000000000000000000000000000000003c900000000000000000000000000000000000000000000000000000000000003ca00000000000000000000000000000000000000000000000000000000000003cb00000000000000000000000000000000000000000000000000000000000003cc00000000000000000000000000000000000000000000000000000000000003cd00000000000000000000000000000000000000000000000000000000000003ce00000000000000000000000000000000000000000000000000000000000003cf00000000000000000000000000000000000000000000000000000000000003d000000000000000000000000000000000000000000000000000000000000003d100000000000000000000000000000000000000000000000000000000000003d200000000000000000000000000000000000000000000000000000000000003d300000000000000000000000000000000000000000000000000000000000003d400000000000000000000000000000000000000000000000000000000000003d500000000000000000000000000000000000000000000000000000000000003d600000000000000000000000000000000000000000000000000000000000003d700000000000000000000000000000000000000000000000000000000000003d800000000000000000000000000000000000000000000000000000000000003d900000000000000000000000000000000000000000000000000000000000003da00000000000000000000000000000000000000000000000000000000000003db00000000000000000000000000000000000000000000000000000000000003dc00000000000000000000000000000000000000000000000000000000000003dd00000000000000000000000000000000000000000000000000000000000003de00000000000000000000000000000000000000000000000000000000000003df00000000000000000000000000000000000000000000000000000000000003e000000000000000000000000000000000000000000000000000000000000003e100000000000000000000000000000000000000000000000000000000000003e200000000000000000000000000000000000000000000000000000000000003e300000000000000000000000000000000000000000000000000000000000003e400000000000000000000000000000000000000000000000000000000000003e500000000000000000000000000000000000000000000000000000000000003e600000000000000000000000000000000000000000000000000000000000003e700000000000000000000000000000000000000000000000000000000000003e800000000000000000000000000000000000000000000000000000000000003e900000000000000000000000000000000000000000000000000000000000003ea00000000000000000000000000000000000000000000000000000000000003eb00000000000000000000000000000000000000000000000000000000000003ec00000000000000000000000000000000000000000000000000000000000003ed00000000000000000000000000000000000000000000000000000000000003ee00000000000000000000000000000000000000000000000000000000000003ef00000000000000000000000000000000000000000000000000000000000003f000000000000000000000000000000000000000000000000000000000000003f100000000000000000000000000000000000000000000000000000000000003f200000000000000000000000000000000000000000000000000000000000003f300000000000000000000000000000000000000000000000000000000000003f400000000000000000000000000000000000000000000000000000000000003f500000000000000000000000000000000000000000000000000000000000003f600000000000000000000000000000000000000000000000000000000000003f700000000000000000000000000000000000000000000000000000000000003f800000000000000000000000000000000000000000000000000000000000003f900000000000000000000000000000000000000000000000000000000000003fa00000000000000000000000000000000000000000000000000000000000003fb00000000000000000000000000000000000000000000000000000000000003fc00000000000000000000000000000000000000000000000000000000000003fd00000000000000000000000000000000000000000000000000000000000003fe00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000040100000000000000000000000000000000000000000000000000000000000004020000000000000000000000000000000000000000000000000000000000000403000000000000000000000000000000000000000000000000000000000000040400000000000000000000000000000000000000000000000000000000000004050000000000000000000000000000000000000000000000000000000000000406000000000000000000000000000000000000000000000000000000000000040700000000000000000000000000000000000000000000000000000000000004080000000000000000000000000000000000000000000000000000000000000409000000000000000000000000000000000000000000000000000000000000040a000000000000000000000000000000000000000000000000000000000000040b000000000000000000000000000000000000000000000000000000000000040c000000000000000000000000000000000000000000000000000000000000040d000000000000000000000000000000000000000000000000000000000000040e000000000000000000000000000000000000000000000000000000000000040f0000000000000000000000000000000000000000000000000000000000000410000000000000000000000000000000000000000000000000000000000000041100000000000000000000000000000000000000000000000000000000000004120000000000000000000000000000000000000000000000000000000000000413000000000000000000000000000000000000000000000000000000000000041400000000000000000000000000000000000000000000000000000000000004150000000000000000000000000000000000000000000000000000000000000416000000000000000000000000000000000000000000000000000000000000041700000000000000000000000000000000000000000000000000000000000004180000000000000000000000000000000000000000000000000000000000000419000000000000000000000000000000000000000000000000000000000000041a000000000000000000000000000000000000000000000000000000000000041b000000000000000000000000000000000000000000000000000000000000041c000000000000000000000000000000000000000000000000000000000000041d000000000000000000000000000000000000000000000000000000000000041e000000000000000000000000000000000000000000000000000000000000041f0000000000000000000000000000000000000000000000000000000000000420000000000000000000000000000000000000000000000000000000000000042100000000000000000000000000000000000000000000000000000000000004220000000000000000000000000000000000000000000000000000000000000423000000000000000000000000000000000000000000000000000000000000042400000000000000000000000000000000000000000000000000000000000004250000000000000000000000000000000000000000000000000000000000000426000000000000000000000000000000000000000000000000000000000000042700000000000000000000000000000000000000000000000000000000000004280000000000000000000000000000000000000000000000000000000000000429000000000000000000000000000000000000000000000000000000000000042a000000000000000000000000000000000000000000000000000000000000042b000000000000000000000000000000000000000000000000000000000000042c000000000000000000000000000000000000000000000000000000000000042d000000000000000000000000000000000000000000000000000000000000042e000000000000000000000000000000000000000000000000000000000000042f0000000000000000000000000000000000000000000000000000000000000430000000000000000000000000000000000000000000000000000000000000043100000000000000000000000000000000000000000000000000000000000004320000000000000000000000000000000000000000000000000000000000000433000000000000000000000000000000000000000000000000000000000000043400000000000000000000000000000000000000000000000000000000000004350000000000000000000000000000000000000000000000000000000000000436000000000000000000000000000000000000000000000000000000000000043700000000000000000000000000000000000000000000000000000000000004380000000000000000000000000000000000000000000000000000000000000439000000000000000000000000000000000000000000000000000000000000043a000000000000000000000000000000000000000000000000000000000000043b000000000000000000000000000000000000000000000000000000000000043c000000000000000000000000000000000000000000000000000000000000043d000000000000000000000000000000000000000000000000000000000000043e0000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000640000000000000000000000000000000000000000000000000000000000000064a0000000000000000000000000000000000000000000000000000000000000641000000000000000000000000000000000000000000000000000000000000064b0000000000000000000000000000000000000000000000000000000000000642000000000000000000000000000000000000000000000000000000000000064c0000000000000000000000000000000000000000000000000000000000000643000000000000000000000000000000000000000000000000000000000000064d0000000000000000000000000000000000000000000000000000000000000644000000000000000000000000000000000000000000000000000000000000064e0000000000000000000000000000000000000000000000000000000000000645000000000000000000000000000000000000000000000000000000000000064f00000000000000000000000000000000000000000000000000000000000006460000000000000000000000000000000000000000000000000000000000000650000000000000000000000000000000000000000000000000000000000000064700000000000000000000000000000000000000000000000000000000000006510000000000000000000000000000000000000000000000000000000000000648000000000000000000000000000000000000000000000000000000000000065200000000000000000000000000000000000000000000000000000000000006490000000000000000000000000000000000000000000000000000000000000653000000000000000000000000000000000000000000000000000000000000064a0000000000000000000000000000000000000000000000000000000000000654000000000000000000000000000000000000000000000000000000000000064b0000000000000000000000000000000000000000000000000000000000000655000000000000000000000000000000000000000000000000000000000000064c0000000000000000000000000000000000000000000000000000000000000656000000000000000000000000000000000000000000000000000000000000064d0000000000000000000000000000000000000000000000000000000000000657000000000000000000000000000000000000000000000000000000000000064e0000000000000000000000000000000000000000000000000000000000000658000000000000000000000000000000000000000000000000000000000000064f00000000000000000000000000000000000000000000000000000000000006590000000000000000000000000000000000000000000000000000000000000680000000000000000000000000000000000000000000000000000000000000068a0000000000000000000000000000000000000000000000000000000000000681000000000000000000000000000000000000000000000000000000000000068b0000000000000000000000000000000000000000000000000000000000000682000000000000000000000000000000000000000000000000000000000000068c0000000000000000000000000000000000000000000000000000000000000683000000000000000000000000000000000000000000000000000000000000068d0000000000000000000000000000000000000000000000000000000000000684000000000000000000000000000000000000000000000000000000000000068e0000000000000000000000000000000000000000000000000000000000000685000000000000000000000000000000000000000000000000000000000000068f00000000000000000000000000000000000000000000000000000000000006860000000000000000000000000000000000000000000000000000000000000690000000000000000000000000000000000000000000000000000000000000068700000000000000000000000000000000000000000000000000000000000006910000000000000000000000000000000000000000000000000000000000000688000000000000000000000000000000000000000000000000000000000000069200000000000000000000000000000000000000000000000000000000000006890000000000000000000000000000000000000000000000000000000000000693000000000000000000000000000000000000000000000000000000000000068a0000000000000000000000000000000000000000000000000000000000000694000000000000000000000000000000000000000000000000000000000000068b0000000000000000000000000000000000000000000000000000000000000695000000000000000000000000000000000000000000000000000000000000068c0000000000000000000000000000000000000000000000000000000000000696000000000000000000000000000000000000000000000000000000000000068d0000000000000000000000000000000000000000000000000000000000000697000000000000000000000000000000000000000000000000000000000000068e0000000000000000000000000000000000000000000000000000000000000698000000000000000000000000000000000000000000000000000000000000068f000000000000000000000000000000000000000000000000000000000000069900000000000000000000000000000000000000000000000000000000000006c000000000000000000000000000000000000000000000000000000000000006ca00000000000000000000000000000000000000000000000000000000000006c100000000000000000000000000000000000000000000000000000000000006cb00000000000000000000000000000000000000000000000000000000000006c200000000000000000000000000000000000000000000000000000000000006cc00000000000000000000000000000000000000000000000000000000000006c300000000000000000000000000000000000000000000000000000000000006cd00000000000000000000000000000000000000000000000000000000000006c400000000000000000000000000000000000000000000000000000000000006ce00000000000000000000000000000000000000000000000000000000000006c500000000000000000000000000000000000000000000000000000000000006cf00000000000000000000000000000000000000000000000000000000000006c600000000000000000000000000000000000000000000000000000000000006d000000000000000000000000000000000000000000000000000000000000006c700000000000000000000000000000000000000000000000000000000000006d100000000000000000000000000000000000000000000000000000000000006c800000000000000000000000000000000000000000000000000000000000006d200000000000000000000000000000000000000000000000000000000000006c900000000000000000000000000000000000000000000000000000000000006d300000000000000000000000000000000000000000000000000000000000006ca00000000000000000000000000000000000000000000000000000000000006d400000000000000000000000000000000000000000000000000000000000006cb00000000000000000000000000000000000000000000000000000000000006d500000000000000000000000000000000000000000000000000000000000006cc00000000000000000000000000000000000000000000000000000000000006d600000000000000000000000000000000000000000000000000000000000006cd00000000000000000000000000000000000000000000000000000000000006d700000000000000000000000000000000000000000000000000000000000006ce00000000000000000000000000000000000000000000000000000000000006d800000000000000000000000000000000000000000000000000000000000006cf00000000000000000000000000000000000000000000000000000000000006d90000000000000000000000000000000000000000000000000000000000000700000000000000000000000000000000000000000000000000000000000000070a0000000000000000000000000000000000000000000000000000000000000701000000000000000000000000000000000000000000000000000000000000070b0000000000000000000000000000000000000000000000000000000000000702000000000000000000000000000000000000000000000000000000000000070c0000000000000000000000000000000000000000000000000000000000000703000000000000000000000000000000000000000000000000000000000000070d0000000000000000000000000000000000000000000000000000000000000704000000000000000000000000000000000000000000000000000000000000070e0000000000000000000000000000000000000000000000000000000000000705000000000000000000000000000000000000000000000000000000000000070f00000000000000000000000000000000000000000000000000000000000007060000000000000000000000000000000000000000000000000000000000000710000000000000000000000000000000000000000000000000000000000000070700000000000000000000000000000000000000000000000000000000000007110000000000000000000000000000000000000000000000000000000000000708000000000000000000000000000000000000000000000000000000000000071200000000000000000000000000000000000000000000000000000000000007090000000000000000000000000000000000000000000000000000000000000713000000000000000000000000000000000000000000000000000000000000070a0000000000000000000000000000000000000000000000000000000000000714000000000000000000000000000000000000000000000000000000000000070b0000000000000000000000000000000000000000000000000000000000000715000000000000000000000000000000000000000000000000000000000000070c0000000000000000000000000000000000000000000000000000000000000716000000000000000000000000000000000000000000000000000000000000070d0000000000000000000000000000000000000000000000000000000000000717000000000000000000000000000000000000000000000000000000000000070e0000000000000000000000000000000000000000000000000000000000000718000000000000000000000000000000000000000000000000000000000000070f000000000000000000000000000000000000000000000000000000000000071900000008000000000000000000000000000000000000000000000000000000000000044000000000000000000000000000000000000000000000000000000000000004410000000000000000000000000000000000000000000000000000000000000480000000000000000000000000000000000000000000000000000000000000048100000000000000000000000000000000000000000000000000000000000004c000000000000000000000000000000000000000000000000000000000000004c100000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000000501000000042ea6fe02855d8c72905f35f08604467117c037962e324c9a793505138558b3700c94efd9afe573212f9bf596ca3a4b42ae57f59e670a7cb5b9440c54bd8ea2961856bc4892b0b3f156ed2aa87463c389bfce0fd675a37cec77ae5d753fcf593c12f9d3f397c2edc9e4a6a5e485641163525ca802e3bd93994af997a9b9a44f98000000000000000000000000000000000000000000000000000000000000114041414141414141414141414141414141414141410000000000000000000000000000000000000000000000000000000000001180818181818181818181818181818181818181818100000000000000000000000000000000000000000000000000000000000011c0c1c1c1c1c1c1c1c1c1c1c1c1c1c1c1c1c1c1c1c1000000000000000000000000000000000000000000000000000000000000120001010101010101010101010101010101010101010000001012e5643e26da426570dd999e0e044e5f83d60f3cd813c55059bc0ea0f4a7c9d413b2d2cea949fa0876265cd8eee3a4dce1e243783562ea07e2de537f469f7bf627abb3d4560e786bafd52f77ac52dea36c50419f32386567bd969b0c38e1bd7405d339cecb99fa74bfd631917f965357f0341d8c4dfe6a8f4b621d8df54c82941d560ac24523012499eeca2594f20ce238b7d21b98ad5c638767d70ee05532c2183e6d64e69b005709dfc4771c7ca5981adc54f3e8bd1b00222461ae90e44eda2f1d4572fe0b0b23100a7ea6d4780b25e826e41ca9e71897e010bcb218887b3d036d44eb30a430b5cfc6660270eb5fb7f274689ac73dfa53ba9d0739fe38637f01f7130af8c5888d4c65ea68109a1d58fe8d7d1ae62098857b0a3a3dcd393ef80ed8bcba6eb5e3b4887a32c51c5853b97a5eb59c87c520f36423c6d7be06071821ca1719330de5e3c51a521778b49cbbc1d53f8ed42e0562bf21ed72e8cb9a410b0e82ef5f7276df41353faef675fb408aeb246b6e2f704cab99bf28d1427e7b0fec7b9929c6effdcd045d3fdcec1d1b73faed495444699fab936630d69b519f0bf4f1453db36439419dbfba703b849d1aa5774fe9a5325e5bf3e7cdda9d1f7f2a9c2a035c72fd4a3e383306aff03448f9accc08a2c665837560cec8675fe2512bfaef35a8fb7df08a81001a7fd4903849c0371dedd87f31295f46269c5205dd0000381000000e00000001bc000000901bbbef3c28b593bda223910c4da84390617abc7bd1a5d9e6abe699a8d564423d157457f7ffc6ad35e55fcd080285d1f8d0e4257da98a610cd038d08935be90b454d2a167cd0dbe7c7fcabe35baf98f8b0444d1a95109d8af1126716859446f94e2fa3e9223158fc00f0238c4297cde400cc585cdc952e4a35987736f5f0f358afc2c80a9729dce95e4ad6c99a8049496000000900801e74f1076f4059a5e29ea28829c5018b7ed6e2c13088c3ff4afd3d1ecc7195e53056d0b372de69aa635b1a1e2f390e2eff2c8efb57445a53e4ff7c27677b3dd5eff583341bc4756170e27620b1ef01734b72ac04880ce64a043ec11cbee86fb54f25dd38f6da24124b8fcd0e6501f1243520950ee37e7711b13383b83a5670ada6faacf0b6ed63149ff7274313cd7000000903d789416c844dcee48a0c06656977e98cdf7b78d890602ba364c89e5c75244c91065944e7eab2d653ecf36240dfc8d45a57fb12292a1231fecb1202ae0a0448477b3c45bca7f816ddb57d6388cd17a3f0aca6923244fb0b379d6a61ebaadfeb9cc5a5e4581c974556092bf7142abe87e0b29e6f1b99888449e0d7e7ad682da12c1ee264c51ed42667f351deaf078cd15000001bc0000009044c89f4bb93b937f257264d2d760ca5e2b3d4e92cadbf7a0b09abfa46dc22a7c8ab66e5a4ee70b69c0c3a55e9af9353ca6f9e445c7ce18ba203522b28057392622c7cd856993730767bc396cf7a7842e17b72e2da6b614c3a5eb3b758a8c7fde084fc6d1e315e86bf88a94974c11422007441bca51c0fb5a8cd9125a17deebc8fffdb62314c51dcdef8b0b911bde617c000000907cf318c159e037fceb65d69800779afaf4339456ec9afcaae830041a65564f0881e7776057fbe9543a8e2bc51a479c7995c2e1f03aa28f5ebe082bd419e6a4a0f329d746372c844b38f34f450215596914425fdb872988b458cde3fc19afd08806a58b565efc6ec48c2d8be29650150b0f70ab038cf8dda8ecd0d30a1f489218343782affb54aaf0700a993fd812279d00000090391336dfc5cc13c655262457ad009a6dff4a4212be26875a99ee84800b54d454204af0a6685988b443e2d8a02ac61e87916c6f33cc31be2e5eb6f0fa57cac629bb9748d4cab7a56b06e832ec134c88871f61fdbe0ed85c9febb31a9e7b57d1c0fd80c64de3be0532710f8a0c4b6e6dbe2b4731ff0743916951f2cf2ab02d2b073277afa45bd8549231b5b4882cc21574000001bc00000090d4c0306719a700d2335bfe386a6265a26593dc3b00ee3decea20df454464b378b308be6712a79d127dfb22087a048606db264272dcba52a6aba8dc8f907b7ab80d84e5b19b8964085616a3dba66ab55c1f26072b93be3a2bfc1c1dc02a1934b3bc77edcfcc6da9e986db080cbe44e1f02d26389d239f59e89153c403b7121172d4cf25ee5a4f6b334d241e9476054ee800000090ed5694dc14fff5bd9e60c0b0e14631a67728efa34c84b00e23d247589a72c454bb9100a8248d478698f1857f358ba12978163df41f2406568bdbc16f77869395f72890e3ec965f094ba3f2e394bc3854074d4daf022889aca54819148fa933fc708f6b94817cda4126a24c25269f413014232b411c83b1bf72acf16f3332e74ec71b725edf8c14df6d0fadb866051a57000000909550d05d0953185a5a4734d57876a217b048cadd73932617f73c8385691a7528dc8b86244ac48a97866c9ff07c03b4ae87647306698244ed38728b316b5a710162484cbadca0a193e062221e22667f171ec129887f420216fe57d9017e5ad95e656eb93ef18d4bace9845f3933f365a126a47bd5624508828e86be6806b7d6f1a5901802974e1f5896f38041438be007000001bc00000090bf2b3c0781fb59f551ccda180921c7fb59cd0b3fbf3f2d08efc03e329b6186aa892764af52466ce12801f5c425ec10bf740fb24d9812a70d9253481db8225be7fbec76c789a05c5a05ed9ae4dae23d88158f012ce177df67198a930a5cdebad4b91c0fd3ce0d2424955f9168649dab4b0673adb98f3eee50ad255054258bbf19e4c074211652c9e70ce90bc2841a3c6d00000090f3f15a62c34a9c61c7775a16527cd2ceee25ba7b4f6dd174c15dfe09b038c4097df4d2fe97205939ee1d383c9de219b35f296e1f9e68377ae5f582eb44eca3a57280ed2f3275f1dd09c16b32ac1158de21a791fccacb346e1f10c3dfec72bd056984c97cb1f65e093de5dfe30aaca5512b65720c7e95db495d49128884c54dce2dd1201451607bc34e0e9e61b32b163900000090c9303074fcab34ce08631b5613015cb573f8bad3245ff941e061efcf3d2bc98e75f13fb9b026e9fce34e970109445a58077664136392fba1756b28a98576f4a6dba24c19695a5b7a092d6aee83678ac802e48a785b7973b0cec73cfde3c755d8e6a29da5aeb45da94896e8ebdbaf8b22042cf1ddc4ec24f437d9a29bcbeb851a3efced101ba9492574aca98d450bc475000001bc0000009066ba62c480fa8fa8e997d67460ac659594e5acf3ab7f39efbc73ec56a925253858ec11890572625f66e1718856dc34a6773d912465997eb923f2b0951238e77844043fd70e967edb63a3b5d657069c4e04670858748c1dcb6efecf0faf92124b97f0a73eff226715b0911a5180dd708d0a0d072bb2d7c2dc29c1ba30e89d0caf40ce7d9badf83d0894c347a12cfd695400000090b70a4068ec9a281b1cb28c85b9a57aa39cb39f1ba8475b196d569053c09d179ed7bcc57f2438e66f4a6ffa160969df973444f04ee871d5f8ce80c5a2ab783e3ab7b042167205cd81e5fa466475c7ed94027f19cf3771b52de1930b26273d84392378e19362ce087519ed6514233c929b1793f7e258ef1d8b4d8d8071cf18cbb4e6141ed183600c67a5be242acdca3b86000000907baea0cd6b76df2d47201f6c7257e915ad7dadc9e1eaed8859c68c1e885467e0f7dc9a2b6b0069305064b274e55bfdd3ad5683188b423792b6ee485ce0acec288f4473db8e1407187e3b883cda868da32ebcb8e0e56e36d94a5cd04ac5fc3d52dae466abc23da47d6bdc5b73800bfb760ccb9ee2e47ee6dbf512638ed0d110040202fb7e0d20c91237a4f76c922367eb000001bc00000090435a77aa1a5067c65b865b0f099098e369bc09b7466096ea97ecd5c7dc5858eb45defaaf2989274121a0f534f88191da4d3aa801fc7fc1bdd5bc0d262b1e0f37ec62db78889a90ac6671ea990ca4f89e1be694df56aff7af48c2432503efdb1f455885e0ab1f44feb1739d7e0b0b99972af3d27c0af462ad11773ba13816873ff68703bba334da82b1d20df328e821bf000000901e55e15903dcfce5122f315ee3a694608528aff4bdd9f73a8b229cf87f709a78cad350984e664b84e19cda7bb635a50cbc1a6cd07011ca9b17735398c44133b8c723323f1b2e423fb9d63e074e4afe210f479d2da95001a0e0c14bcfafb39095ba68a06bb54c11b4cd4322b7a9dac8471dd5a4fe081c21ba23c3ea6f38f900f03144a15654dadd90c6df53ffc4e9879000000090e6f7127c8ca00dd089998aaceb95832f9f6fbb317287e7d91e09f11ae8a616b0d5c1093463c3ec28ab7b9de0d78cf306c48fc0e35c725a42daf1259484f06d0d0994aedafc7e79bef6d8a14cb835a8af282a5b621c67d4d51ccec78db510f0ab6a70f33d17ec8ade77d45cc2323d0b5a1dc842e9ee6d1fcec7b59dc1957bf7a54d7bb64e7e5913486a186bfb733e5623000001bc000000900daed9b24c8808de6caa0ce94faf29b0161f52a6b6e753d60a6de14382e5543d4f548d163944f4763b35585ade6fbd461d2212fe452779b7080649631d08da65bd450235e95b009e82e7a0ec6f83b2a025570d446fec4fa9ef7931ff02d8268db614e2bd39bbefe1f1cafc27d02b72301262660cf9a50142a90777fe870e5fbe216b736a1626ca98bacec9cce71b40e90000009016a3a084d4db5e21a9ddb2fa8ea6bbf3d1c8a047ccd7299d7dce8b2965a40639f54524e4708c8f3c6b3d68b965b198056691e411132ad001a5c3f3e47b2cb79a792611ce383e4ed6fe76a980141c68462c1de6452357d4cacf986f010f75538916b9b3f6226661a550bcf45c1643b5ab26aee38d8a240740d17b64983c3a697f372162591f9cba336795ff6e771dfd31000000901832177024c659e403875cd3fb6c9b284abb411bbfa9fbe8f92d0fcb55181837c651d9bab72e4a70319f6719ddb9b8de4d0a1f55b2f0bee04ffc2e2adb30fc52d5e85ffbb3571f79ced6ea4c2a01acb50a5149334461de2636c59da982066b918d2beea8b4cb6e4ac43d8b0db00e6a1f04d9efd02aa25814d4aee406a81b6d476a8b0a41d118eac19714a51df358b9d6000001bc00000090a3f3f06a4a96bb9202a1b3f1907abac5bba7f78117ff9b1aed42fb43b1cbaa4b6562f7089868c0b1e434bd36f2dfad77db1b249eed235be3091c20382cb1b1d679458fb695fcd9de0b40454f4f31e24f0b6766b52e095f579bf859ccba46e0b9141ad9a5e2deb486a8e4b69e57e1ac351c40a85b3d32a46f41c366080204cb90c11a2a4f69318317c1339e1339baed730000009079bf57fd182085d21ff68c3cd140c7175c02d3bb3a629f524401ba84dd20456591632f6653b297cacec14710a34b96833e134d848d1ff827ec7071ae67d7fdba4e7c38b23b1eb354730b23f26c47c1f31e35bf639491ed74a38ce136cf075f9322c1714d7f1d0f54d69309e575f4fe061db552b171f53f1efa8656c0e7d6cf6e615a22c666cb36fbee3a5e50fafbc5fc00000090c5a6ef430fe31e17b99f59245e6a6579d1b754ceec9ff1c517895c18d50736b0aa71b234d25be15ff15d3d4c72f153b4c89ae1a2fb6abce065f3aa1bea6a7310ec52904a93230ed524dc4f145361fb28299b9316d827939971374540bee274ec875613b759be66d9edd3339d6cca30620e06f233bad277a812eebcbe491003ceee38e0759815bb0c02176bfe12d63a3a00000e00000001bc00000090dbd592781428d455ed39dc0a07b9ef4ccf58122cb55c07417d0939db32f1866ea0ad8ad899923219cc8db4bcdf752ef90945ae69d0d6a5955cb26e761c2df9f0c414a579f681023f5e83be5e7fa190fb127c3babc53a4cc2dd852580d269d46d21914494e25acf5d3375e0086d5a97c309bd8e92370b80453715cda7cc900ef6efaf62118c4cf5bd7825a173e7e609b00000009066525a088ff7c589c94eeae66f8fc9f087b188fb791f53a5c817550b579a936ba0ae9ea3fc068e776c07ffc0bd3e0593cc82944b3b8ad5cf56c5fcde9db94845e2b04e642c0f7bc247619f69f2660e1921f7ffdb11a80108f64640c810e1e12f1ee907f247b47cf7a183030f3b8307140dbb5ab35f8638c1eb82168428deb529505dd969034f149271a54e1b2eca53770000009040c4b147cc2db994b92ff6eaf08902bb22decace8884a9106c10acb1e96222a7a250f775e3ee8f5829d89fd2d138e03fb5265ec0dbecd7c6dc549b80e1ff76f9d5f8aed45c6f3d370ebf6fe146ee7e130e24ab11e5a2533106fc6d294cf6fbebcac388841cd501264ff7016f0ae299902f2eade2fc2ae7effa8b967e7b5d6b98d83eacd391786d17d257916cb0452948000001bc00000090a2f86a906afe230c158387a588576e4ba5041c43217e5b5f8649a87a73775a3452bc3bf4e21757e53ffeec78be7359eae072956c5e635dfbe3d3e476c958cc89a22e26f5439e9481cf634aa107588f8c11e8fad4739babd855402dfa419e08b030d289d39a45d3cc7b1a865b6115e71f1068eef4671c2f7aacf48acc527df9944b52bdb870b3e9204bc8698754f35f9b00000090a19f37ea68c8eae603f92aafdae814f19be15ca223658a00ebbf284e22ccddc90219b78f162ae17727283c2869d4a1cd39a1fd7434d0671e840700764fab02a023805fe8c7b9eee4e445a63e90f1f400079f383bdb6b0c6257239de9f49fc98c77ca46a5f25a7906345ac830bc5d0c532c5ad56c4ec7c977c39cb3e42a0077d6eb99180704f7249706324c3e3b79760d00000090081a6685395e9c95e121c4684fdd7b01f44d3efd15c56f303e3b7be13797d3b0fe79ff63de67d0c0d97e26ac6461adb3feeb2b4904d2b7b84635e9666c94a3ad2a02f237e0cfed044c5a09b9b65d2e3d0a828adb37d6b23ecc03eb74e2b25c71282f9710a575907c783266b634f5bf3a07453fd656891e21f0e2d2e290a8a82a2a0e5082c7c760ac6a2f5752a74d538b000001bc0000009038865ca967ca89cf35550d25f27c55e440803f4f8a75113addb9c1561c2ba9c81d0bfadbb84e494131ae3047155080ee1d21de792436f33931bb1a699f30c8175a52d9883c8292c6b724ad9867f7cc95295e8c7dbf2f37a76a8052f0ba31a3ee4a658b34359a18ce2104030f878d6b471ffe04e5f74ef661784940d2090c5f134efc1248966629ce8c8411713d1200c30000009023ffd451a6cfc3f4ac36e52f5f312d48704c6929e2ac77405207c24fe1c6e3c291ba592b72614e64f0478f22abf9e25258c7d8f8c992ddc11c991ede410dc14aff4502ce53a0c4c055cfc8151cd96e6306e686af7a3ae7a36c0e977f993a447b87b1cc367d878aea89324e2a3ca398070598b8829da2a2d244e4783d7c1690a9ca4b23528d687cbee85727608ff09351000000900efeb2408af27136ae0e7958dfcd539495df3ce594047c02595a16e38c702a19f2de7ba30b62c2f14a24f29641e2a09c6dba588540caf306ce1bda730fffa5c75d7395e29d2fc222f1705d00de7a19912f2caaace096cd2c6c6a7e7d7c964ae9917563b70a02fdb678a1407c734e4b180a34d98d64cfe0b946598ce5b569fd79656b98a4c87b0700edc1c64ad7d6dbcf000001bc00000090e5fd3c365b22326ea5c0a5dc9f19a996922f7d49aa7313382808187bc060c5b2e015d9b65e23f837dabf320de7e523d0eec069eaac4b1b6850dfa41bd9636caada69d6f42e75eb17fafbb85fdac13db006c1c9bf8f8b254847c18c8e6db06233879d57a21d420dc3593883287540b2cd09e887a6b83d313cd4c68056169e1b7a1db4897cbcae8604fadd6043d904b78c000000906e60255a6adc6580bfd9781f620f4cd13b5c681e9eec066e60b5d785ea84a96a234991ec5d3a57fc0e514e35997e2285ad8074827dce5fd0e782b21f442d353ab072a5d5d2366c3938f1f45f6ce3334f18bd29ef0d97844498c73a72929b72766270cab01c339b412c7832022cd6fa3621729a1a65fc36a97b929bbf4f70ef03aade5df05984a381a6bb62423d9648910000009045a199afa36beb3a48d8a261c43be660020d24d8265aae53155c27b41a4af7780db55020f443c91453ba6a859feaf41c9213db991708737f96a117082e0394b0e1088881d99897226f4dc6038a8fe76f21672acd1a17cfecc99eee359973d6cf8b2a283b5b1b9d27c38c18ce6c232e381fff33e9693fe839214d25ccdcf1894e961cd47c26b5fd5b771886f11db2c228000001bc00000090c43ebc23510738502cc9d8d299fc6478ea4c47a64c4aee16c5e14acc4fe5bf0009bf12f5983cbe03001a26b6e94514fd8101af523a444553ae827d173648e4c8638ad55aca067312a233e0e5ae916bed23a2e29585e3934a321fa483fb663b4f99a8bb77d03a9b02b78e76cb73dd3f0e0837d389463f82a99d5fa64bb66a9508378165f6fe212ad61e7f8483dd56071900000090e4b084e5bbb7b4a8a915e501839417eaf2dd878778adc46a68bfb88e6cd4d2121b1855b46ac48f6046035159b8d3d52359baa8d9f8d6287f270affcd3de3f2ce287e2f8bd8011d102a236cb0bcbb8a3d0e4d309c502ba8bf058660cb96ceb24458043a9db9fff459631458c5556d38e51ebc921f1bf61d44ddc3708ee2e8f5bdbd63c290b7eaa4927d62154937e2bbb600000090f1b36fa8ee796d9caebda6e71962013059ef50b948e189bebc9cd8fdb7735d12cb2d06fc04c037ecfc9b2d25ea08c466bad41d97c2aa5afadd681fffd498d8f12c489bee322d45dfdf1dd372a5e99fa2104c4b82a0c8c1f636fa057d6af53e29c3b232a4b5808759ba4e6b75a58e77322acf78e038a4f93f8f27432abb0deacca30d89d4bc91f9548c699f2ba7f96d74000001bc00000090f1f30b1b3dea88a07f9a0d1e1460a44f2b108b8abb26e585667a903e76f611e4948bc961565171240a0597707a8794c3420ee472d183a524f15ce18d74e6bb7d5f6cf2760f947b5d09c1f50e7f2da577037302b7bc609c1a4695e05a5de05edb1897eba85ac8a1fd7dfc65a62ea5e9162caa7d34f0291a203141e491107bc25ce569aafd1efa5bae2888eae628942556000000907d03856941a006bf1f744b79788b7a0b10b5cae5bf12607544a0cf92d2893db19c3db72a259e653e30e350c80fe1e3c75f0cacf10be1cc93ccc8ee4929f4e13ac333a65c8de2dd8e977b7b65f31a6c38231fdc667d127e71a70dfb8b367549b088fca435214f93e14702a5c66b3ed55f09a1a72e07643cfe14404cf368a89052c537242bae76d558a4c8d3e9df5d0a220000009036b041e9620bd12e9df593848a0a04053bdd55cb2db4ce8cf01fd8c76d893241e2900b56bf981a650eaafe652c08e677ead0d6e9d2c00ea65f830f458f18a2f20222fc7701fdc7e1575f01d78a6f654f21f23148cd71e58956dd66263dcbec384d76fddcb46d7666ad05f078776df83a1c1335155258e399211a697582e753ffac410e0ae79647174e62b01609a5f8fd000001bc00000090cf68f9df45aac4e7f963f64a78793d1528e164bbeb92a5d20e1b1a057902a906760dab6160d43511bb6fcefdd10bd9bf7262d121240c6fd13b55cda7c41f9a96acd8b39325a4b45d892fec8b707194b3266c85a95edd0aeb9e54cdc8f96fe8307b70b0c69b1b6a2221f6718f05c8dc2128ff75437af4ea76e2229be1d6b4c2d90488c1399ff687909a53fe61ad2a6b460000009098ffb40f8c4edf5e8215483c482b55d32228948e988e2447a773a5c98edc009d6b19741770908a1d8cb32a5b21cf3d2b557d6e0a808398176f6ce2a60730eb992e794d57863359b7e0b5874a73e78cc40e0613e88d9014fb9076f12c387655f1127c2e66a94657bb07df8091ea93165b1b0a72d2d55a520004f56c6a780b92633a8dafe39e0fa16c3db586280df813a200000090f6873fe2138107349532a2fec977c59df9569c490f36d663b77973853261a18f8a759e64447e95008398f3ac3ff24b3de15fe53b059299e940bf9cf032dd748a74ca086559ed1da57191f92e2294bc55013fa4a82b64528c590f2dae6683ae4cf53b23efd2a5e758e03d8b31ece815b01974b5163801bbd93869933afe723c7b7e969659a83a30846e3e9487da54dde0000001bc000000905bdfa911b84b587f383d54c009677b2e7325b51c6630acb3002dc8675b67f3a0136323bc91f1d349a544ec4997315089c9c62b6aaeead058e2b05d20a5c0208148bc2702f2eb83cb3fe5e13e2d3bd56502114269970ed0c8e37210609aa10058b8e8d2b2581450390c69512908c95d4a08fa3134fc3e3924f3eed4924d18efcdf5b78b750425245115f379ef1a5cb6b8000000908786f914d1d57927e98c0b81839b4dd874ca2faba27ad7fea64ee53e9ea40336b77c8d0bb664bd50fbc772879cd50bebacc6884dc46bc956df2f0f6427e7a9e61f8c65bf240bc009e1590bc5a42966b9199fb47e1a1940e75b3fa788054ad501e6ee55df308778f20f005608edd6715a00f78529fe00f27b0dd6a331ad8eb421c6d1b4fa9c509d0d83b08b752dc1789e0000009098f1cc4efeb0223b0a9dc2519d7cd2129372286f8dff3f166ccc021bc108e16693843a031d69556329c8c92896e8b19280358d4737965acc74d2979b5977571493e9eeddf567671feca0903fcc71e88f210f93a807bee40f0a26dc79a326c68a81bf4b6c70078b70eeea437ed2eba1b9201ff4356e502ccb68e406e3c39bf0768165fa75195e523acc7e38dd74589a7d00000e00000001bc00000090cce9d87a1a3f39d3d328d1b9cdab679ff43102ba3266ac6651c893dc27b953d68e6642f5d907a7f9619643fc31733c0d42bdc7c5cb40fd7c640bf0cf8aa7dbe823547212442de4eca49cfd32d158f1751c50e6c2214b43a84a562b70ca69182c4cd5e23cf60596bd6b573742cad39ce6162c5f88172f144ca967ff265e10db46939134a34f51b9ac8cffa73f5f5b033400000090c8a8828e8ceefdd4d3240b7d98363f286f5a5b4d5005eae09e3a572dd7ed4909f76dc65675e4cc693a102a9b9ebac9b9daf50d9682132ecd2db484d14d835913d942e36d60759c55204b3f0d4d60370d0bef6cd6727ecee639f2774d4e8c2ba90021b1129591e9282ac01c9ea89136701fbd937e7fed39b2a66d1221d8bc9dd86e83b3fcce73544c237b6d26100f07c3000000906cbc0e36409a0d5a7860f484ae9432881250d1f07f5f490e358dc8280ad21de7d7880102c1ddc3c129e3d88857b04f0bf0ad962f1e0afc94e66637234e567fa8567774d74b8aba48536c89de4bbeb2091e8e5b05e99fba07aa4d3b06a58df8d17113ef48e320b39b58c0b5c1a88b31701c1210c03ffc54b4284c84ff319f649e20e4cacbf220a04afaa9e8d56e6b0533000001bc00000090a3a4c4cd9264e8adb53b1db7d5cff25e47f5d0cdf1572d9f4c9b8807dff3ae2ecab2bff9f2f8d039a956b789945a3a273d527a64661effb45b111ff286986402b6c7636a24d24938cf168d544fbe9a21278ea96d43d07535b77a0b743fe8933cb1e2c2ee72f576c8b3b0cb233118671b2df70659501dadc6310dbe7cd7b40855d4c2fd90415bb1b5ecbc7bbce3b2124a00000090cfa70b1a20378939334ce8635732c6710849073e6246d026a3bab1b77815cfeb9c21e4ef75668b8eb9c155134d19c35210dd54b7e161bf6db27868dc8b403aace16cd81a44f9f0e67b3aa4a5191f2a4d07ba853e5bdb2ba5e1105ebd92b5e78f5b33ec0096928673a96d47fb5ff4a94d2d5c03ad9ae04548b47ce472cd43c72820bbb574a28c41e46076a8ae7c32fced000000904fd16a18080b540a0205836c75d7bbb808c46cba1a56136a3ad4e4a0755a1d4170b13b70c65b2554b78ab68dec8c29129e977e75ab905086a65c48369da7542f625c0bc60b48dd11196a252626c787471eabe965ab5b3b6253451ad3ab8fb1d014642d949e00381375233f7f3ca42c6f202c037673938d7b2a444e8851fc6acc8c003f101461c3d6a69d2c8f13108895000001bc00000090186f6f09ae419a715dd70824fc8ae27bb97263d34452cdd819de11ff473e5c6c6eb39e5d23ca56be9b8ac3137475509bc5e6b66d956d3006bd8d6301ae994bd91759264dbbe99f86463073a32329308f2f2c4f47cee9fbc9c4eeb852a7cf59fdac80c11cf4797683af5b2d17178c7562138322cd7279397b66e0a70ccea7d3f972ba676eb9780fca53ba97ac00afd284000000908502ca2631a9ed3866618251aa67e6638979435f627bd143d416f7923608f47675ceacde229ecfa719edf0970862116ebbcdca48b65b41cb8933d9932757ceec21ea9edecbc2cb7071981f3583456b200b3502dca0b7abec81f86847ba29adc0ead534cbec6559ecfe23755eec3eb55018c5bc485c4da0ece2cb70a225e431a56b581da559fde1d54d4007889d0120f400000090da7dd9e98cd55538f1f524e3f807647719cddbf2ab303912a431ef953706f8d2300fe0ba8670e321b311fe42a39f32dd27083d4f3774cb71687f62dd05399e38f7bea8b6874b5111223353e515d484e126c01fd2a55fa17119c04749aad4d8513184fc7be79150b525075a6cb92999630c62a0a53d615e78a068e1e7b53081c0eeae206b4346c11cfbe062606ae066de000001bc000000904a7db38800f51e278093de082b9f7af9d9c03366a3fa38062f1871d2f72e6a3965cb25c30c869eec5239757da7c91ef7cab96ffcdfd7517b9eb74fe57ca61654b14388dbcda69a74a255a32db259a61110598e0e1cf5f027e539f080736c4da310c17050b8ca200088cee055fcae41f00d449e6ba7713c923fd78c816c87bd9bbfb103870a268a290bd92077a3cd95dd000000907a10299f4454d75b99fc1e996feb1403d7aad5bb4cd54286a09e5b48fa1bb40487a8947512475ffbac9498cf658e04a18b17592cd2078abfb5a51309b7b55bab91c7eb0797e8ac4ba984643002cdb24a09fe6d95c5dbf4c74e49dd645989ad685adacd6c3e73527181cf8a87421e0e2400b010858cb15981866a51fe0f0ad3790c7620c8cc09e2e14403009a630512d3000000900e324ebe3e1b3480b1bd5557ba407dd932b3433e2c4dc7ac50c1d6f11e11151e0594eba6b495fe92e70c4ac09f7bc2662b665962a2fff87a6313bfd1aa34466523720c771b0b7ee1c6de4a508984ef8e2c0d1bf2a4038c2c65c98e5d81b03e53bd5e3bf464c7502cb9dbebacf0f7d5041caabba854b65f3e8169c8678f279519a52f67f65ce9b3fd96cd57bdd911b7d1000001bc000000907b9211d9d748905a18a500eb6a6d6d1fb44cd87fd1c579fa7b3f2ae93ed67c4ef2c5f3090221bea2e2408f628379e2ab6841e4d573c7b0420b1d3da415cd15cbace56965f636050af3674fedf039bdb11c27a3900ad2c68dfa29dc96e5bc82cdab80bb39492a42111d27f1a3a2a80f37247ad11635dce04aa7e465e8c289906ae93e4b78acbdb83b8b8a63ea4aa27d8f00000090292512d8e7a449f67575e74127cc7a680e3561bff95c93e7ebf974d8c20ec23a13fe7a484537aae82ff1201ffee3ac73db8838dde0c843e0c9d528843a52c1e3f9d90427ea37a98e3e938898e9561b2d2423f204c10ad656cf160221081dbeb94a8b2ce0087c671d3b34c8a1e8dd0fa2094a5ac25ca6969e4eda160abcd6859ecc1b6f390d122d79113ef7e47cc5044900000090774384db97344aa33373b85fc5223d79385b630069f16683c497040cbf66e77b07490d72577ed5536547d7b6f9674591511f5b09e6ac88dfec761e7ec0211eb12fa4215f3645d60e9a846bee6be5e9530909469351cc8d33b081c4851c9ce9c021c7f5158767f80bae36615b21950194108a4389ad0ee603ac8865d4ad008568f5e6b823e79f6bc1b2e7eb7c66488ff6000001bc000000908e11951f7670aaefc054a27dc47323825b1cfa85f029306d29ad85c700fba8e18f151752fde95a490c62619b15067f66e0f8c96ec0da407a72607314877bee52c0a5a0c2fa5746b0d7b03ee9ca70507c128b1fd0a65a2b6fbfd87bb47f2da6c8b65376e3d4a25cad7eab946eeb3c463b1ae8d324739ba34749077c05c5d9246c65eab93c820bbf1887c31a0393ec3a5500000090b26243b1a62cb42e7847750990c2ef643f973b274378e21110ba922e1bf4de8fe7aec6f7f3d5229b4d711a505d4e569ef39c49844ec831a7db08c521e5f3050afe8110a40feadef8e0f7b3f5cdd8a06502d20883f0066bb7c3f5ffa522b7219e9c66eaecb97933213b0083f7f9d92e8b12b2765a4032554fedda5fe2635835f4d592f3b725852ff4015dc50dc089a9010000009019978bf34c085b4048d3bb215016ee70502114d7969f79550714b3776004eef96f42af2a275392364f4c44b07d65ce2200a654967ed504fee1ca30b3b24b429bd83a3f1ec155e6f3f550227fc568a4480eca115ecd27d94cf5e0340928946ec64db158dfec8a39dc47186afface68dac2aa91f4b412093409527d198cb62f1204a3516ce45ad0a325114adbe077c393e000001bc000000900fcb8f6b2a7edd9aca0dacd25918287fc58c9301234ccdbeea6e2c98efa1f4a081d99a19c81f9cf19c56317621fa5315409418b7261c797b458aac42af072cbcdcae95a2cdd9c256ebb355f05511e13b05654e468daf33e0c0ff921a4e5e98a83a3308a3a7e9df2569f6bb0869b9d6fa22b28708f4ff3eaaf7fb55dcb2baef83d046175f3d6b916bb5fb40c2ac55beae00000090b9cbf40833a7b278a00069ad6b1475dfe79d938950e4a79ced292beb450104066013e8380a643a9e11a41c86733b1b70c8bed1c8581cb6eb0d7c1b999c9da9b2651a6a1e986985c5713b252e8162043e1276ab664fd7f43e70a4fe4acd42fafed60d6cab69c49b16712bcadadfb0d22b12f145c5126cd1ff0eefbe5f8012adb565e190e86877b30053f34a9881af104d0000009045e78bd61ff3a6652036ae5e6c94584e4abfef252784e0c359aca3ee9ccde85fa8475edb4db2b588ce4d84d11d5e75edfc1fbff5e00bb1b947cd091eaca9cb62ae079f01f9bfb031a0419e46835cffe801802a1dda6fdc033195506f8501910acb44b98b5a5bd57c7281aae0c1f9d6c608b0483fd957398863e9d28d626fb1e35443d7e73caf2a4cadd9e934b6e237da000001bc000000901e07a96bd0419cb16bbb58afc41771dc1d21dac0147ab6d572567994b47198339f1e9224e733443eeaa653386b0694e0aff27562b8d9a9c28655c83e3f04d120efd11e3bb0d5491928ef382eea2427340a1d92e5f2a95315116aff23f783db3c776bce2b9d743a311b9db73696f456d402c7357569195471b065ffffd83a82334f24804ce5dfdd1be66c8d21714579620000009080dfcc8f7e455573b0f74ed0ecd7940c82734165110682467f4c4d5b5babf58bec1d23c69081d420397adecfee162fec22c88ebd33486a6aab4b30c9ed286bf7120f738e909db885b3261dd0c52d4bd31b8bf9bda64a5cbf1abd28db88b54bb2020d81f61ea868ddb41f002b5fecf72c2fee9dcc397605bde2d6491999305621a25cc501fd69caf4853945d87ad632db00000090a7fe1c9131a8009cbb5f8489995203ed56a673d999adc927668ccf9a1f21ebd2b7925d626dfab08f1ea375c139be0302f3dec1992e5545926cae1802c8a3b274f871296490e6eda05694ab7e5711c2c41c67654ca899137262ba90100be34e70cfede7874b240747f52149523c9c43ae09f5b7d45898d8cf3f13ec6edc79f324229d6bc8b6bad960251a774691154b5500000e00000001bc0000009050bddb89806c6d371adae059837278d20302ed4034421923ea862538112e31c6388dddd755f9ec9c076258dc83b84f5c8c683f1a83c7ae04d1723f094f751ad7adab8471c39681f6e5750e41dd37c0d929eb37b28ac642bfca4a5eda6ac1da2bc8a0297b9c0ae62b91f229d54eb21ab20ce76da753ad2b6206798cd64ece1ef23ec7bd050f07f24443c600f39b233ede0000009018cac018070a49a2e3f210338aeb63bc956831c022f19196e684c576455938ce88fc96b0639dd026160467daf4cf174243b3cd38e7de7a2385a42408ac91974d49bd58a544e5644b4f215c0ca76341cb15cf8311882fb02fd13665d2a3de7ddefbbd402795ba9907e48e1711440497830cb16746b0a566214dcf6c313a5c7233565b4f58a97f1640fb055c8a88a0a1a200000090b0f011a48c51a5163271f275bfaa54dd92507db9814793495b43590ab83b4b9bf39091fdee8afa438010a09c747e6f90ba9a31be6e9fdfcd66694511e816c097e8c9288d762edd82233ac6adf3cab59d18f7d1b71e8cff0b9ae7ff0ddc9d9e905236e5ba77876319dc3fde6eb611497a052f07bfe5d634ce1226eb49d1b087531387e7a7f76310c3db56f4e36aab954c000001bc0000009038c6e9887e83979ac3592844e1f292b2d5fc6c7044d5cd697b25c1ae62871ebfded8c6ca7974175545af8337d6a0a250334732a96a6682ea353edfc703a6d18d9c08f4a5c82c48bd983f4f2803c29a41276c2bbc3d6a0bc1dc36e32981de4363352d7f37628ee4c89c2b7bb1126068d82bd301d72a01d7d40757d37207cf8ee5c3f0f838dae508d5710ca510e8e6e95f00000090fa390b3c91805e660e73455231c9c14aacc5d89dafe67a4a8102cfaa6d98a2e1448e5ac6e9e96ff4e6f7c68132cdbd24f0acf7eb757b09c9bd42e850709f3aab441deff33d47d1dec941533a8fb7548d14d209ec6cea7ba1abe32a872ebe0661c35450492fddaab8158fc122225aa87500dad62e0f054dc361382f6390320c194440980eb54e15c79ad74510ff5517b50000009042dbda4df1899ba1021fb0b4d8c7df52ea339e849393bc85e1235ce79e9f16842b3756848d62299374ec2797305c1df4bd8aab5078be5f15d45f29350bfe1e639d9d2daa7bb4f6665c3fcd61ea8d3303023c4434002fe0687b995d775d2b9d5c920d6ac9763819a7c446de39f3aee3930aa6326ade19b7ff95a97a075db0583480862671eef1d5702b70f253345209c5000001bc000000907767e6fa5e52d4a8cc42952b523b33150245f3ec7806210ac990fcf39c5148e73e04beab8076e804d28e8a10cb4957e534538f751e1145b170e09ffcf409ea9e1378c0f3fe7923f24568605007d194a40419e53487bd072cb5363fd01c1d81a4ca6fef8cc9368a3ca17536c16443d28a0784fc56d85cee15131d0c054507f19b2c456626dd316d10bcc4764fe5802e7b000000907c80f7661b245f02bd3e5b605cdda50576e764ad374c12662d9893df3326634775b52b89a6488f3fa79100deab6eb5ff0444f32b1aa6759951b53e2b2b8cbac8b237dce13f3310e8a0ced3e021149ab8247911bcc390dee7bab5b0e8717eca05c149facbd4564554ccec881cccda04b301fc252967dee15cd0341a1c59b564224bdf98dd924625b394d7e61cf4a82178000000903de2a43bd8b8575aa7f5a73fd07bacfe1319b25cf3b58cff9b790bd460ca0d461181320458f35bf7def65f92e6a6c6ecb7ad47c590cca136cf0937fdfc049b8f77e77c609abb514a84b9be2f5f80097c2c1c6ac7340bb7c1cc4364a0f2306d2994b1fe09bb3a5bf22ba092d649a6e96f228e22d42b96235600d29c7f278f3129c0032c914df37df4033c31df3e4b8d1b000001bc000000907956f8c61a02c25812e8e3bd46ad37ad0b12bfa7155631a82a5e40574124e32ee4bb8447f2c7a642dab4fcf2b8b69fe7dc765e3746fcff466f8c86e61951b9b8c4d8c0543e6e2c2989c2a49bac0156f104a1562121d375ff3f800b4a36e7935962afd9c62d888774817e861ef353ad1a283ecc5bbb3b2a4e6c7b065620dffab7f2256039e7848d98620f7b6c3e9837100000009034c3b89d6064f9e51847c078742f955e2806343e19d8c4bb25135d5bf041a912b2de8fc2e7c6a5758969b88853a3031046698c379b1f169908ca1f993da6beeb27e23349820392a526efb286244ef5672494a4583e203976caa8f585ae175324a31f08115a1a895248203a323f2e8f6916301dc1f74ef24ac61bcbe4e224c2efddee19f87d221c314bddbda864a96c7e0000009037a6820a9758099dad8e3e32aa4b97f47ff62c8c193ccb519cc51265d2311e1d8b2330b094ec1c700b5e5a21437111f296ec6e16d34fe2f1a93219341e5b514f8fb5cabd840e5a88b58d4004065741f00c3551e0510d7ef3124fc69017952b70c265fa3514a92c278d0bd18ec88d008a2b90ff717be49fc26060fbb946dce6e1755861b46bc3e74462915dc878f79e19000001bc00000090ff8be2e57edec27485d3666dff0ee490962f2257eacf3638cc44a08333063526d42133196bdaff2c41ac73b8135e6ac5db29320af7149f8ce575930e8464dcc6610f93d26cbaab23618d052fb5a40b6d2a38d7106bc74563f889ba5353e4c5b2d1c7dc61ebea76d1460f352bf46d220e138b578aed2efccfc0287fecc1e2ca4edc9b656c59fe28d3f38f50e13c062ead00000090a81a22e099652a1b95eebab9167c1037f51757734664209dc166c564201bcb7eb8f2e23b1ba452500cc767c24ce993f48bda3a083216d6bbcfebe54167636513e0df3847bd292f4c2a4354f7ce1c32e10257789c196e2fd929c6a8fd916a86ec6df4286d2fb59215ee37eba102e2affe1329b912a4787c3f185b10f03d74cfd57f658bc4ec2de4a8566a8c0406c3901c00000090e9fbb5a34e89b20d7fbe560f945218d2166b624aee3a42fafb10bcb7dc9dbdeb58feb0d8cd51bb4fb1c77ce29eb556224b226fbe831b3432ff25e9e88ac5cdcac32239058ea46965483a0e9da48a022824383480c04a3c062dc801921c364a0ab0a46692654cd96bfef8c10f8c9d0d3e14934c1f33b543219b68f5d810c886314625b4c44dd85bda0dac8a14d932bb3a000001bc000000908470eb0b1f63032a6fec1fc5982285acf6676db3edb403f62780c2169876ccae974a1f1377148773daae76afaecc0c2d19dfc1f0a647ae3fdb632c88c2888332f4f8f8ae1b4731da08c8a94dc0e37a6505e0722d5111b362f15c3f3b637f52af2d0a3382726cc5b7a369de69429a27452eb2c07d46954ad6dec05c5d103b12a21fbb16b896b605178211986479777c7600000090d70fffde576fdc6dbe3a89182758b8254df6d4a0667154f6ef37b624fc1e82f7713971605390155e1f3a8f7bc0382ea1ea0cd2c66d51bea3dba5911918807f13a06224a2979cea0f5011c8ba4f4dabca082d87d7a9ccd3ac16714ca9381c2995b047a61fabe79f5437ad43c7e7c75d56061f8274a7f62f3fddcdd338fb39a1427308e72e5666fe1d2932763a9733b0b2000000903986f85ad1eebc1a7d14c6926d9476e474caff2ef2728a5d090ff9bd6c9a1e686f342c01656552c7740fad5512294afbd87532a709c934465fa53e6f63827c933ca8ad09c474bf3419f8336a483e38c513a8b1075e244814c3a5fb32d0c66399ea37e850e9789df63113cd76090343b71113f9e6c230b989c617aa38e741b25ea2ed75a0069a72188286b350e986c9c2000001bc000000906621f0b3d2c51329c50912430167717bdae7f1534dca7a9b63c0f16b53737640d18ac00e3231eca8d1fa712413b473d10795ba37c4acaf2f21f294ae611be7bfaba43a43a2949088cfdd5163e249774521e05fc2f65bbc60d43d95ac1a1671eff974307a54d6b7a87d050c92f7df112d0453c270451af89c462c9ebe5fe85f8e4d924ec6f6ff06a1f03c9f7b5dd2944e00000090178eb040c11f4ed2d2370a7843c5c5ca43250c0d6cff6b29d0b38ee2415322295aad0c2930ae600d35473ec4a0abd758d9aa01280b8b6f57fc00c0d88629b374743a5f2d37a96e56025ee60c6241782c02626d50cdf76651d1ce9ea774fdadb162ec67def5e30cded3a21d82600db29304a52079fd3ad18637b6171f21bff14f7e0fddb1266c78858ce863cc09e7ee2700000090d55f7d2c49bd970382e2749d0377210390e54b4fc00017a69a010e946e917fffafb211c46629ab22dfac113c5b8c2b21996e94f8254fc4b05d6e041bb55b022872e3243749f70706db3e43b42e4f7403175b9464d1821ba89eb5fcd98e6ef5bcbb6875f36833e6b250e8a0fd1f28eb6d1bd60458e36af25114af9bea7d3c655b3e4cfae23db5693635787f935c0686ce000001bc000000906db13c491fc66f1f2a0b0e987b08af5cf23edb15268ba7cf011568b2aaf47ec599c9a3a3ba79c5fff0a904d678f0aad02ca4f1d0cb0dc76c510161d0756fd27a20a0c3f417d0ac2ff4d8ec36fe14220204780853d3e671f1e69e66c0f8d9278c3fb5e60ce9fb8afad7202ca83e11209b27fa57bfab38c2bd342c1d5e8a3fd2c0bcf296450df7d50efe94f10e3a6c0da50000009031e13c8501de1867d9626afb8d730f170acbdb25c69473e2e338711f3af30d50ec3aad4ed0ea9346c05fb516068aa58ff98b9daf4c1f50b587d1d88a11f3d10f2e26aca82830974ad6c3d47c3d00714e059f17fda8cf86556c3d8c603b130faf6d84393e366e60bfc850ad8c806e39981140efb21b69ee915eddb092f6547b71ba594618f4ad8c56579604284ca0d23400000090cfdadb6b817b179cbbe5922525fc89af0973dfc73cae4006f0740f2bc814b1ffcd0956c526cc5d4f2ba7c1dc407a1546d002ed4ac30fe71761cdd39f01861b2908ca2b423b548fcab9832f6c561bc03d0b281b3bece1250be5005ec1eb757354719cc7ec761c6c7ae07f362ad90e80491e304007bb9b3a7dd58d00081dd5a2feca95043e85649db7ddab194b695b925d000033a000000ce400000128000000909f8f0e6ace9a2c85b0e1c6837bfe9bdfcfdf641a7a262f3864f4399e80cf08b40ac2cb0dcaebda977e10142fd70904fba55dadc1ecc12bbcf26e01ec54e69e6ea74628f27dd9c70a3e1611d284f8c42110d69d794fa40fc49e2cc697a80a45abef25d0b021dfae3b78bfbd4dd670240c11c71cc314c33edeb103e2b459d6f9e0a4b3f601e3ce90e0bb15f2d1c502ef5300000090b23e3e3687dda79a91b4fb8f55e67e22ddf7f915ed61455d0236d61823b95d169acf2c10438b9740c06e90ceda5954b1aa3be810d0aa67cbae4e902db6e2b64080149f45874b7487712fc8d5cf83e9f50274f335bda58cfad871da2677178381cc39f7ed4ee2be03acafc87bf74a4d372d19ec1c8f8e5c6771637531be0e857da95da742b52b10eb3c34673b256d0e030000012800000090c47bdeb67eb0203b950f0bb40c35e23189b5f2eceda303f3e40b5b05a5520b8feb644a875c8c1eef0ceb59f518026b18d35e2fd4bf614a074fac8ebbc3c49bde2ce67be47ba476da92596d3f9d60e86520dcf569a71311b4c7f349b9a66992bd8ccd99a4050efe6bbbfd2a1f0c5c183a2d526c5a4750dce71adb548ce813695bfd372e81f33519c3450871229ef8559c000000906a65a1f67bd19b746d79217567e8efd957563a9d2dcd22ea23f8ceec026ea513e191173bfbc16aad3a58f32cb2fc5520ff5437e744f20c7b8621eab1b6829d11c2c9108f5014c7c7e420aaca18292f57237e45180bfe636e6d6173fdd29750ecd2b23365eb745103f4a46929ad14f42b1bd2567e4155b0a1a2163635cee2051154a753bc063f028b321b002967e0e8e50000012800000090702b6f54058ee8581d5c0afc9c8616c274525a0e1ce6bd7dec36f741ff75345c1b212e3d07339b0a236a0f527fceb6e94c558b7b7de1c569bf04c686eb501106e74d492bb2ccd127d11b8919b969c25b1b35ee58dab892cc0af648daac3135d66ea4db63884ab597c178d2abea58277b0b8855c1957b599272fdcfbdf4047a05ff7fb14bdc18b69f0c41de89630e9e10000000906f0524895f94a397e8635a3b6fbcb20f766bc941a622ce0af677b706f649fe9ec186ea93d4da5fe2ad547677d2ed84b18723f05863ec68198ae2d2d8da6e30e4d757c3b03f5ed2fcd0600c08c3f46f72179d0cba043376d1304ae9c1afd14709c437184a6e7c4ddbcbe7d4e472ee1cae02909c3e671a109db5ac78db6fa93c8fa0f2b13d46e50611d7c8108c13e10fbf000001280000009050940efa17ecd2980f13ae850b62c501c853f2eac9f3f69f82468ccfcf20cb814f93c2b6db4fb508c1009d472598eb86da535dd2734f8f8f068f38c870823434794ce4781f9d9f3670da1e33f2ee9e610ba15b16fbbad5a99ef4d523c8d32d30f198f30bd6308ecd4fbe56ab64f2340606c858a88e8e51230ae4146d78f604c68c36354419494acb49dbb61b2f673cc3000000901b3e3f99917a643a515f211da068d8e8c17adcbb6be9c948cf16d95781badee521b289b3f56bfa1ea7f8ba149e012ca1fc54ce9b6be5d4d82ec3f2428448c0cb9f4f2458d7954d7ceb9a1a125a1e7c0b185a70fbe114b9137a0f5266e205931eace0d4a4bbc869c3b6e6785b7ed1378d05573a1020f03f28f8d01b09ddab509d7a0f250c9a94741ca92c70d4d889b6df00000128000000905f840884679560a8905c7a07d3c122c19764b9bd701591dfcf77a449c08daec98b0bc24e90a98191db9b60bd305076b09054158c626dd5b46c112144bee2d3594e549d67079a4364355870e95a6a8c440f7a27c6af7ea0262baa847dc4ef9945a19fed51e1bd060a2ed5187f616512142f9af3cae6bd3fb3cd9dd1af5756f4a8271b855d7b0e076bec5ee719626fa3c30000009076cf1896fdaa5784ac4b27ef7c843fdb9760e734f764881010a773cb8d558287c6882d07fc05465ac9e876aa42e6f162761151fc6ed48efe6ad5abbc1039898b4c655e0c0f62a963e75d1cedfa3485f92c7ec52539c534aac73cc4fbbbc9836c2e4f08002f7af1f8711af75b2cca23cb1929ef5578b257c43e9a78a1cd8cc8269f4371f34e9064b1fbba1ce2da689ac80000012800000090b08c78f040430df1a5a9f08442755337542415f5bfe2e9ecb1a94ef00c7a0d346d037df629667cf31e438e0e855cc7ac71d288798161948b53ebacf234660922e532195cc7e8a9926d5ed129bd97217a1b170eeb161ecdfa24c5aeae58ee9ec4347026f0507e75589d0088ca004c1231019e491eb908ccf83ddcbadf9be446b8ec5fa5ffb287bc85f8bb1e13beb66617000000903442e435ccbca2080536d45d8dbf4ca789802d596d672a72fc96f805f8fb86b40b31f4dcb94e4568ae28f6bdf097ceaccfe82b06d73b3292c2388327df70ba6270323d5e58c6ede284f0bbe6620a3ca219ecaeec17d9f49a9ceb34d46f833a8f00c0201d8377c914433e1489e48221e1225a97ce45f4721e35310a8cce1608943d9fa0e0c9fa937c3b62954358248b660000012800000090c8323e56ecab702ed7bc4a60606ba2e436b6ad8be22e985a1dddf86ce32a7c9aab444816441188aefac034d780909b74849d1470bf19ba1a3b870bff9020220cc97b43cbb0c36b6188dd0eae6e6f8676169a225a5f8559408cabae0c613e75424671f1897fc4cca34569e2fe02d85c672e9759b17a2aafdc7206590f8b63812ef8a1805db588e277c6cfb57005ca193700000090b404f05067f41cfa67274ee57679ee2ae910bd04cd0e643571cec23141c2ddb9fdb3b36250ac22c3967cc2ce8551d76cba516512fe5319c10948159bb0211a73505392cb28b68c8ca3368765ab98d01d1ce8fa71d5098c339ae26741b35812380a6cede0b215e3251edd4229e77d82a321a8a303f777832fe8a9ea3f4bb4f95ea62deb50bf1abaab822864587fc3b323000001280000009024db5023bca8979f11943482afda456f7b93e405844ca5eeb5937c73157a52f0e7f320eab961fbe481e96b5b8cdafc819cd8dab4331b6ad508b55f9df55338e4dd831a601780a032bd8807840c1b98ea13dd030f83696211e8e5ed737fff5f2b9e69fbcac36a83ca2edf94061b40bfa52bcdb72baea7a8a428a798de6d5a3c96051753be3b1c9802de503728f8d203f500000090742c7d963083725102b72c06708f1fe350327eb1c0ef106bd10e817750201e15bd80d8536d8529cfdc3e67bdbc96206a8c708455017ae4b556d637bf7335821d924194ebc0488cf6006021f9180ade2b016c8ae945bfc67fa805e4c364ccda6a741f8e8f28a543dcb9a06b1cd499d0c1187ecd4717414e389e5e007421b12934c7694c3d751ec01cee068c44db937ec7000001280000009036f4d4f139e83334efbea77c0e516da51139f1925bf9981d798509fd046ec775e2b4eed693249e82199ae189f3d82cf913bf64cdaea7fbd34b5a20f3faecec78bf3d2ba8505dd4cfa4a4e8d301abf2832d5d7ff1932e0ae2aea76c8983303b52c9936c584c5ecafe84b4866157b6c55f208d74c2528961e4cf4b4b95848290d88f9cddd1cea6d67b54fe39617a58413e0000009060fad0bb132545deb65c878b0ce8b544b52583b5cac55466a0f14722d476ce46fdbf3f564ee292ea64b977c381bd17707a6b06a5072de4bbd40b8f742d2d0385c9c7c2241300eed0a999b4ec744c71c209e75820c3c93add6e6cc5123660a0bfb4933732e8d23b7d3ca25cbab2720bcc14bd115eacf6349000956fe778f4048eb418dbaa5890582c959fefc7575467390000012800000090176107cf7e4a3c1eef79c8820f3a40a2dac02ce7e22b6c11c24aec8edfbdd27a078bb529c6e6e7fff3e8923a58568387e0894cddc199ab0f91858207c73bee7dc11b6c251d7a603ee309e6f15856d82f03fd317ca3d65f325b1d7b7f5f560fdd559d92879a59074f8d22b5f1eba9d1c62ca2cd29939327ac181bdeba04407d50ac9b35c8f254c66535e2c6d35889c597000000907d8d646fc5ed7dda9b44cd51bb81d328bc96920de63376b4ea6447dcb67026e9fade724aa488e8bb9c750c835842a3e258c0fa307e672de5f0fc7c0e9b79d58dd7e5509d19214bfb35bb9b35dab94a8409c11f52c7c0badb77ad61b7834db9bf796f79461f174ecaff7ca6f01786616d203a5df354d8de9eb83d717cc3a585e7fadae645444eb57f43fbb19c0720784e0000012800000090db74264f37d1e5ac48bc360fa3ac1f365840a11920381d26670e2e69bc05a4073e7bb65c58566f0b0b594669565e8e529ff5612959f8ddd367adc660a189f0f5323baeb160dae229aa936fd1cf3ea53f27c77f541cf85b2dfdb98d293cb2bff8d16bee86550778cd82acde4b9e00c4bd0ad4be05be20999e61af2948f4d24df761c8e426dcce96bef9ee99a03d6d61eb000000900cd0763aadf988899b32e651883acd7197a92968246d4df5fafd537c72c0ef83434deac8fdfc9f5b9f592768da76180f3b7ca701a607d2530ab1a7cbfce99c4f733459b5da62189a9a5f3cfbc26637c82fce574a08c60e3ced8f24eba946a2d450ae7193955645a41515e55a080f267a154eadaf1ec638141e563c16a6aa35455d3cfb164a49115425c69ca9eb8c953600000ce400000128000000903afb72cdeec2a47f1bf935ada706a6e1a4d6b576d4a94b508fa1dd08c697611b2d6449105f66efae08cdb3f7028234ce6ee5210f04f031103b9ba05afb40224093b5ae3e5938b0a114bc9005b43a3479287a976ff10d30dad9fac1babce35d8218441ab6fd35f20a7ced3cbf8c9a2257226134ae106787d34488ade600e2ffcb6a4547683da6bf66fece37d83364f31d00000090e55d01f0eaaaba67f08b09aa757650d9069d2785bb9e1e6188c9b9006a9db9a4b39f17c8847939bef971653bddd12d2327d64ddc255964faad3f9c304c227b458618b871295685b959f184ce4eb8aaa81c68ff418a89b0de0ce6130cd80568bee79390cb5916bf12c9503590109c0ff419a94015bf0e01a458cdbe44bc377902449c6a16eed79d779bf753ea5635d7d40000012800000090d02006c4eaae045115518940c9ee0cc26b58946c4f6d8d81e9ed0daed3e838377bd9ffba26d92307bd106f4e1074973bb26fe542b43afdb16f24af4496c40ff62806892de32b92a6bb2f85761c7da8512f9822ba5933f5771510f41f5214b17800e017c5fa858cfebfc62247a796a63f08d318cda4ed4be84efb24c8c2bca8687a50bbdac14f8e916f77f80ce430fb330000009029bd6bba2d30919b80e1d32fe38320ce270b13021452f9366600bcc5185a30f6d4c385f9cacd4daeabc1559a90c837fd82494be962c633da9650440c6c5595fa4e1ea09c5a38048662fe86f85d733dcf175526449d8728304fa159bd30acb3714d604ac6afdfe3bb4d685f2b66ad696e24156b3e683f38fa846effe4cf020094ed31592094147ed5154e106173b819eb000001280000009053b9e98ec02851eb21e60488888e73ee9f47549e199327aa34b1d1f90ca135338c79bf0844852a2eb7414f7974d883f741b18d058d9ce31d939303245e05c19492cbe1f784a8d110ede68175699dc0400ea7644e81350776075cda6c1661a6dba567950d4454fc2ec43c5fe2a0906cbb06ed12cddf328aceca03e3b4855f5bf7dd742e3c3d3117557227e874b3e8182300000090be2d24b8bc1ad75c0dc69849e53fec5259a4cb6c367597d829e1b7bff7dda63e77bf3d096585aa139d14797b5d8750a4ad2bd13684190bbbef0361863da876b87bd42665423a42e22fb3060dd9c73f900fe1b72ebc006d5207fb30006150188c6f0c6b14f59745367dca68862f61fd64143a1d6601e96d56ebd298f4b90b2df73215a6fe8397b194a19bdbd3778838c0000001280000009061b24e8ceb34e7544d129a9ef21d5153bc0b8ad1e3030cc9c284f53a895703cc495bb72ff7b1e273961b4dc9380f780f81eea3f598857b744cd330ac15e4487e76e19b83faae1486a8932c6fe388bbd104ebf68c70862af81f17867f97d9f5429f3004c878af466f41113a337ea8d42625b48ea1b6cb49526fc175e65dd0a869734216ed12ee7344981f3ee15ae509f8000000909c0fb44be97b4838d4daa152553b77460faacb7b06613398d7aef1db12ebb8eb5316e1b443d232f06478225ee82244c0f19ffda0b5cb4428ed328f713beeb4c677d11a7860c83456231e63c21233376d2942e81f463d4a7bfb1e05501bad2d78716f8dd45969b88054826ddf5a4ab41d1fe8eb57d44df5ff0817cd39b1023d3b1300b422d38594b1e8335068edeff0c90000012800000090f7fd108f548783bc9551d0d463a8bf7f94a1e6c8b60fdf451f3ccc606f8294981d3b5ce672df54868e27a0d8c74f348c5eb3030aac40cf3b1de346cceb7fd9494ce3bb35881972d7f3ff5182877dbe210e4d4d8bcb167849ba888a13e210639448d689ba5995a2cf6266d928056eb57c13fd22723df36937f86c0cf881791de7146c0ef65286cd69df8547c214332a6c00000090107981bb8f3aea1065b9cde7cce56d12eeb6f1975473b67b99b5d7905cf13310268fb70e8d77ae3c05f4d16504eaac521eb288596375ddb8bbe2b995b563ac45d14476c72141c4a547496c1db9ec803f0af37fc493bc765459ad57f11167ef07a56d7ae032cddfbef55d311e3c8c425c1d5f508ce6dd96b32f5541b5293772a56130dc086e6bbd22f1f14c33bee5977700000128000000904aea85ceeb0100ce9f1efe3220bb32db922cf977772d43c9dc1f19c87e7d98a43d2d4dd91461cbc408239b7129aa237d8f5706cb253427b511c55b8f8110d04c4f75627cd8f2aaae43666df85e688abb2b411b78b74abf27c22bd96d667c113d6ac58fd22b9c7de263650011fb996c991379f7ee71c2db13885787b6aef36f6554e2a482a11f00e6b2f972f7050ea52e000000905dc0a969a008fa8b4f1dec7acf6b73b70ee3e47f03fac413035557cab3728677dba8c647aef9ef6bd288376ce693f9dff555a7ba5d16a3c6ac032d6a3f07367a6b6f9aef79f274229b44b49e74c4d5a70ebb46c5b566d049f63a00cba0910d271c54a1fd2dc3ec64fa53c397fa015afe072642f0c50cb747fd7e48b670f7ba3d433a274106daccdf396ea36e89ad989d00000128000000904d612ab7845284ce62a5d70cfce81009b375cc463bc6b4ffaea4b945ac0ecc3e0a9761c0b79f273efe7be8638f5d1214c9ba7b811132a5956e5814925721c70c9dd4a72c8607a93228bae77a151bfd9528ee829fc60f20def2577aa5063478a969eb41ed43db4dc251d94580ea6d57ed0883dc36e6b90a9d8559bfad5c6bcb8249995f89b8c7d7ca876af23a63d5c33600000090d084b4dabbdbf002a2ad9e9b451d41e78ab165c3c7f702e19c8ff56742faefd0d8f7ab71bbf7046d1c6759c0ed5cef66049cf4f12682a01d197682d9feff8675c006e2e5b99c06e7f87ec28abd8701071acbea1eafda92c77cb9ef64e3f4c80ccdf4a2bbe98841fae72e8bff58785d6f2ebdf38676288029cf0430038dda9ee1e0691a4ff64145cbf081b44c35b3a58f0000012800000090fed672fa19c5a9fdac804a848f869fdfeb363115e5e26540892a271834e433203a0ce7667c3b203cc1818d7381bd9204c99cd8f22d7f1f48da5a079063be0a5c65a65a1f10641cc5a8dc6f0a73d4a4c21caea77de0d2fa800bda8b62236680f372fc9cefac781c55d095df26f7540c240fa8bc9c2733cb9329312ff6ec7e1a2b47403a75ad67ea7df93243f6410371b8000000902a3b422ea518dbe9d741c4df05062ed74e4f1a7c1cdaa251fd989bdf008dfdb9913b4a0aa120549e6481d925e522fbf312c7e71e437b6740541bd4042d6a43bb04caa03ac96783ee6668097107a6822f1a6220290af9e64a6a3daac8e49cd4a92e2e4281788433ff7751265efd25dc8b23168871c86c25ebaddda482171ae243097ad2442719b309e4bef5866d5257ac0000012800000090f6fb1a394b4fc4d8c67dff4c8a0f3cf317d8e1d8a544381c2e4f608b6881b61c279844d2b20be38aa65786e01b06598262c080ce23c3a4d43beb19c7e56f13b0034284e7e04ea4e7bc0581a1df91a2fc2b2eb63ded7e27db61178a4db2ebff23acec70e7bdeac1c5be55a225d28d794e00ccb5bbde557906d6e8d058a62e4a962ade0a495357064b12e13a6a656b19e4000000902998e811887c2a59fefe44a5ef8aee9b5bb61aac5fb000d6b8668f8543acff09c42a82122a23a92d53749b91f2d61b8290a2571d5f69c4d7011e434acc40d765eda4b06c27f2fdea490af3a30f219735073ba046894540f7ebb006fe2a56d87c722838a540d12f7fd6a83d91a55f94f925f6e6951e1f6dfeabaef20424777b6d163020f97bdbce40f95e4366362cd05100000128000000906cfce12e4210cbdde53e910b768b0091925a9035a1e9dca4e8773ccc6be5749368bb7f4eb080584382ea35acc4e2df39385648d4e04bd6dd4bd2715a2e58f646fde89d75d7dc2716afad281461ee7d372c002ff6ec7445af50544b2b651402a23be2cccc1dd2b9f0efa5720a918b9cac0fb4d2268b3ef217f461782f7295446e2d5af95f1535e557c2054ede0b95a58e00000090830257100c277e93f3c49f7ab082ad055cdc67b0141825003b9cd3d349bdd02ca5a0e8d02263be0c4869a6662de376f16b3f51587e3a0486e2abefa3e86be4090e7f70bd98e6b8e369f332ca3a555eba08acfab520870ac5e28daca60516f10f3cbbd7d5d7a9bc055c22d9a60dcd063b2088e784f4201a6da3a72a7109350e0e50afba596a2cde4abef655e196536d6500000128000000904bdfdedd1e441dfa9e136bc325e17eefd8533060f61d5b4eba53c4298b605b6c820887e77c1f2d80167a74380a324ab0891b385fe8e0d7db0355d21cd79e286cd92a1905fa35b5c2591ccb6189a7b25b2f643afcc58f0e60679134ac8e4e352a21abf33cc9ebcf6ede3f9024bd4b71d5189afbd5aa0970977159e383e05b5310d94d060043e1583f43b0d0c89313bfbf00000090cc7b3670a5bfa40d016465f019d7d2af8cd02ce946cb6043aec4904781a5f768a672661e4268fa54ce8f5dd8eb3b3deae505c62ff556edfb87bbba5e4d40dc2db8a5702a72980e4f2e6879eec88b2eb519068b54d138aa1b9878212212a23995c47780b94b4f323f449523755607d9f91739abb31df8ef2f415c1799776d60c8baff3f44fb4a919b773a8487a1f97ec400000ce40000012800000090246a0d106a08ec9b5c24de43750ef0a453554bfb753dc1bd1b44d76c83c910dc9709febd669d7f4708221c6566ad4f3b752ae618d5b63fe50aea4cc7c8027e2604120a79b2712f6a3edb322ecccccc8e0ded9fa60da1014d4339819cea3f507d8e0388cef979d889c1bc43f9f8b27be00820c059595c41a9b7ec63ebf035467a5eb02d9dd6770592c3e6e6b5b59ff90000000090248d83c678092b420119b2023a8823eef838ae6eddb4ac214eb2f385c755ae3cfd292f480c7495d98c1a97581ffc4ec910de7e1cee8a7c9fb0c79a2f0cb3ec60a2aefffe3f108ae87c9e920826700d7127b5d29d9538a7c7803d052198053d0dbe60eacd686d97d02c9f91e558c218a22ca07defec009d42f301e9be442e4cab8de3d6806f2a2defa3d029a9d1e7a03b0000012800000090c947d1f7d0e8fba004eea5a277d746bf38ed5ea75219a9a00d7bd60061f3c8c96ee19187f2074c4434357275ab8df7f3be32404b5462f58878abb847e81944076bfdf875d8259ae9f5bdda689669cffa2f32f2b4242e723d1434ce950109f634baeba2e1ae441a1f170ee8001241d43607e29f21ce598cc9ace7c9fcb293ee98cd771c06a90452485bf2960e778b03c2000000901271d45b7a0e31ed8ba6c1f4e5765322949e4271eaedc6e8744c7b50dd392f98e4784b69d1e36236dd904180d44f664ad0cf9e2e7fc013b9317d095d7daeef6a622ed3f74f06a8ceb6864d4d40b7377102609e650a29204bb2631d787371559b68c131e61333a9583e8b11c64fa181b7114a5889c5dce28a03b894901ca664de01ca0b3187012a9ee30aa500274bfd8c0000012800000090080eee5c08e5b2165858bf7941e34b1c0d717f86d45527b00f6cc5e4b650c331c39d029aaa40138104ea682d224432d15211421a42f71fbb8003b4235b83ff02ca7049f3809cd47737fb94a2a94d54f226600b5187f1ce2f5394c078cf06670a3249e0738e9d170e952ca174bc49690b0069e888bcebb11f591024e564bdb1fb4f4bad91fb2dadc7bec3d18445b43d370000009055e5f35e8be8a12b1379458b114b88fd50ab46f2f773bbda0d97734713ef5e9a606c28a7e8b69ff1cbafa0ea3e281d0c80a2f2b3f6646712ba95dc6041f1fe157fe42fd03022b10511ab55f998390f5b1a417cc74fd030c667aed93164d9087c351cc11f46db56298d8dea943ba920070ef0aa228df6701eebcfa9485c12c79ea07ae7cd1c49ad151ba529a8ea2dcb1f0000012800000090b656cce2d7cf095027f969dd662bc35a7fbf7ff4f4a36f26c8f444b429e7ea1f32ebbc8b61d294bb0ce01f0aa8a79638afbe11bf7aaf3a0860b1179a7446a4601b415dbc49fef8f2cff00052f63d2a7b24bb6746427061652664d449c145012f9c77a29891a54e27d9f89cad7c0a6f3d16e0757c54171d8bc38a56bf254985518ebe42b99a52302435cf36647d8178c500000090d216199db36837839fc6cc741651443e07e5ab902fdca004f0f728cdac1cc4e17000b64f52f8a972517e7b7446c609627fb04b84fc871b68b62b97d5092fe97519e19c5abad064a4fd6533c970cf8bd02c9a870fe6745678a04cb5fd108f93f7f2c420e138f8251803bf85d31edbc50d063660f9398011412e41b42cce9fd0edb964689b4b6fc0b016d7814c9fa0e1ee000001280000009082090320bcdeb7d28388dc67ed61d02475ce864818b0b5d232143a80315ce05dee400b69ad5fc343fd31c7490978667ed9da0b4863317365db5a1eee2aaeaa0721cd6997c7c3eeec2cd3838ead39c8b51e2c9980e5c46143bde338449b6a1bd9c9572b96ac78ec9dd87f59f5cf57b1c90a52db29968774929c18149634aa73a210ea1be4007ec9b9274674a037202fe80000009030bdb825638927614a043a9034162d728cd43c745725fe8c19fc6d50de76e35472267d56e50d6a55d880cfec6342622ded9ed869f75a0c1487d9f9a382fddb13ea1c635e627834235148e634e3f6f1100141e873786b317c74f39ce868708d31cff93b38fbdb2cd20143eca47bd75d53241211448ce1906df7ef556aa9ea4eac40f38f11739df9f5c499605bead183900000012800000090f813f828646067dc51d5242353d807ee5c1aa9c66ed5d7d331c5d0c01de93981885db387722aa025e33b87470d710ebb973889a6809b975a22da8a56907bf80a84d15918cac48b2794e1822941153e4a1440d4db50c931e1ad04e1bbeab9c6ee6e182b4d835485d207cedd64ca443245055847fe127bf5394e1fe8a06707b4fe6c019fe62d4d9b94e56b5d8b6c8dc96a000000905c2449a18e5907e3a3200004082d61f84dc6275702245ac02221e2e9fa7fddbafb9c0c03c33e3a522adb8937b44dc1cfe493c26fd7580d60b981351db198a234dc71b540c2ac7eca5e44130645f0d3ac0205554d5e9f6edd547c5dd999daeff9fbc4fe2f4955a70be1eabcb4d16032e828287e03a8208340deb34ddbd01988ea922f711004ee1ff58d2a80032862a7c800000128000000901094845c5de05e951ad7c565191ca696bebb4b6026bc685765a29fb744acb881d46aa3659618446e392dd104a79f63b78ba6992cb410152ad853e4835cb55fcc765725d5fbdd197e8dd0bebe245a16112642d7fc22957e79f0252e469112b4e5be5dd94c16b0cd03e223ba84c92612b32f29dd1fa08abf0210ae7541fb07518f09b73219800c026a31d1de82806a717d00000090f25784fb68a28671a138a2689a2e27d36ff4b57d6789d7ec9600f50258d2f1d78a8e6f87e600f18c38dd9e2db1ef1fecdab806e69252201bf753848fd642ce0199e4cabbdc6b807103110b79060467dc1d928ecb52987f9594ee3d645e5bc384597fc02bebe8baa1b788619a91011611219cc2d755c7ad29e2b796caee1e48298e1ae075a4906e3cac4aa00fd7c6d37e0000012800000090232a0ab85a65971d9e129564be4959738fbd010e4620bc56d4c6a0cef0df48ea2916d699bfcf86c31ad798df1cf683dc447fcf3f776921569c940f49434bd5c5726b884987da77fc4e5bd2feadede3491d65766b3b5e95867650d9895558f7a6605e54f7b5fadbd155790e4e0f24a61c131f6644777601fd58c0ec242d9d964b3659244cdd9d0734ccc1cd02e2dc0cd70000009000e85396676fe85ae00b6a67c58a775a8e015dbba543d97b62849fd736be0a5ee691edb3386a0d2da107d33c0b6e20aaf0ebc5317953b33d0b1fa5d4dc0aa4e37497ae1ff07f85091f53e2e2c1a4a91912f3a31920458b51becc95d1b36e182988466ef6650fbb25a68f6e41ffe87c8d06fdfda92175001f9449ee523bbe716ed67386b7a65dc2281201dc0f52e79d84000001280000009046eb6f5858b6deb25997802d2470fc937ca6a0db4ec8b4b9f54033e77b0530b1fb827d1b901a45e99ae05235c325eb594e8ae2fcc865713fb826e451fa32072510ba33ea4ea74dd1a418c1fd6623b1882f867d690e3c0e22454afab564d44b876ebb1dc99ee27513ba0d681126875cd2083925d5f64dc05a14f6836d752eb8ee2724d4c45cc4ef6b5dff05966a946bfd0000009089295e34b6554ade8a37880e22cb11e97362668e30b2d266fdc00a06d91cc1c81f1a60714a1eb8e362900d31e59b4874f872d6baf1d057acf9712992eca98651ac3cabd3c68b8480e5a76049fefb122203f473002787777af3bd17162395067a9294669f469176bd8261113591575ea9194fedd044a208a299a74884a04c159189c5584324e0e28c0ed1f934f52083fb00000128000000903b1f75e86603f88b00bc7fcb389a0808f12ee410eb4ea5927614284aa5eff96ce07347df10d30654116e33cf57ec6f616b0d60a7ed480940b78c9bd174f823354c2c6977aaebf30932a359bb3593b8921080a3c03b4b9cd2e136130f101384edae29998621687f204fdcd5d0c5aba84d1348b19326b9878dc77421ad2fd4ec3317bfd7bc9fc0bfaef3ea2d62ded6f7d80000009071cea3ae8023a06bae36072dc5bd97b0579720667a7de4fc06a77c71c8f22fd764d14f7185fe823324e1549513b0c33ba990278a50eef3926f4192fe56d5f4a20a81b3192ea1fa4f5d411f94976ecdbf26fa3c8c2f2ee479ea55e9f45021749e35f514e87b37353ed481023f7e7c801e14fe40a872d25cf710dfd4cb5bd31a7f7fc5b462a5effa3d25bf544a26b50bf70000012800000090550c59f8f001f40751d8d8f83d41b3096ecf6539613399c810c05ea476e5c7f195c496c0590c6482641f0d4001babf649e3c761d216f978c6e279af75d24a0da1cfe90c67caa65b7639e7a82b48e53940c8ed9b0c03f1eca4fb55db4c930c770f029d49a2df26a008e78aa93a35833570ed3c91162ee1d25a96ed37ab571817fafa9c255f21cc8444eb20cac55e0cbc70000009032816c593e8f09426b459417186dc07b9cdfbfa0e7672418b3c63354af60bbdf627fe8e337eebb661f2163173c956523b37df946ad27e4354ed74fc199f40291a7e621b8ce9b5ebb3cf73b45022458160ebf2a3ebe228d431c8938f176fbc32e7f80ca5bff06dcff0d4c1a62e53fd9142812e0a40487e437190f29ae3bae7bf25ebd750c802e6bec8cbbd4b2b60c5e6500000ce40000012800000090cb8101b645c45719b837537f288db2a972242cd3b13945677a520b119b69c1ce9b0cdd31db1ed5af20c58576578b0023ee31cb95c131ee7a51c2ba75defb8f2f925af553133e3f867cf9e5f7c05d5dff0607731d4be02945695497b306deffbd102f7d24cafa87311ce23f557700dcf12cfa609937d2036dd835eb3acee695282f0aa384b7a710abf261c02db6267e0b00000090993f529a09a0517b513d11e6c7d35ae7daea3d9ef96bab7f86182f31abd5fd250a79773e373ecfaed4860234f7ba4581d2eae5882bd731faa19cc6ddc1440f062223294cdc8bd5876a84aca2021e56d0080888d3097e2d6ee2e65c3891b4c62a083308e2b969577fff780fb53c6895a50ca75c4e8e647ac512cde4c9a329960f9d82579529a57a7e0fba3b6c45554b9e0000012800000090c397f20811539f67aa0d9deb333219706d06272749d0ed917bbf52d7d3f1c1828ea1f7982c66e5aaf0b19accc338ec1f0e562c3576ade7ef3e568043e82868f417d22f07a7d4487af14566bc11f10b6a2d0767a2efa94f65d2e2f15db519b52e4d6ad1a96535692bb980b1a0689e2a2321b59c58bb53bfdc0843ce3896a4f36848e0c00a31f3061db854e56ed52aa4b0000000909ebd9573cf974839b5fb0c1a18cd9a565b914ebb383bdd20c73e72a5cb61cfe24ffdb2f71f0d63659b226c9e08f52c23178f18ff0ef81cabe90cc186f9bda9ecdeeef16287313edf4044df7a01fe31c52e1186400dade877de4d00ea6a1b3d2bcfc80220c2ba0f4daded50b5ffeeaac502b7a117fa66d1e46d35c81ca6f4f02933f7bc117648f1212afb6abec99684bd0000012800000090c0e4f6a168e67a0a4f1b0c413a3d02d9751f9febfc9ef4c129386d347ac2828227aed3dc4bbe71247b120e6678676dd8da58102054ee86013cc91f63f4f7add06ac0ae21f75b0939f56d21c8ee079d9f1b09e101295844e7941390e82e4fe23ce5d3f3cb7ee36af753fd549568b8f44e10a3e3341bd516e5ee23abbaf49a9d6a524542bfa891390b79538b307f60c9dd000000908dad9c1e96ee3ced387c2109956a2318f201b2eb51ecd81fee5cc5e16528604afff0916b93c29d298a73cb15adf80a37e539c0e73c13c99060e386785c02de3e03c4a95cf093d2df68e015faaf8beafa1d3d2ad54c1c0dc2fe1220d5e0b58987c14678bb2f6e7e76ef31152d83c961b51f2b841ca071188f2b2b49100a86dd7add0695373e1c3249683b8c2e7b9d09f10000012800000090258db38122111767a6f06767568b2e6256a1c76ba7f99bd399dd90defb9c5cb8a69a331d423515fd6e659c774424095e541dd11504090b9d3821e8039e9b511d0980c4ba6867f8c9494ab945d33d95771c8b29ba520b178f9ce2451e66ca3e510b90fdbdcf2be432f2999909975056861c4b8371741e94728718acfa10fc8bf7568bfba3732fd5fbc52d298fe6be0e92000000906bdf0de137b90d7eed4184fd8fe20aaea35bf9a196cbf9d0fbb4cc396ef24edc4b7200309da70a4e8d1bdbb018f0be98060aa1c7865cc1d2a50e986fae7ba2e510da189ce588ce3eb7c7fac7b9eca1ce2fa9e270894ab1f11c354eed4c70a53893828ae8967fafd1a0ab075afb4342ee0937b02097e238a8a3ab1a5063f0afdb01097c473e4d97d946a3386e067ec4c30000012800000090042c964916bc0cc2975bcbee7b91882633cb36fde8f2e3ced567590076c1e398bd291a2175afe0c483c77d3b93d7090d172bd210c1cd6fcc32b05c48adf810ecaa0299547b96411e5decb69b8154f67a258025cac1d980bfdeaa7003a61586769f66c36e2b27118bfab8819dec6c4a4b00318e674a4622ffb5296d93eef492b52866f74370dd4250d1f8457496a337c600000090b2f68730bfe2c8f0216b58fad1442fb289b8499b95a628c9d83c2d71f222c374101d7a40b459832ef3f396cc4df82b9c436324863f8d4e3a2ebd90d7c88050efdc445745b66f843f2e049c0f8c5f221d2d12df30584882656ff9d6f0efdb29464c87765e44befd7954c672fd4db509bf1ac277f551f5016b51e928ee78fac040bb5f39595f629e87cc40d44fd08c5aa700000128000000900e6ff27e9b1d0ac0be632384adb77793486e64d4d451b359aefa3ecc2f770c53e2bc64852b5efcb0185b8ca6f40e581890c55be4f3c0ba0efd7132544d03f3893fbc5da47e18b3e70271ea2d097039122ab6bbf91b9b3a49701a263e022a02e41a4b12ad55aad42fd4ca280fa88217bb07a897709ee27fcd185cc89617ab003d05727127240091d79f2ded1cadcff23600000090eb243c5a7917e3784d38145f679655b0f598aa913c3585e61523aaba948c59f7500afd3183f8e94dde153aedd2c1efdb0290213aa269d96e40b2e6768a9e9ff804a0da5b3cc6f204bd21b3ed1507f00e0203bd184252c84fccf825b8fe971c75e7c4d7464dd732ccca507038c2a2f800085733ec3b3021387c272405f3ae8a5ff35208a6dd816961ea9b60443e1e72cb0000012800000090000089c0bd91d471aa672d2e71f2b3e95efe7cc2247703f3e68c5341ade330bd2b72cb4d1c453c53e2bfd83a249b4369c796e3ded3ca80c653acd3952935922e8c8e3874477a69194ee84c0ff450e20f05f0f170bedb95b2db6e875248ddb3efaee20d102c9d7f626825fb084b9c02760dffab112427fd2bb4636ef37faa46c0d297db5109d1735caa709e9c11243fbd00000090cd7175b8b999340d3a6a19f314667ebb76111fc1995b92520ec1b2425dd7eec6c6925ce79a38049e728bcf1a7517c76b8f512682dc85233cc675ba2d08fe63a939820be928249d8267ff87e941b1d8ef1ffd90af3769864bce3fa7bf9abaaee175990da6a99f9ffce39188b09054932004577df22545471462a0445004c184e82960acfa0de04ca814e5a59e8d7853d8000001280000009027c57885ad44e86bc050adc16a9f431b8bcd136858797069b2ac1dc57e4bc07f8dfb1b0437a8b04f517ea77e11ff95868a697f4a647d605fca1d24efaf5f2070ed997bb7eb4b394a50ffd46bdb225431064c39026f41d45dc7689a9f766339b36f348817f822b9bade7f63cfc352f1830a6a40c1fca91d694ea2bf01e6c8c96b18e212bae9f1cc726cbcdc5fe42b9997000000909a73ecf61fb7a16bd0da5901fee1878055e506aadcbd399eac68a328c496aa89da4034c0ccd2f41cf9f210bceafb936bef1867d150b6c4eef3a6216f838f46c246be3b5cc9b6917651f0665ce97ec75e0f88f6763f37402d26bc6dd967ea561ebfdf539784f87b34260514f6bea4fe4615f0f38a93420c5a1b7468301b96944f03d14c26da162c1d74518fb5f687471e0000012800000090037411a3e4d6d8fce24c6b20eb2685da8153c648c49b901ea4e198e410c2f4ab8b4f6da6c3001db34c631a0eba034a2a73f7bc07f9b5bb3f0c1cd35b6f830bdde23e56540f2926d1428c92421f512df02d938fb1bf669cb7e3f2f67092ffe9c9235151de0f7780c884c275b87ab16c7c04fbd3ca6e59256f424817a5aa6af4db3dc7cfeccbd2e33a674aaed3c00679b600000090b63e8bcc12b7202e6adf92d08b0ceff3fb5f2aeb3641914f2007f01be6e8d0531717e813359ea9d87f334e4dcd6d9d2a9f469cb3ffe7b39bf3f516371d94d5cd0684b459e90ef0ea7e135cfdc09a459806ebcd20b37d2449effb46e1891920e9552219420926fe5b19e24c84eb5b489702a9b68a3f386683ebb68a80fbf86bda5f9eaf551a05e44bdcb62857b2a2596d0000012800000090be02f8ca31f53bbb98951c594b4d63e86144597afce010fa052abe4ce22ea616e5ebeee1592f72b790e861aa288e5e65e3d4e1de590d600e5fe8e97b2a944523fea6d4877982c820a8382bf211bdab670d212dfd578eea5598603aa2184d3d19631b7afddbf64a7d7d42da50957af2200cfd85cc575e688cfac8a7bf79d13425a8b8118cebbb7450ce71a5f32dd57c7600000090506fbaace8089afb104d6f51761c4b160f7fbe12ea416075884c7051942c26a7a5623325f5ee9b61e978bb6bdb0fb2247e1db58409ed666d92272131d0907441fde90741079630c7979d5c26cecca78a0e9311d2ab08ef98c21d6c368ace80671d4b53355506c328bffa5e50343b7b521f302e47e478b4cd9d6c378dd1d805301e1a212a76dec996b242c73d121275600000012800000090858cb772b6218e3b500c5ec852ec41fa01759de6d92fec4072a5a110de67577417858f16483e60864a6bfeec08ac33f895cd2925d9a32b5592599a6a960b88a9037dec9d267dc8b6c7cf3d14a6eed1e61923dce2ebe3796339f5a12c60b1da8b59ffbea3ff915359fc23a18f1f4967c701c040dd0e12cf5c9847b9acfb42fba71a589cc1cd10069130cd77de09e8f77000000090d3d771170fda563baec8662676daf70c323b048e3b5aea56cacb8e6e05eeab197e7ea3a84783d7048e4b302208cd2677d4fae6517098a2ad889e3675debb168d12bed274ca336a0787c2f0ce0755e66d1c19e641008d906a75f4cfe0412da1c25c4c6eebd8f8acba536deff6a87c52790f0d3c3df3ba9e411bdf469d86c008caa58d2076ab6c34c60b72f9bc03c3d4c7",
-    "timestamp": 1704899127
+    "publicInputsHash": "0x280997cb13c04842e88c31fb0d4db23d591c48aea40d9a5aa2e18fd4c72a0358"
   }
 }
\ No newline at end of file
diff --git a/l1-contracts/test/portals/TokenPortal.t.sol b/l1-contracts/test/portals/TokenPortal.t.sol
index ae02336b3df7..25457ab2c9a3 100644
--- a/l1-contracts/test/portals/TokenPortal.t.sol
+++ b/l1-contracts/test/portals/TokenPortal.t.sol
@@ -4,6 +4,7 @@ import "forge-std/Test.sol";
 
 // Rollup Processor
 import {Rollup} from "../../src/core/Rollup.sol";
+import {AvailabilityOracle} from "../../src/core/availability_oracle/AvailabilityOracle.sol";
 import {Inbox} from "../../src/core/messagebridge/Inbox.sol";
 import {Registry} from "../../src/core/messagebridge/Registry.sol";
 import {Outbox} from "../../src/core/messagebridge/Outbox.sol";
@@ -64,7 +65,7 @@ contract TokenPortalTest is Test {
     registry = new Registry();
     inbox = new Inbox(address(registry));
     outbox = new Outbox(address(registry));
-    rollup = new Rollup(registry);
+    rollup = new Rollup(registry, new AvailabilityOracle());
 
     registry.upgrade(address(rollup), address(inbox), address(outbox));
 
diff --git a/l1-contracts/test/portals/UniswapPortal.t.sol b/l1-contracts/test/portals/UniswapPortal.t.sol
index 3605e213d03f..454985b248b9 100644
--- a/l1-contracts/test/portals/UniswapPortal.t.sol
+++ b/l1-contracts/test/portals/UniswapPortal.t.sol
@@ -4,6 +4,7 @@ import "forge-std/Test.sol";
 
 // Rollup Processor
 import {Rollup} from "../../src/core/Rollup.sol";
+import {AvailabilityOracle} from "../../src/core/availability_oracle/AvailabilityOracle.sol";
 import {Inbox} from "../../src/core/messagebridge/Inbox.sol";
 import {Registry} from "../../src/core/messagebridge/Registry.sol";
 import {Outbox} from "../../src/core/messagebridge/Outbox.sol";
@@ -51,7 +52,7 @@ contract UniswapPortalTest is Test {
     Registry registry = new Registry();
     inbox = new Inbox(address(registry));
     outbox = new Outbox(address(registry));
-    rollup = new Rollup(registry);
+    rollup = new Rollup(registry, new AvailabilityOracle());
     registry.upgrade(address(rollup), address(inbox), address(outbox));
 
     daiTokenPortal = new TokenPortal();
diff --git a/noir/.gitrepo b/noir/.gitrepo
index 0b1e79ce03a5..5fcea33359ce 100644
--- a/noir/.gitrepo
+++ b/noir/.gitrepo
@@ -6,7 +6,7 @@
 [subrepo]
 	remote = https://github.com/noir-lang/noir
 	branch = aztec-packages
-	commit = 5a1b2bbd3e2e5e133deacb021cc4ba7587c14b8b
-	parent = 490130979a5d3a3e703c7e28417835aa86fa8cd7
+	commit = 13f93d523342daf478e08e8ccc0f00962c7fbe05
+	parent = 41ae75cdee6285729551965972e8cb039ff3045a
 	method = merge
 	cmdver = 0.4.6
diff --git a/noir/README.md b/noir/README.md
index 038ce5691cd9..771c3f1c74d9 100644
--- a/noir/README.md
+++ b/noir/README.md
@@ -58,7 +58,7 @@ This crate's minimum supported rustc version is 1.71.1.
 
 ## Working on this project
 
-This project uses [Nix](https://nixos.org/) and [direnv](https://direnv.net/) to streamline the development experience. Please follow [our guidelines](https://noir-lang.org/docs/dev/getting_started/installation/other_install_methods#option-3-compile-from-source) to setup your environment for working on the project.
+This project uses [Nix](https://nixos.org/) and [direnv](https://direnv.net/) to streamline the development experience. Please follow [our guidelines](https://noir-lang.org/docs/getting_started/installation/other_install_methods#option-3-compile-from-source) to setup your environment for working on the project.
 
 ### Building against a different local/remote version of Barretenberg
 
diff --git a/noir/tooling/nargo_cli/tests/hello_world.rs b/noir/tooling/nargo_cli/tests/hello_world.rs
index bc7022d15679..9fcb0c873e16 100644
--- a/noir/tooling/nargo_cli/tests/hello_world.rs
+++ b/noir/tooling/nargo_cli/tests/hello_world.rs
@@ -1,5 +1,5 @@
 //! This integration test aims to mirror the steps taken by a new user using Nargo for the first time.
-//! It then follows the steps published at https://noir-lang.org/getting_started/hello_world.html
+//! It then follows the steps published at https://noir-lang.org/docs/getting_started/create_a_project
 //! Any modifications to the commands run here MUST be documented in the noir-lang book.
 
 use assert_cmd::prelude::*;
diff --git a/yarn-project/acir-simulator/src/avm/avm_context.ts b/yarn-project/acir-simulator/src/avm/avm_context.ts
index 9d52f869acfa..79e763f79f45 100644
--- a/yarn-project/acir-simulator/src/avm/avm_context.ts
+++ b/yarn-project/acir-simulator/src/avm/avm_context.ts
@@ -4,7 +4,7 @@ import { AvmMachineState } from './avm_machine_state.js';
 import { AvmMessageCallResult } from './avm_message_call_result.js';
 import { AvmStateManager } from './avm_state_manager.js';
 import { AvmInterpreter } from './interpreter/index.js';
-import { interpretBytecode } from './opcodes/from_bytecode.js';
+import { decodeBytecode } from './opcodes/decode_bytecode.js';
 import { Instruction } from './opcodes/index.js';
 
 /**
@@ -34,7 +34,7 @@ export class AvmContext {
     // const bytecode = stateManager.journal.hostStorage.contractsDb.getBytecode(contractAddress);
     const bytecode = Buffer.from('0x01000100020003');
 
-    const instructions: Instruction[] = interpretBytecode(bytecode);
+    const instructions: Instruction[] = decodeBytecode(bytecode);
 
     const context = new AvmMachineState(calldata);
     const interpreter = new AvmInterpreter(context, this.stateManager, instructions);
diff --git a/yarn-project/acir-simulator/src/avm/avm_machine_state.ts b/yarn-project/acir-simulator/src/avm/avm_machine_state.ts
index aa0fc689b58d..53e8599b7c37 100644
--- a/yarn-project/acir-simulator/src/avm/avm_machine_state.ts
+++ b/yarn-project/acir-simulator/src/avm/avm_machine_state.ts
@@ -12,11 +12,22 @@ export class AvmMachineState {
   /** - */
   public memory: Fr[];
 
+  /**
+   * When an internal_call is invoked, the internal call stack is added to with the current pc + 1
+   * When internal_return is invoked, the latest value is popped from the internal call stack and set to the pc.
+   */
+  public internalCallStack: number[];
+
   /** - */
   public pc: number;
   /** - */
   public callStack: number[];
 
+  /**
+   * If an instruction triggers a halt, then it ends execution of the VM
+   */
+  public halted: boolean;
+
   /**
    * Create a new avm context
    * @param calldata -
@@ -25,9 +36,12 @@ export class AvmMachineState {
     this.calldata = calldata;
     this.returnData = [];
     this.memory = [];
+    this.internalCallStack = [];
 
     this.pc = 0;
     this.callStack = [];
+
+    this.halted = false;
   }
 
   /**
diff --git a/yarn-project/acir-simulator/src/avm/avm_state_manager.ts b/yarn-project/acir-simulator/src/avm/avm_state_manager.ts
index 250a7d8f1225..b5396accc7a9 100644
--- a/yarn-project/acir-simulator/src/avm/avm_state_manager.ts
+++ b/yarn-project/acir-simulator/src/avm/avm_state_manager.ts
@@ -29,7 +29,7 @@ export class AvmStateManager {
    * @returns Avm State Manager
    */
   public static rootStateManager(blockHeader: BlockHeader, hostStorage: HostStorage): AvmStateManager {
-    const journal = new AvmJournal(hostStorage);
+    const journal = AvmJournal.rootJournal(hostStorage);
     return new AvmStateManager(blockHeader, journal);
   }
 
@@ -39,6 +39,7 @@ export class AvmStateManager {
    * @returns
    */
   public static forkStateManager(parent: AvmStateManager): AvmStateManager {
-    return new AvmStateManager(parent.blockHeader, parent.journal);
+    const journal = AvmJournal.branchParent(parent.journal);
+    return new AvmStateManager(parent.blockHeader, journal);
   }
 }
diff --git a/yarn-project/acir-simulator/src/avm/index.test.ts b/yarn-project/acir-simulator/src/avm/index.test.ts
new file mode 100644
index 000000000000..1db8306447af
--- /dev/null
+++ b/yarn-project/acir-simulator/src/avm/index.test.ts
@@ -0,0 +1,41 @@
+import { Fr } from '@aztec/foundation/fields';
+
+import { mock } from 'jest-mock-extended';
+
+import { AvmMachineState } from './avm_machine_state.js';
+import { AvmStateManager } from './avm_state_manager.js';
+import { AvmInterpreter } from './interpreter/interpreter.js';
+import { decodeBytecode } from './opcodes/decode_bytecode.js';
+import { encodeToBytecode } from './opcodes/encode_to_bytecode.js';
+import { Opcode } from './opcodes/opcodes.js';
+
+describe('avm', () => {
+  it('Should execute bytecode', () => {
+    const calldata: Fr[] = [new Fr(1), new Fr(2)];
+    const stateManager = mock<AvmStateManager>();
+
+    // Construct bytecode
+    const calldataCopyArgs = [0, 2, 0];
+    const addArgs = [0, 1, 2];
+    const returnArgs = [2, 1];
+
+    const calldataCopyBytecode = encodeToBytecode(Opcode.CALLDATACOPY, calldataCopyArgs);
+    const addBytecode = encodeToBytecode(Opcode.ADD, addArgs);
+    const returnBytecode = encodeToBytecode(Opcode.RETURN, returnArgs);
+    const fullBytecode = Buffer.concat([calldataCopyBytecode, addBytecode, returnBytecode]);
+
+    // Decode bytecode into instructions
+    const instructions = decodeBytecode(fullBytecode);
+
+    // Execute instructions
+    const context = new AvmMachineState(calldata);
+    const interpreter = new AvmInterpreter(context, stateManager, instructions);
+    const avmReturnData = interpreter.run();
+
+    expect(avmReturnData.reverted).toBe(false);
+
+    const returnData = avmReturnData.output;
+    expect(returnData.length).toBe(1);
+    expect(returnData).toEqual([new Fr(3)]);
+  });
+});
diff --git a/yarn-project/acir-simulator/src/avm/interpreter/interpreter.test.ts b/yarn-project/acir-simulator/src/avm/interpreter/interpreter.test.ts
index 3b86414ab639..a52a2c13222e 100644
--- a/yarn-project/acir-simulator/src/avm/interpreter/interpreter.test.ts
+++ b/yarn-project/acir-simulator/src/avm/interpreter/interpreter.test.ts
@@ -5,9 +5,9 @@ import { mock } from 'jest-mock-extended';
 import { AvmMachineState } from '../avm_machine_state.js';
 import { AvmStateManager } from '../avm_state_manager.js';
 import { Add } from '../opcodes/arithmetic.js';
-import { Return } from '../opcodes/control_flow.js';
+import { Jump, Return } from '../opcodes/control_flow.js';
 import { Instruction } from '../opcodes/instruction.js';
-import { CallDataCopy } from '../opcodes/memory.js';
+import { CalldataCopy } from '../opcodes/memory.js';
 import { AvmInterpreter } from './interpreter.js';
 
 describe('interpreter', () => {
@@ -17,7 +17,7 @@ describe('interpreter', () => {
 
     const instructions: Instruction[] = [
       // Copy the first two elements of the calldata to memory regions 0 and 1
-      new CallDataCopy(0, 2, 0),
+      new CalldataCopy(0, 2, 0),
       // Add the two together and store the result in memory region 2
       new Add(0, 1, 2), // 1 + 2
       // Return the result
@@ -34,4 +34,20 @@ describe('interpreter', () => {
     expect(returnData.length).toBe(1);
     expect(returnData).toEqual([new Fr(3)]);
   });
+
+  it('Should revert with an invalid jump', () => {
+    const calldata: Fr[] = [];
+    const stateManager = mock<AvmStateManager>();
+
+    const invalidJumpDestination = 22;
+
+    const instructions: Instruction[] = [new Jump(invalidJumpDestination)];
+
+    const context = new AvmMachineState(calldata);
+    const interpreter = new AvmInterpreter(context, stateManager, instructions);
+
+    const avmReturnData = interpreter.run();
+
+    expect(avmReturnData.reverted).toBe(true);
+  });
 });
diff --git a/yarn-project/acir-simulator/src/avm/interpreter/interpreter.ts b/yarn-project/acir-simulator/src/avm/interpreter/interpreter.ts
index 47fb9c3771d9..9bbd511c2d37 100644
--- a/yarn-project/acir-simulator/src/avm/interpreter/interpreter.ts
+++ b/yarn-project/acir-simulator/src/avm/interpreter/interpreter.ts
@@ -30,8 +30,18 @@ export class AvmInterpreter {
    */
   run(): AvmMessageCallResult {
     try {
-      for (const instruction of this.instructions) {
+      while (!this.machineState.halted && this.machineState.pc < this.instructions.length) {
+        const instruction = this.instructions[this.machineState.pc];
+
+        if (!instruction) {
+          throw new InvalidInstructionError(this.machineState.pc);
+        }
+
         instruction.execute(this.machineState, this.stateManager);
+
+        if (this.machineState.pc >= this.instructions.length) {
+          throw new InvalidProgramCounterError(this.machineState.pc, this.instructions.length);
+        }
       }
 
       const returnData = this.machineState.getReturnData();
@@ -52,3 +62,22 @@ export class AvmInterpreter {
     return this.machineState.getReturnData();
   }
 }
+
+/**
+ * Error is thrown when the program counter goes to an invalid location.
+ * There is no instruction at the provided pc
+ */
+class InvalidProgramCounterError extends Error {
+  constructor(pc: number, max: number) {
+    super(`Invalid program counter ${pc}, max is ${max}`);
+  }
+}
+
+/**
+ * This assertion should never be hit - there should always be a valid instruction
+ */
+class InvalidInstructionError extends Error {
+  constructor(pc: number) {
+    super(`Invalid instruction at ${pc}`);
+  }
+}
diff --git a/yarn-project/acir-simulator/src/avm/journal/errors.ts b/yarn-project/acir-simulator/src/avm/journal/errors.ts
new file mode 100644
index 000000000000..17696b1de687
--- /dev/null
+++ b/yarn-project/acir-simulator/src/avm/journal/errors.ts
@@ -0,0 +1,8 @@
+/**
+ * Error thrown when a base journal is attempted to be merged.
+ */
+export class RootJournalCannotBeMerged extends Error {
+  constructor() {
+    super('Root journal cannot be merged');
+  }
+}
diff --git a/yarn-project/acir-simulator/src/avm/journal/host_storage.ts b/yarn-project/acir-simulator/src/avm/journal/host_storage.ts
index ccd318912053..fcd9d27f7227 100644
--- a/yarn-project/acir-simulator/src/avm/journal/host_storage.ts
+++ b/yarn-project/acir-simulator/src/avm/journal/host_storage.ts
@@ -1,17 +1,20 @@
 import { CommitmentsDB, PublicContractsDB, PublicStateDB } from '../../index.js';
 
-/** - */
+/**
+ * Host storage
+ *
+ * A wrapper around the node dbs
+ */
 export class HostStorage {
   /** - */
-  public readonly stateDb: PublicStateDB;
+  public readonly publicStateDb: PublicStateDB;
   /** - */
   public readonly contractsDb: PublicContractsDB;
-
   /** - */
   public readonly commitmentsDb: CommitmentsDB;
 
-  constructor(stateDb: PublicStateDB, contractsDb: PublicContractsDB, commitmentsDb: CommitmentsDB) {
-    this.stateDb = stateDb;
+  constructor(publicStateDb: PublicStateDB, contractsDb: PublicContractsDB, commitmentsDb: CommitmentsDB) {
+    this.publicStateDb = publicStateDb;
     this.contractsDb = contractsDb;
     this.commitmentsDb = commitmentsDb;
   }
diff --git a/yarn-project/acir-simulator/src/avm/journal/journal.test.ts b/yarn-project/acir-simulator/src/avm/journal/journal.test.ts
index c356db723862..a11a3b38743c 100644
--- a/yarn-project/acir-simulator/src/avm/journal/journal.test.ts
+++ b/yarn-project/acir-simulator/src/avm/journal/journal.test.ts
@@ -1,7 +1,158 @@
+import { Fr } from '@aztec/foundation/fields';
+
+import { MockProxy, mock } from 'jest-mock-extended';
+
+import { CommitmentsDB, PublicContractsDB, PublicStateDB } from '../../index.js';
+import { HostStorage } from './host_storage.js';
+import { AvmJournal, JournalData } from './journal.js';
+
 describe('journal', () => {
-  it('Should write to storage', () => {});
+  let publicDb: MockProxy<PublicStateDB>;
+  let journal: AvmJournal;
+
+  beforeEach(() => {
+    publicDb = mock<PublicStateDB>();
+    const commitmentsDb = mock<CommitmentsDB>();
+    const contractsDb = mock<PublicContractsDB>();
+
+    const hostStorage = new HostStorage(publicDb, contractsDb, commitmentsDb);
+    journal = new AvmJournal(hostStorage);
+  });
+
+  describe('Public Storage', () => {
+    it('Should cache write to storage', () => {
+      // When writing to storage we should write to the storage writes map
+      const contractAddress = new Fr(1);
+      const key = new Fr(2);
+      const value = new Fr(3);
+
+      journal.writeStorage(contractAddress, key, value);
+
+      const journalUpdates: JournalData = journal.flush();
+      expect(journalUpdates.storageWrites.get(contractAddress)?.get(key)).toEqual(value);
+    });
+
+    it('When reading from storage, should check the parent first', async () => {
+      // Store a different value in storage vs the cache, and make sure the cache is returned
+      const contractAddress = new Fr(1);
+      const key = new Fr(2);
+      const storedValue = new Fr(420);
+      const parentValue = new Fr(69);
+      const cachedValue = new Fr(1337);
+
+      publicDb.storageRead.mockResolvedValue(Promise.resolve(storedValue));
+
+      const childJournal = new AvmJournal(journal.hostStorage, journal);
+
+      // Get the cache miss
+      const cacheMissResult = await childJournal.readStorage(contractAddress, key);
+      expect(cacheMissResult).toEqual(storedValue);
+
+      // Write to storage
+      journal.writeStorage(contractAddress, key, parentValue);
+      const parentResult = await childJournal.readStorage(contractAddress, key);
+      expect(parentResult).toEqual(parentValue);
+
+      // Get the parent value
+      childJournal.writeStorage(contractAddress, key, cachedValue);
+
+      // Get the storage value
+      const cachedResult = await childJournal.readStorage(contractAddress, key);
+      expect(cachedResult).toEqual(cachedValue);
+    });
+
+    it('When reading from storage, should check the cache first', async () => {
+      // Store a different value in storage vs the cache, and make sure the cache is returned
+      const contractAddress = new Fr(1);
+      const key = new Fr(2);
+      const storedValue = new Fr(420);
+      const cachedValue = new Fr(69);
+
+      publicDb.storageRead.mockResolvedValue(Promise.resolve(storedValue));
+
+      // Get the cache first
+      const cacheMissResult = await journal.readStorage(contractAddress, key);
+      expect(cacheMissResult).toEqual(storedValue);
+
+      // Write to storage
+      journal.writeStorage(contractAddress, key, cachedValue);
+
+      // Get the storage value
+      const cachedResult = await journal.readStorage(contractAddress, key);
+      expect(cachedResult).toEqual(cachedValue);
+    });
+  });
+
+  describe('UTXOs', () => {
+    it('Should maintain commitments', () => {
+      const utxo = new Fr(1);
+      journal.writeCommitment(utxo);
+
+      const journalUpdates = journal.flush();
+      expect(journalUpdates.newCommitments).toEqual([utxo]);
+    });
+
+    it('Should maintain l1 messages', () => {
+      const utxo = new Fr(1);
+      journal.writeL1Message(utxo);
+
+      const journalUpdates = journal.flush();
+      expect(journalUpdates.newL1Messages).toEqual([utxo]);
+    });
+
+    it('Should maintain nullifiers', () => {
+      const utxo = new Fr(1);
+      journal.writeNullifier(utxo);
+
+      const journalUpdates = journal.flush();
+      expect(journalUpdates.newNullifiers).toEqual([utxo]);
+    });
+  });
+
+  it('Should merge two journals together', async () => {
+    // Fundamentally checking that insert ordering of public storage is preserved upon journal merge
+    // time | journal | op     | value
+    // t0 -> journal0 -> write | 1
+    // t1 -> journal1 -> write | 2
+    // merge journals
+    // t2 -> journal0 -> read  | 2
+
+    const contractAddress = new Fr(1);
+    const key = new Fr(2);
+    const value = new Fr(1);
+    const valueT1 = new Fr(2);
+    const commitment = new Fr(10);
+    const commitmentT1 = new Fr(20);
+
+    journal.writeStorage(contractAddress, key, value);
+    journal.writeCommitment(commitment);
+    journal.writeL1Message(commitment);
+    journal.writeNullifier(commitment);
+
+    const journal1 = new AvmJournal(journal.hostStorage, journal);
+    journal.writeStorage(contractAddress, key, valueT1);
+    journal.writeCommitment(commitmentT1);
+    journal.writeL1Message(commitmentT1);
+    journal.writeNullifier(commitmentT1);
+
+    journal1.mergeWithParent();
+
+    // Check that the storage is merged by reading from the journal
+    const result = await journal.readStorage(contractAddress, key);
+    expect(result).toEqual(valueT1);
+
+    // Check that the UTXOs are merged
+    const journalUpdates: JournalData = journal.flush();
+    expect(journalUpdates.newCommitments).toEqual([commitment, commitmentT1]);
+    expect(journalUpdates.newL1Messages).toEqual([commitment, commitmentT1]);
+    expect(journalUpdates.newNullifiers).toEqual([commitment, commitmentT1]);
+  });
 
-  it('Should read from storage', () => {});
+  it('Cannot merge a root journal, but can merge a child journal', () => {
+    const rootJournal = AvmJournal.rootJournal(journal.hostStorage);
+    const childJournal = AvmJournal.branchParent(rootJournal);
 
-  it('Should merge two journals together', () => {});
+    expect(() => rootJournal.mergeWithParent()).toThrow();
+    expect(() => childJournal.mergeWithParent());
+  });
 });
diff --git a/yarn-project/acir-simulator/src/avm/journal/journal.ts b/yarn-project/acir-simulator/src/avm/journal/journal.ts
index 67563fe63704..cb69b3c33ef6 100644
--- a/yarn-project/acir-simulator/src/avm/journal/journal.ts
+++ b/yarn-project/acir-simulator/src/avm/journal/journal.ts
@@ -1,101 +1,191 @@
 import { Fr } from '@aztec/foundation/fields';
 
+import { RootJournalCannotBeMerged } from './errors.js';
 import { HostStorage } from './host_storage.js';
 
-// TODO: all of the data that comes out of the avm ready for write should be in this format
-/** - */
+/**
+ * Data held within the journal
+ */
 export type JournalData = {
   /** - */
   newCommitments: Fr[];
   /** - */
-  newL1Message: Fr[];
+  newL1Messages: Fr[];
   /** - */
-  storageWrites: { [key: string]: { [key: string]: Fr } };
+  newNullifiers: Fr[];
+  /** contract address -\> key -\> value */
+  storageWrites: Map<Fr, Map<Fr, Fr>>;
 };
 
-// This persists for an entire block
-// Each transaction should have its own journal that gets appended to this one upon success
-/** - */
+/**
+ * A cache of the current state of the AVM
+ * The interpreter should make any state queries through this object
+ *
+ * When a sub context's call succeeds, it's journal is merge into the parent
+ * When a a call fails, it's journal is discarded and the parent is used from this point forward
+ * When a call succeeds's we can merge a child into its parent
+ */
 export class AvmJournal {
-  // TODO: should we make private?
-  /** - */
+  /** Reference to node storage */
   public readonly hostStorage: HostStorage;
 
-  // We need to keep track of the following
-  // - State reads
-  // - State updates
-  // - New Commitments
-  // - Commitment reads
+  // Reading state - must be tracked for vm execution
+  // contract address -> key -> value
+  // TODO(https://github.com/AztecProtocol/aztec-packages/issues/3999)
+  private storageReads: Map<Fr, Map<Fr, Fr>> = new Map();
 
+  // New written state
   private newCommitments: Fr[] = [];
+  private newNullifiers: Fr[] = [];
   private newL1Message: Fr[] = [];
 
-  // TODO: type this structure -> contract address -> key -> value
-  private storageWrites: { [key: string]: { [key: string]: Fr } } = {};
+  // New Substrate
+  private newLogs: Fr[][] = [];
+
+  // contract address -> key -> value
+  private storageWrites: Map<Fr, Map<Fr, Fr>> = new Map();
 
-  constructor(hostStorage: HostStorage) {
+  private parentJournal: AvmJournal | undefined;
+
+  constructor(hostStorage: HostStorage, parentJournal?: AvmJournal) {
     this.hostStorage = hostStorage;
+    this.parentJournal = parentJournal;
+  }
+
+  /**
+   * Create a new root journal, without a parent
+   * @param hostStorage -
+   */
+  public static rootJournal(hostStorage: HostStorage) {
+    return new AvmJournal(hostStorage);
   }
 
-  // TODO: work on the typing
   /**
-   * -
+   * Create a new journal from a parent
+   * @param parentJournal -
+   */
+  public static branchParent(parentJournal: AvmJournal) {
+    return new AvmJournal(parentJournal.hostStorage, parentJournal);
+  }
+
+  /**
+   * Write storage into journal
+   *
    * @param contractAddress -
    * @param key -
    * @param value -
    */
   public writeStorage(contractAddress: Fr, key: Fr, value: Fr) {
-    // TODO: do we want this map to be ordered -> is there performance upside to this?
-    this.storageWrites[contractAddress.toString()][key.toString()] = value;
+    let contractMap = this.storageWrites.get(contractAddress);
+    if (!contractMap) {
+      contractMap = new Map();
+      this.storageWrites.set(contractAddress, contractMap);
+    }
+    contractMap.set(key, value);
   }
 
   /**
-   * -
+   * Read storage from journal
+   * Read from host storage on cache miss
+   *
    * @param contractAddress -
    * @param key -
+   * @returns current value
    */
-  public readStorage(contractAddress: Fr, key: Fr) {
-    const cachedValue = this.storageWrites[contractAddress.toString()][key.toString()];
+  public readStorage(contractAddress: Fr, key: Fr): Promise<Fr> {
+    const cachedValue = this.storageWrites.get(contractAddress)?.get(key);
     if (cachedValue) {
-      return cachedValue;
+      return Promise.resolve(cachedValue);
     }
-    return this.hostStorage.stateDb.storageRead(contractAddress, key);
+    if (this.parentJournal) {
+      return this.parentJournal?.readStorage(contractAddress, key);
+    }
+    return this.hostStorage.publicStateDb.storageRead(contractAddress, key);
   }
 
-  /**
-   * -
+  /** -
    * @param commitment -
    */
   public writeCommitment(commitment: Fr) {
     this.newCommitments.push(commitment);
   }
 
-  /**
-   * -
+  /** -
    * @param message -
    */
   public writeL1Message(message: Fr) {
     this.newL1Message.push(message);
   }
 
-  // TODO: This function will merge two journals together -> the new head of the chain
-  /**
-   * -
-   * @param journal -
+  /** -
+   * @param nullifier -
    */
-  public mergeJournal(journal: AvmJournal) {
-    // TODO: This function will
-    void journal;
+  public writeNullifier(nullifier: Fr) {
+    this.newNullifiers.push(nullifier);
   }
 
   /**
-   * -
+   * Merge Journal into parent
+   * - Utxo objects are concatenated
+   * - Public state is merged, with the value in the incoming journal taking precedent
+   */
+  public mergeWithParent() {
+    if (!this.parentJournal) {
+      throw new RootJournalCannotBeMerged();
+    }
+
+    const incomingFlush = this.flush();
+
+    // Merge UTXOs
+    this.parentJournal.newCommitments = this.parentJournal.newCommitments.concat(incomingFlush.newCommitments);
+    this.parentJournal.newL1Message = this.parentJournal.newL1Message.concat(incomingFlush.newL1Messages);
+    this.parentJournal.newNullifiers = this.parentJournal.newNullifiers.concat(incomingFlush.newNullifiers);
+
+    // Merge Public State
+    mergeContractMaps(this.parentJournal.storageWrites, incomingFlush.storageWrites);
+  }
+
+  /** Access the current state of the journal
+   *
+   * @returns a JournalData object that can be used to write to the storage
    */
   public flush(): JournalData {
     return {
       newCommitments: this.newCommitments,
-      newL1Message: this.newL1Message,
+      newL1Messages: this.newL1Message,
+      newNullifiers: this.newNullifiers,
       storageWrites: this.storageWrites,
     };
   }
 }
+
+/**
+ * Merges two contract maps together
+ * Where childMap keys will take precedent over the hostMap
+ * The assumption being that the child map is created at a later time
+ * And thus contains more up to date information
+ *
+ * @param hostMap - The map to be merged into
+ * @param childMap - The map to be merged from
+ */
+function mergeContractMaps(hostMap: Map<Fr, Map<Fr, Fr>>, childMap: Map<Fr, Map<Fr, Fr>>) {
+  for (const [key, value] of childMap) {
+    const map1Value = hostMap.get(key);
+    if (!map1Value) {
+      hostMap.set(key, value);
+    } else {
+      mergeStorageMaps(map1Value, value);
+    }
+  }
+}
+
+/**
+ *
+ * @param hostMap - The map to be merge into
+ * @param childMap - The map to be merged from
+ */
+function mergeStorageMaps(hostMap: Map<Fr, Fr>, childMap: Map<Fr, Fr>) {
+  for (const [key, value] of childMap) {
+    hostMap.set(key, value);
+  }
+}
diff --git a/yarn-project/acir-simulator/src/avm/opcodes/arithmetic.test.ts b/yarn-project/acir-simulator/src/avm/opcodes/arithmetic.test.ts
new file mode 100644
index 000000000000..76a802231a3b
--- /dev/null
+++ b/yarn-project/acir-simulator/src/avm/opcodes/arithmetic.test.ts
@@ -0,0 +1,110 @@
+import { Fr } from '@aztec/foundation/fields';
+
+import { mock } from 'jest-mock-extended';
+
+import { AvmMachineState } from '../avm_machine_state.js';
+import { AvmStateManager } from '../avm_state_manager.js';
+import { Add, Div, Mul, Sub } from './arithmetic.js';
+
+describe('Arithmetic Instructions', () => {
+  let machineState: AvmMachineState;
+  let stateManager = mock<AvmStateManager>();
+
+  beforeEach(() => {
+    machineState = new AvmMachineState([]);
+    stateManager = mock<AvmStateManager>();
+  });
+
+  describe('Add', () => {
+    it('Should add correctly over Fr type', () => {
+      const a = new Fr(1n);
+      const b = new Fr(2n);
+
+      machineState.writeMemory(0, a);
+      machineState.writeMemory(1, b);
+
+      new Add(0, 1, 2).execute(machineState, stateManager);
+
+      const expected = new Fr(3n);
+      const actual = machineState.readMemory(2);
+      expect(actual).toEqual(expected);
+    });
+
+    it('Should wrap around on addition', () => {
+      const a = new Fr(1n);
+      const b = new Fr(Fr.MODULUS - 1n);
+
+      machineState.writeMemory(0, a);
+      machineState.writeMemory(1, b);
+
+      new Add(0, 1, 2).execute(machineState, stateManager);
+
+      const expected = new Fr(0n);
+      const actual = machineState.readMemory(3);
+      expect(actual).toEqual(expected);
+    });
+  });
+
+  describe('Sub', () => {
+    it('Should subtract correctly over Fr type', () => {
+      const a = new Fr(1n);
+      const b = new Fr(2n);
+
+      machineState.writeMemory(0, a);
+      machineState.writeMemory(1, b);
+
+      new Sub(0, 1, 2).execute(machineState, stateManager);
+
+      const expected = new Fr(Fr.MODULUS - 1n);
+      const actual = machineState.readMemory(2);
+      expect(actual).toEqual(expected);
+    });
+  });
+
+  describe('Mul', () => {
+    it('Should multiply correctly over Fr type', () => {
+      const a = new Fr(2n);
+      const b = new Fr(3n);
+
+      machineState.writeMemory(0, a);
+      machineState.writeMemory(1, b);
+
+      new Mul(0, 1, 2).execute(machineState, stateManager);
+
+      const expected = new Fr(6n);
+      const actual = machineState.readMemory(2);
+      expect(actual).toEqual(expected);
+    });
+
+    it('Should wrap around on multiplication', () => {
+      const a = new Fr(2n);
+      const b = new Fr(Fr.MODULUS / 2n - 1n);
+
+      machineState.writeMemory(0, a);
+      machineState.writeMemory(1, b);
+
+      new Mul(0, 1, 2).execute(machineState, stateManager);
+
+      const expected = new Fr(Fr.MODULUS - 3n);
+      const actual = machineState.readMemory(2);
+      expect(actual).toEqual(expected);
+    });
+  });
+
+  describe('Div', () => {
+    it('Should perform field division', () => {
+      const a = new Fr(2n);
+      const b = new Fr(3n);
+
+      machineState.writeMemory(0, a);
+      machineState.writeMemory(1, b);
+
+      new Div(0, 1, 2).execute(machineState, stateManager);
+
+      // Note
+      const actual = machineState.readMemory(2);
+      const recovered = actual.mul(b);
+      expect(recovered).toEqual(a);
+    });
+  });
+});
diff --git a/yarn-project/acir-simulator/src/avm/opcodes/arithmetic.ts b/yarn-project/acir-simulator/src/avm/opcodes/arithmetic.ts
index ab6465debf4c..94df9713c83c 100644
--- a/yarn-project/acir-simulator/src/avm/opcodes/arithmetic.ts
+++ b/yarn-project/acir-simulator/src/avm/opcodes/arithmetic.ts
@@ -5,66 +5,81 @@ import { AvmStateManager } from '../avm_state_manager.js';
 import { Instruction } from './instruction.js';
 
 /** -*/
-export class Add implements Instruction {
+export class Add extends Instruction {
   static type: string = 'ADD';
   static numberOfOperands = 3;
 
-  constructor(private aOffset: number, private bOffset: number, private destOffset: number) {}
+  constructor(private aOffset: number, private bOffset: number, private destOffset: number) {
+    super();
+  }
 
   execute(machineState: AvmMachineState, _stateManager: AvmStateManager): void {
     const a = machineState.readMemory(this.aOffset);
     const b = machineState.readMemory(this.bOffset);
 
-    const dest = new Fr(a.toBigInt() + (b.toBigInt() % Fr.MODULUS));
+    const dest = a.add(b);
     machineState.writeMemory(this.destOffset, dest);
+
+    this.incrementPc(machineState);
   }
 }
 
 /** -*/
-export class Sub implements Instruction {
+export class Sub extends Instruction {
   static type: string = 'SUB';
   static numberOfOperands = 3;
 
-  constructor(private aOffset: number, private bOffset: number, private destOffset: number) {}
+  constructor(private aOffset: number, private bOffset: number, private destOffset: number) {
+    super();
+  }
 
   execute(machineState: AvmMachineState, _stateManager: AvmStateManager): void {
     const a = machineState.readMemory(this.aOffset);
     const b = machineState.readMemory(this.bOffset);
 
-    const dest = new Fr(a.toBigInt() - (b.toBigInt() % Fr.MODULUS));
+    const dest = a.sub(b);
     machineState.writeMemory(this.destOffset, dest);
+
+    this.incrementPc(machineState);
   }
 }
 
 /** -*/
-export class Mul implements Instruction {
+export class Mul extends Instruction {
   static type: string = 'MUL';
   static numberOfOperands = 3;
 
-  constructor(private aOffset: number, private bOffset: number, private destOffset: number) {}
+  constructor(private aOffset: number, private bOffset: number, private destOffset: number) {
+    super();
+  }
 
   execute(machineState: AvmMachineState, _stateManager: AvmStateManager): void {
     const a: Fr = machineState.readMemory(this.aOffset);
     const b: Fr = machineState.readMemory(this.bOffset);
 
-    const dest = new Fr((a.toBigInt() * b.toBigInt()) % Fr.MODULUS);
+    const dest = a.mul(b);
     machineState.writeMemory(this.destOffset, dest);
+
+    this.incrementPc(machineState);
   }
 }
 
 /** -*/
-export class Div implements Instruction {
+export class Div extends Instruction {
   static type: string = 'DIV';
   static numberOfOperands = 3;
 
-  constructor(private aOffset: number, private bOffset: number, private destOffset: number) {}
+  constructor(private aOffset: number, private bOffset: number, private destOffset: number) {
+    super();
+  }
 
   execute(machineState: AvmMachineState, _stateManager: AvmStateManager): void {
     const a: Fr = machineState.readMemory(this.aOffset);
     const b: Fr = machineState.readMemory(this.bOffset);
 
-    // TODO(https://github.com/AztecProtocol/aztec-packages/issues/3993): proper field division
-    const dest = new Fr(a.toBigInt() / b.toBigInt());
+    const dest = a.div(b);
     machineState.writeMemory(this.destOffset, dest);
+
+    this.incrementPc(machineState);
   }
 }
diff --git a/yarn-project/acir-simulator/src/avm/opcodes/bitwise.ts b/yarn-project/acir-simulator/src/avm/opcodes/bitwise.ts
index 62376269d8eb..4950c771f7c6 100644
--- a/yarn-project/acir-simulator/src/avm/opcodes/bitwise.ts
+++ b/yarn-project/acir-simulator/src/avm/opcodes/bitwise.ts
@@ -5,11 +5,13 @@ import { AvmStateManager } from '../avm_state_manager.js';
 import { Instruction } from './instruction.js';
 
 /** - */
-export class And implements Instruction {
+export class And extends Instruction {
   static type: string = 'AND';
   static numberOfOperands = 3;
 
-  constructor(private aOffset: number, private bOffset: number, private destOffset: number) {}
+  constructor(private aOffset: number, private bOffset: number, private destOffset: number) {
+    super();
+  }
 
   execute(machineState: AvmMachineState, _stateManager: AvmStateManager): void {
     const a: Fr = machineState.readMemory(this.aOffset);
@@ -17,15 +19,19 @@ export class And implements Instruction {
 
     const dest = new Fr(a.toBigInt() & b.toBigInt());
     machineState.writeMemory(this.destOffset, dest);
+
+    this.incrementPc(machineState);
   }
 }
 
 /** - */
-export class Or implements Instruction {
+export class Or extends Instruction {
   static type: string = 'OR';
   static numberOfOperands = 3;
 
-  constructor(private aOffset: number, private bOffset: number, private destOffset: number) {}
+  constructor(private aOffset: number, private bOffset: number, private destOffset: number) {
+    super();
+  }
 
   execute(machineState: AvmMachineState, _stateManager: AvmStateManager): void {
     const a: Fr = machineState.readMemory(this.aOffset);
@@ -33,15 +39,19 @@ export class Or implements Instruction {
 
     const dest = new Fr(a.toBigInt() | b.toBigInt());
     machineState.writeMemory(this.destOffset, dest);
+
+    this.incrementPc(machineState);
   }
 }
 
 /** - */
-export class Xor implements Instruction {
+export class Xor extends Instruction {
   static type: string = 'XOR';
   static numberOfOperands = 3;
 
-  constructor(private aOffset: number, private bOffset: number, private destOffset: number) {}
+  constructor(private aOffset: number, private bOffset: number, private destOffset: number) {
+    super();
+  }
 
   execute(machineState: AvmMachineState, _stateManager: AvmStateManager): void {
     const a: Fr = machineState.readMemory(this.aOffset);
@@ -49,30 +59,42 @@ export class Xor implements Instruction {
 
     const dest = new Fr(a.toBigInt() ^ b.toBigInt());
     machineState.writeMemory(this.destOffset, dest);
+
+    this.incrementPc(machineState);
   }
 }
 
 /** - */
-export class Not implements Instruction {
+export class Not extends Instruction {
   static type: string = 'NOT';
   static numberOfOperands = 2;
 
-  constructor(private aOffset: number, private bOffset: number, private destOffset: number) {}
+  constructor(private aOffset: number, private destOffset: number) {
+    super();
+  }
 
   execute(machineState: AvmMachineState, _stateManager: AvmStateManager): void {
     const a: Fr = machineState.readMemory(this.aOffset);
 
-    const dest = new Fr(~a.toBigInt());
+    // TODO: hack -> Bitwise operations should not occur over field elements
+    // It should only work over integers
+    const result = ~a.toBigInt();
+
+    const dest = new Fr(result < 0 ? Fr.MODULUS + /* using a + as result is -ve*/ result : result);
     machineState.writeMemory(this.destOffset, dest);
+
+    this.incrementPc(machineState);
   }
 }
 
 /** -*/
-export class Shl implements Instruction {
+export class Shl extends Instruction {
   static type: string = 'SHL';
   static numberOfOperands = 3;
 
-  constructor(private aOffset: number, private bOffset: number, private destOffset: number) {}
+  constructor(private aOffset: number, private bOffset: number, private destOffset: number) {
+    super();
+  }
 
   execute(machineState: AvmMachineState, _stateManager: AvmStateManager): void {
     const a: Fr = machineState.readMemory(this.aOffset);
@@ -80,15 +102,19 @@ export class Shl implements Instruction {
 
     const dest = new Fr(a.toBigInt() << b.toBigInt());
     machineState.writeMemory(this.destOffset, dest);
+
+    this.incrementPc(machineState);
   }
 }
 
 /** -*/
-export class Shr implements Instruction {
+export class Shr extends Instruction {
   static type: string = 'SHR';
   static numberOfOperands = 3;
 
-  constructor(private aOffset: number, private bOffset: number, private destOffset: number) {}
+  constructor(private aOffset: number, private bOffset: number, private destOffset: number) {
+    super();
+  }
 
   execute(machineState: AvmMachineState, _stateManager: AvmStateManager): void {
     const a: Fr = machineState.readMemory(this.aOffset);
@@ -96,5 +122,7 @@ export class Shr implements Instruction {
 
     const dest = new Fr(a.toBigInt() >> b.toBigInt());
     machineState.writeMemory(this.destOffset, dest);
+
+    this.incrementPc(machineState);
   }
 }
diff --git a/yarn-project/acir-simulator/src/avm/opcodes/comparators.ts b/yarn-project/acir-simulator/src/avm/opcodes/comparators.ts
index ddd3c9d1de99..685a5438c421 100644
--- a/yarn-project/acir-simulator/src/avm/opcodes/comparators.ts
+++ b/yarn-project/acir-simulator/src/avm/opcodes/comparators.ts
@@ -5,11 +5,13 @@ import { AvmStateManager } from '../avm_state_manager.js';
 import { Instruction } from './instruction.js';
 
 /** -*/
-export class Eq implements Instruction {
+export class Eq extends Instruction {
   static type: string = 'EQ';
   static numberOfOperands = 3;
 
-  constructor(private aOffset: number, private bOffset: number, private destOffset: number) {}
+  constructor(private aOffset: number, private bOffset: number, private destOffset: number) {
+    super();
+  }
 
   execute(machineState: AvmMachineState, _stateManager: AvmStateManager): void {
     const a: Fr = machineState.readMemory(this.aOffset);
@@ -17,14 +19,18 @@ export class Eq implements Instruction {
 
     const dest = new Fr(a.toBigInt() == b.toBigInt());
     machineState.writeMemory(this.destOffset, dest);
+
+    this.incrementPc(machineState);
   }
 }
 /** -*/
-export class Lt implements Instruction {
+export class Lt extends Instruction {
   static type: string = 'Lt';
   static numberOfOperands = 3;
 
-  constructor(private aOffset: number, private bOffset: number, private destOffset: number) {}
+  constructor(private aOffset: number, private bOffset: number, private destOffset: number) {
+    super();
+  }
 
   execute(machineState: AvmMachineState, _stateManager: AvmStateManager): void {
     const a: Fr = machineState.readMemory(this.aOffset);
@@ -32,15 +38,19 @@ export class Lt implements Instruction {
 
     const dest = new Fr(a.toBigInt() < b.toBigInt());
     machineState.writeMemory(this.destOffset, dest);
+
+    this.incrementPc(machineState);
   }
 }
 
 /** -*/
-export class Lte implements Instruction {
+export class Lte extends Instruction {
   static type: string = 'LTE';
   static numberOfOperands = 3;
 
-  constructor(private aOffset: number, private bOffset: number, private destOffset: number) {}
+  constructor(private aOffset: number, private bOffset: number, private destOffset: number) {
+    super();
+  }
 
   execute(machineState: AvmMachineState, _stateManager: AvmStateManager): void {
     const a: Fr = machineState.readMemory(this.aOffset);
@@ -48,5 +58,7 @@ export class Lte implements Instruction {
 
     const dest = new Fr(a.toBigInt() < b.toBigInt());
     machineState.writeMemory(this.destOffset, dest);
+
+    this.incrementPc(machineState);
   }
 }
diff --git a/yarn-project/acir-simulator/src/avm/opcodes/control_flow.test.ts b/yarn-project/acir-simulator/src/avm/opcodes/control_flow.test.ts
new file mode 100644
index 000000000000..864ee0d0b425
--- /dev/null
+++ b/yarn-project/acir-simulator/src/avm/opcodes/control_flow.test.ts
@@ -0,0 +1,146 @@
+import { Fr } from '@aztec/foundation/fields';
+
+import { mock } from 'jest-mock-extended';
+
+import { AvmMachineState } from '../avm_machine_state.js';
+import { AvmStateManager } from '../avm_state_manager.js';
+import { Add, Mul, Sub } from './arithmetic.js';
+import { And, Not, Or, Shl, Shr, Xor } from './bitwise.js';
+import { Eq, Lt, Lte } from './comparators.js';
+import { InternalCall, InternalCallStackEmptyError, InternalReturn, Jump, JumpI } from './control_flow.js';
+import { CalldataCopy, Cast, Mov, Set } from './memory.js';
+
+describe('Control Flow Opcodes', () => {
+  let stateManager = mock<AvmStateManager>();
+  let machineState: AvmMachineState;
+
+  beforeEach(() => {
+    stateManager = mock<AvmStateManager>();
+    machineState = new AvmMachineState([]);
+  });
+
+  it('Should implement JUMP', () => {
+    const jumpLocation = 22;
+
+    expect(machineState.pc).toBe(0);
+
+    const instruction = new Jump(jumpLocation);
+    instruction.execute(machineState, stateManager);
+    expect(machineState.pc).toBe(jumpLocation);
+  });
+
+  it('Should implement JUMPI - truthy', () => {
+    const jumpLocation = 22;
+    const jumpLocation1 = 69;
+
+    expect(machineState.pc).toBe(0);
+
+    machineState.writeMemory(0, new Fr(1n));
+    machineState.writeMemory(1, new Fr(2n));
+
+    const instruction = new JumpI(jumpLocation, 0);
+    instruction.execute(machineState, stateManager);
+    expect(machineState.pc).toBe(jumpLocation);
+
+    // Truthy can be greater than 1
+    const instruction1 = new JumpI(jumpLocation1, 1);
+    instruction1.execute(machineState, stateManager);
+    expect(machineState.pc).toBe(jumpLocation1);
+  });
+
+  it('Should implement JUMPI - falsy', () => {
+    const jumpLocation = 22;
+
+    expect(machineState.pc).toBe(0);
+
+    machineState.writeMemory(0, new Fr(0n));
+
+    const instruction = new JumpI(jumpLocation, 0);
+    instruction.execute(machineState, stateManager);
+    expect(machineState.pc).toBe(1);
+  });
+
+  it('Should implement Internal Call and Return', () => {
+    const jumpLocation = 22;
+
+    expect(machineState.pc).toBe(0);
+
+    const instruction = new InternalCall(jumpLocation);
+    const returnInstruction = new InternalReturn();
+
+    instruction.execute(machineState, stateManager);
+    expect(machineState.pc).toBe(jumpLocation);
+
+    returnInstruction.execute(machineState, stateManager);
+    expect(machineState.pc).toBe(1);
+  });
+
+  it('Should chain series of control flow instructions', () => {
+    const jumpLocation0 = 22;
+    const jumpLocation1 = 69;
+    const jumpLocation2 = 1337;
+
+    const aloneJumpLocation = 420;
+
+    const instructions = [
+      // pc  |  internal call stack
+      new InternalCall(jumpLocation0), // 22  | [1]
+      new InternalCall(jumpLocation1), // 69  | [1, 23]
+      new InternalReturn(), // 23  | [1]
+      new Jump(aloneJumpLocation), // 420 | [1]
+      new InternalCall(jumpLocation2), // 1337| [1, 421]
+      new InternalReturn(), // 421 | [1]
+      new InternalReturn(), // 1   | []
+    ];
+
+    // The expected program counter after each instruction is invoked
+    const expectedPcs = [
+      jumpLocation0,
+      jumpLocation1,
+      jumpLocation0 + 1,
+      aloneJumpLocation,
+      jumpLocation2,
+      aloneJumpLocation + 1,
+      1,
+    ];
+
+    for (let i = 0; i < instructions.length; i++) {
+      instructions[i].execute(machineState, stateManager);
+      expect(machineState.pc).toBe(expectedPcs[i]);
+    }
+  });
+
+  it('Should error if Internal Return is called without a corresponding Internal Call', () => {
+    const returnInstruction = new InternalReturn();
+    expect(() => returnInstruction.execute(machineState, stateManager)).toThrow(InternalCallStackEmptyError);
+  });
+
+  it('Should increment PC on All other Instructions', () => {
+    const instructions = [
+      new Add(0, 1, 2),
+      new Sub(0, 1, 2),
+      new Mul(0, 1, 2),
+      new Lt(0, 1, 2),
+      new Lte(0, 1, 2),
+      new Eq(0, 1, 2),
+      new Xor(0, 1, 2),
+      new And(0, 1, 2),
+      new Or(0, 1, 2),
+      new Shl(0, 1, 2),
+      new Shr(0, 1, 2),
+      new Not(0, 2),
+      new CalldataCopy(0, 1, 2),
+      new Set(0n, 1),
+      new Mov(0, 1),
+      new Cast(0, 1),
+    ];
+
+    for (const instruction of instructions) {
+      // Use a fresh machine state each run
+      const innerMachineState = new AvmMachineState([]);
+      expect(machineState.pc).toBe(0);
+      instruction.execute(innerMachineState, stateManager);
+      expect(innerMachineState.pc).toBe(1);
+    }
+  });
+});
diff --git a/yarn-project/acir-simulator/src/avm/opcodes/control_flow.ts b/yarn-project/acir-simulator/src/avm/opcodes/control_flow.ts
index 31336e397be2..b988979076e1 100644
--- a/yarn-project/acir-simulator/src/avm/opcodes/control_flow.ts
+++ b/yarn-project/acir-simulator/src/avm/opcodes/control_flow.ts
@@ -3,14 +3,94 @@ import { AvmStateManager } from '../avm_state_manager.js';
 import { Instruction } from './instruction.js';
 
 /** - */
-export class Return implements Instruction {
+export class Return extends Instruction {
   static type: string = 'RETURN';
   static numberOfOperands = 2;
 
-  constructor(private returnOffset: number, private copySize: number) {}
+  constructor(private returnOffset: number, private copySize: number) {
+    super();
+  }
 
   execute(machineState: AvmMachineState, _stateManager: AvmStateManager): void {
     const returnData = machineState.readMemoryChunk(this.returnOffset, this.returnOffset + this.copySize);
     machineState.setReturnData(returnData);
+
+    this.halt(machineState);
+  }
+}
+
+/** -*/
+export class Jump extends Instruction {
+  static type: string = 'JUMP';
+  static numberOfOperands = 1;
+
+  constructor(private jumpOffset: number) {
+    super();
+  }
+
+  execute(machineState: AvmMachineState, _stateManager: AvmStateManager): void {
+    machineState.pc = this.jumpOffset;
+  }
+}
+
+/** -*/
+export class JumpI extends Instruction {
+  static type: string = 'JUMPI';
+  static numberOfOperands = 1;
+
+  constructor(private jumpOffset: number, private condOffset: number) {
+    super();
+  }
+
+  execute(machineState: AvmMachineState, _stateManager: AvmStateManager): void {
+    const condition = machineState.readMemory(this.condOffset);
+
+    if (condition.toBigInt() == 0n) {
+      this.incrementPc(machineState);
+    } else {
+      machineState.pc = this.jumpOffset;
+    }
+  }
+}
+
+/** -*/
+export class InternalCall extends Instruction {
+  static type: string = 'INTERNALCALL';
+  static numberOfOperands = 1;
+
+  constructor(private jumpOffset: number) {
+    super();
+  }
+
+  execute(machineState: AvmMachineState, _stateManager: AvmStateManager): void {
+    machineState.internalCallStack.push(machineState.pc + 1);
+    machineState.pc = this.jumpOffset;
+  }
+}
+
+/** -*/
+export class InternalReturn extends Instruction {
+  static type: string = 'INTERNALRETURN';
+  static numberOfOperands = 0;
+
+  constructor() {
+    super();
+  }
+
+  execute(machineState: AvmMachineState, _stateManager: AvmStateManager): void {
+    const jumpOffset = machineState.internalCallStack.pop();
+    if (jumpOffset === undefined) {
+      throw new InternalCallStackEmptyError();
+    }
+    machineState.pc = jumpOffset;
+  }
+}
+
+/**
+ * Thrown if the internal call stack is popped when it is empty
+ */
+export class InternalCallStackEmptyError extends Error {
+  constructor() {
+    super('Internal call stack is empty');
   }
 }
diff --git a/yarn-project/acir-simulator/src/avm/opcodes/from_bytecode.test.ts b/yarn-project/acir-simulator/src/avm/opcodes/decode_bytecode.test.ts
similarity index 63%
rename from yarn-project/acir-simulator/src/avm/opcodes/from_bytecode.test.ts
rename to yarn-project/acir-simulator/src/avm/opcodes/decode_bytecode.test.ts
index e7f95b89b4f8..57502440e2d3 100644
--- a/yarn-project/acir-simulator/src/avm/opcodes/from_bytecode.test.ts
+++ b/yarn-project/acir-simulator/src/avm/opcodes/decode_bytecode.test.ts
@@ -1,20 +1,20 @@
 import { Add, Sub } from './arithmetic.js';
-import { OPCODE_BYTE_LENGTH, OPERAND_BTYE_LENGTH, interpretBytecode } from './from_bytecode.js';
-import { Instruction } from './instruction.js';
+import { decodeBytecode } from './decode_bytecode.js';
+import { AVM_OPCODE_BYTE_LENGTH, AVM_OPERAND_BYTE_LENGTH, Instruction } from './instruction.js';
 
-describe('Avm Interpreter', () => {
+describe('Avm Decoder', () => {
   const toByte = (num: number): Buffer => {
-    const buf = Buffer.alloc(OPCODE_BYTE_LENGTH);
+    const buf = Buffer.alloc(AVM_OPCODE_BYTE_LENGTH);
     buf.writeUInt8(num);
     return buf;
   };
   const to4Byte = (num: number): Buffer => {
-    const buf = Buffer.alloc(OPERAND_BTYE_LENGTH);
+    const buf = Buffer.alloc(AVM_OPERAND_BYTE_LENGTH);
     buf.writeUInt32BE(num);
     return buf;
   };
 
-  it('Should read bytecode string into a list of opcodes', () => {
+  it('Should read bytecode buffer into a list of opcodes', () => {
     const opcode = 1;
     const opcode2 = 2;
     const a = 1;
@@ -30,7 +30,7 @@ describe('Avm Interpreter', () => {
 
     const expectedInstructions: Instruction[] = [new Add(a, b, c), new Sub(a, b, c)];
 
-    const instructions = interpretBytecode(bytecode);
+    const instructions = decodeBytecode(bytecode);
     expect(instructions).toEqual(expectedInstructions);
   });
 });
diff --git a/yarn-project/acir-simulator/src/avm/opcodes/decode_bytecode.ts b/yarn-project/acir-simulator/src/avm/opcodes/decode_bytecode.ts
new file mode 100644
index 000000000000..624546cfbeb2
--- /dev/null
+++ b/yarn-project/acir-simulator/src/avm/opcodes/decode_bytecode.ts
@@ -0,0 +1,40 @@
+import { AVM_OPCODE_BYTE_LENGTH, AVM_OPERAND_BYTE_LENGTH, Instruction } from './instruction.js';
+import { INSTRUCTION_SET } from './instruction_set.js';
+import { Opcode } from './opcodes.js';
+
+/**
+ * Convert a buffer of bytecode into an array of instructions
+ * @param bytecode - Buffer of bytecode
+ * @returns Bytecode decoded into an ordered array of Instructions
+ */
+export function decodeBytecode(bytecode: Buffer): Instruction[] {
+  let bytePtr = 0;
+  const bytecodeLength = bytecode.length;
+
+  const instructions: Instruction[] = [];
+
+  while (bytePtr < bytecodeLength) {
+    const opcodeByte = bytecode[bytePtr];
+    bytePtr += AVM_OPCODE_BYTE_LENGTH;
+    if (!(opcodeByte in Opcode)) {
+      throw new Error(`Opcode ${opcodeByte} not implemented`);
+    }
+    const opcode = opcodeByte as Opcode;
+
+    const instructionType = INSTRUCTION_SET.get(opcode);
+    if (instructionType === undefined) {
+      throw new Error(`Opcode ${opcode} not implemented`);
+    }
+    const numberOfOperands = instructionType.numberOfOperands;
+    const operands: number[] = [];
+    for (let i = 0; i < numberOfOperands; i++) {
+      const operand = bytecode.readUInt32BE(bytePtr);
+      bytePtr += AVM_OPERAND_BYTE_LENGTH;
+      operands.push(operand);
+    }
+
+    instructions.push(new instructionType(...operands));
+  }
+
+  return instructions;
+}
diff --git a/yarn-project/acir-simulator/src/avm/opcodes/encode_to_bytecode.test.ts b/yarn-project/acir-simulator/src/avm/opcodes/encode_to_bytecode.test.ts
new file mode 100644
index 000000000000..8b1ea033deed
--- /dev/null
+++ b/yarn-project/acir-simulator/src/avm/opcodes/encode_to_bytecode.test.ts
@@ -0,0 +1,30 @@
+import { encodeToBytecode } from './encode_to_bytecode.js';
+import { AVM_OPCODE_BYTE_LENGTH, AVM_OPERAND_BYTE_LENGTH } from './instruction.js';
+import { Opcode } from './opcodes.js';
+
+describe('Avm Encoder', () => {
+  const toByte = (num: number): Buffer => {
+    const buf = Buffer.alloc(AVM_OPCODE_BYTE_LENGTH);
+    buf.writeUInt8(num);
+    return buf;
+  };
+  const to4Byte = (num: number): Buffer => {
+    const buf = Buffer.alloc(AVM_OPERAND_BYTE_LENGTH);
+    buf.writeUInt32BE(num);
+    return buf;
+  };
+
+  it('Should properly encode instructions into bytecode buffers', () => {
+    const addArgs = [0, 1, 2];
+    const subArgs = [3, 4, 5];
+
+    const addBytecode = encodeToBytecode(Opcode.ADD, addArgs);
+    const subBytecode = encodeToBytecode(Opcode.SUB, subArgs);
+
+    const expectedAddBytecode = Buffer.concat([toByte(Opcode.ADD), to4Byte(0), to4Byte(1), to4Byte(2)]);
+    const expectedSubBytecode = Buffer.concat([toByte(Opcode.SUB), to4Byte(3), to4Byte(4), to4Byte(5)]);
+
+    expect(addBytecode).toEqual(expectedAddBytecode);
+    expect(subBytecode).toEqual(expectedSubBytecode);
+  });
+});
diff --git a/yarn-project/acir-simulator/src/avm/opcodes/encode_to_bytecode.ts b/yarn-project/acir-simulator/src/avm/opcodes/encode_to_bytecode.ts
new file mode 100644
index 000000000000..186706847d39
--- /dev/null
+++ b/yarn-project/acir-simulator/src/avm/opcodes/encode_to_bytecode.ts
@@ -0,0 +1,32 @@
+import { AVM_OPCODE_BYTE_LENGTH, AVM_OPERAND_BYTE_LENGTH } from './instruction.js';
+import { INSTRUCTION_SET } from './instruction_set.js';
+import { Opcode } from './opcodes.js';
+
+/**
+ * Encode an instruction (opcode & arguments) to bytecode.
+ * @param opcode - the opcode to encode
+ * @param args - the arguments to encode
+ * @returns the bytecode for this one instruction
+ */
+export function encodeToBytecode(opcode: Opcode, args: number[]): Buffer {
+  const instructionType = INSTRUCTION_SET.get(opcode);
+  if (instructionType === undefined) {
+    throw new Error(`Opcode ${opcode} not implemented`);
+  }
+
+  const numberOfOperands = instructionType.numberOfOperands;
+  if (args.length !== numberOfOperands) {
+    throw new Error(`Opcode ${opcode} expects ${numberOfOperands} arguments, but ${args.length} were provided`);
+  }
+
+  const bytecode = Buffer.alloc(AVM_OPCODE_BYTE_LENGTH + numberOfOperands * AVM_OPERAND_BYTE_LENGTH);
+
+  let bytePtr = 0;
+  bytecode.writeUInt8(opcode as number, bytePtr);
+  bytePtr += AVM_OPCODE_BYTE_LENGTH;
+  for (let i = 0; i < args.length; i++) {
+    bytecode.writeUInt32BE(args[i], bytePtr);
+    bytePtr += AVM_OPERAND_BYTE_LENGTH;
+  }
+  return bytecode;
+}
diff --git a/yarn-project/acir-simulator/src/avm/opcodes/from_bytecode.ts b/yarn-project/acir-simulator/src/avm/opcodes/from_bytecode.ts
deleted file mode 100644
index 697ff6be13bc..000000000000
--- a/yarn-project/acir-simulator/src/avm/opcodes/from_bytecode.ts
+++ /dev/null
@@ -1,62 +0,0 @@
-import { Add, Mul, Sub } from './arithmetic.js';
-import { Instruction } from './instruction.js';
-
-export const OPERAND_BIT_LENGTH = 32;
-export const OPERAND_BTYE_LENGTH = 4;
-export const OPCODE_BIT_LENGTH = 8;
-export const OPCODE_BYTE_LENGTH = 1;
-
-const OPERANDS_LOOKUP: { [key: number]: number } = {
-  0x1: Add.numberOfOperands,
-  0x2: Sub.numberOfOperands,
-  0x3: Mul.numberOfOperands,
-};
-
-/**
- * Given the opcode and operands that have been parsed by the interpreter
- * We return a construction of the opcode
- *
- * @param opcode - Opcode value
- * @param operands - Array of operands
- */
-function instructionLookup(opcode: number, operands: number[]): Instruction {
-  switch (opcode) {
-    case 0x1:
-      return new Add(operands[0], operands[1], operands[2]);
-    case 0x2:
-      return new Sub(operands[0], operands[1], operands[2]);
-    case 0x3:
-      return new Mul(operands[0], operands[1], operands[2]);
-    default:
-      throw new Error(`Opcode ${opcode} not found`);
-  }
-}
-
-/**
- * Convert a buffer of bytecode into an array of instructions
- * @param bytecode - Buffer of bytecode
- * @returns Bytecode interpreted into an ordered array of Instructions
- */
-export function interpretBytecode(bytecode: Buffer): Instruction[] {
-  let readPtr = 0;
-  const bytecodeLength = bytecode.length;
-
-  const instructions: Instruction[] = [];
-
-  while (readPtr < bytecodeLength) {
-    const opcode = bytecode[readPtr];
-    readPtr += 1;
-
-    const numberOfOperands = OPERANDS_LOOKUP[opcode];
-    const operands: number[] = [];
-    for (let i = 0; i < numberOfOperands; i++) {
-      const operand = bytecode.readUInt32BE(readPtr);
-      readPtr += OPERAND_BTYE_LENGTH;
-      operands.push(operand);
-    }
-
-    instructions.push(instructionLookup(opcode, operands));
-  }
-
-  return instructions;
-}
diff --git a/yarn-project/acir-simulator/src/avm/opcodes/instruction.ts b/yarn-project/acir-simulator/src/avm/opcodes/instruction.ts
index 0411251b7053..c77a1a9ddd38 100644
--- a/yarn-project/acir-simulator/src/avm/opcodes/instruction.ts
+++ b/yarn-project/acir-simulator/src/avm/opcodes/instruction.ts
@@ -1,9 +1,20 @@
 import { AvmMachineState } from '../avm_machine_state.js';
 import { AvmStateManager } from '../avm_state_manager.js';
 
+export const AVM_OPERAND_BYTE_LENGTH = 4;
+export const AVM_OPCODE_BYTE_LENGTH = 1;
+
 /**
  * Opcode base class
  */
 export abstract class Instruction {
   abstract execute(machineState: AvmMachineState, stateManager: AvmStateManager): void;
+
+  incrementPc(machineState: AvmMachineState): void {
+    machineState.pc++;
+  }
+
+  halt(machineState: AvmMachineState): void {
+    machineState.halted = true;
+  }
 }
diff --git a/yarn-project/acir-simulator/src/avm/opcodes/instruction_set.ts b/yarn-project/acir-simulator/src/avm/opcodes/instruction_set.ts
new file mode 100644
index 000000000000..4395ba46d534
--- /dev/null
+++ b/yarn-project/acir-simulator/src/avm/opcodes/instruction_set.ts
@@ -0,0 +1,101 @@
+import { Add, Div, Mul, Sub } from './arithmetic.js';
+//import { And, Not, Or, Shl, Shr, Xor } from './bitwise.js';
+//import { Eq, Lt, Lte } from './comparators.js';
+import { InternalCall, InternalReturn, Jump, JumpI, Return } from './control_flow.js';
+import { Instruction } from './instruction.js';
+import {
+  CalldataCopy,
+  /*Cast, Mov*/
+} from './memory.js';
+import { Opcode } from './opcodes.js';
+
+/** - */
+type InstructionConstructor = new (...args: any[]) => Instruction;
+/** - */
+type InstructionConstructorAndMembers = InstructionConstructor & {
+  /** - */
+  numberOfOperands: number;
+};
+
+export const INSTRUCTION_SET: Map<Opcode, InstructionConstructorAndMembers> = new Map(
+  new Array<[Opcode, InstructionConstructorAndMembers]>(
+    // Compute
+    // Compute - Arithmetic
+    [Opcode.ADD, Add],
+    [Opcode.SUB, Sub],
+    [Opcode.MUL, Mul],
+    [Opcode.DIV, Div],
+    //// Compute - Comparators
+    //[Opcode.EQ, Eq],
+    //[Opcode.LT, Lt],
+    //[Opcode.LTE, Lte],
+    //// Compute - Bitwise
+    //[Opcode.AND, And],
+    //[Opcode.OR, Or],
+    //[Opcode.XOR, Xor],
+    //[Opcode.NOT, Not],
+    //[Opcode.SHL, Shl],
+    //[Opcode.SHR, Shr],
+    //// Compute - Type Conversions
+    //[Opcode.CAST, Cast],
+
+    //// Execution Environment
+    //[Opcode.ADDRESS, Address],
+    //[Opcode.STORAGEADDRESS, Storageaddress],
+    //[Opcode.ORIGIN, Origin],
+    //[Opcode.SENDER, Sender],
+    //[Opcode.PORTAL, Portal],
+    //[Opcode.FEEPERL1GAS, Feeperl1gas],
+    //[Opcode.FEEPERL2GAS, Feeperl2gas],
+    //[Opcode.FEEPERDAGAS, Feeperdagas],
+    //[Opcode.CONTRACTCALLDEPTH, Contractcalldepth],
+    //// Execution Environment - Globals
+    //[Opcode.CHAINID, Chainid],
+    //[Opcode.VERSION, Version],
+    //[Opcode.BLOCKNUMBER, Blocknumber],
+    //[Opcode.TIMESTAMP, Timestamp],
+    //[Opcode.COINBASE, Coinbase],
+    //[Opcode.BLOCKL1GASLIMIT, Blockl1gaslimit],
+    //[Opcode.BLOCKL2GASLIMIT, Blockl2gaslimit],
+    //[Opcode.BLOCKDAGASLIMIT, Blockdagaslimit],
+    // Execution Environment - Calldata
+    [Opcode.CALLDATACOPY, CalldataCopy],
+
+    //// Machine State
+    // Machine State - Gas
+    //[Opcode.L1GASLEFT, L1gasleft],
+    //[Opcode.L2GASLEFT, L2gasleft],
+    //[Opcode.DAGASLEFT, Dagasleft],
+    //// Machine State - Internal Control Flow
+    [Opcode.JUMP, Jump],
+    [Opcode.JUMPI, JumpI],
+    [Opcode.INTERNALCALL, InternalCall],
+    [Opcode.INTERNALRETURN, InternalReturn],
+    //// Machine State - Memory
+    //[Opcode.SET, Set],
+    //[Opcode.MOV, Mov],
+    //[Opcode.CMOV, CMov],
+
+    //// World State
+    //[Opcode.BLOCKHEADERBYNUMBER, Blockheaderbynumber],
+    //[Opcode.SLOAD, Sload], // Public Storage
+    //[Opcode.SSTORE, Sstore], // Public Storage
+    //[Opcode.READL1TOL2MSG, Readl1tol2msg], // Messages
+    //[Opcode.SENDL2TOL1MSG, Sendl2tol1msg], // Messages
+    //[Opcode.EMITNOTEHASH, Emitnotehash], // Notes & Nullifiers
+    //[Opcode.EMITNULLIFIER, Emitnullifier], // Notes & Nullifiers
+
+    //// Accrued Substate
+    //[Opcode.EMITUNENCRYPTEDLOG, Emitunencryptedlog],
+
+    //// Control Flow - Contract Calls
+    //[Opcode.CALL, Call],
+    //[Opcode.STATICCALL, Staticcall],
+    [Opcode.RETURN, Return],
+    //[Opcode.REVERT, Revert],
+
+    //// Gadgets
+    //[Opcode.KECCAK, Keccak],
+    //[Opcode.POSEIDON, Poseidon],
+  ),
+);
diff --git a/yarn-project/acir-simulator/src/avm/opcodes/memory.ts b/yarn-project/acir-simulator/src/avm/opcodes/memory.ts
index 38fa560a3e6a..c856645eef9b 100644
--- a/yarn-project/acir-simulator/src/avm/opcodes/memory.ts
+++ b/yarn-project/acir-simulator/src/avm/opcodes/memory.ts
@@ -5,56 +5,72 @@ import { AvmStateManager } from '../avm_state_manager.js';
 import { Instruction } from './instruction.js';
 
 /** - */
-export class Set implements Instruction {
+export class Set extends Instruction {
   static type: string = 'SET';
   static numberOfOperands = 2;
 
-  constructor(private constt: bigint, private destOffset: number) {}
+  constructor(private constt: bigint, private destOffset: number) {
+    super();
+  }
 
   execute(machineState: AvmMachineState, _stateManager: AvmStateManager): void {
     const dest = new Fr(this.constt);
     machineState.writeMemory(this.destOffset, dest);
+
+    this.incrementPc(machineState);
   }
 }
 
 // TODO(https://github.com/AztecProtocol/aztec-packages/issues/3987): tags are not implemented yet - this will behave as a mov
 /** - */
-export class Cast implements Instruction {
+export class Cast extends Instruction {
   static type: string = 'CAST';
   static numberOfOperands = 2;
 
-  constructor(private aOffset: number, private destOffset: number) {}
+  constructor(private aOffset: number, private destOffset: number) {
+    super();
+  }
 
   execute(machineState: AvmMachineState, _stateManager: AvmStateManager): void {
     const a = machineState.readMemory(this.aOffset);
 
     machineState.writeMemory(this.destOffset, a);
+
+    this.incrementPc(machineState);
   }
 }
 
 /** - */
-export class Mov implements Instruction {
+export class Mov extends Instruction {
   static type: string = 'MOV';
   static numberOfOperands = 2;
 
-  constructor(private aOffset: number, private destOffset: number) {}
+  constructor(private aOffset: number, private destOffset: number) {
+    super();
+  }
 
   execute(machineState: AvmMachineState, _stateManager: AvmStateManager): void {
     const a = machineState.readMemory(this.aOffset);
 
     machineState.writeMemory(this.destOffset, a);
+
+    this.incrementPc(machineState);
   }
 }
 
 /** - */
-export class CallDataCopy implements Instruction {
+export class CalldataCopy extends Instruction {
   static type: string = 'CALLDATACOPY';
   static numberOfOperands = 3;
 
-  constructor(private cdOffset: number, private copySize: number, private destOffset: number) {}
+  constructor(private cdOffset: number, private copySize: number, private destOffset: number) {
+    super();
+  }
 
   execute(machineState: AvmMachineState, _stateManager: AvmStateManager): void {
     const calldata = machineState.calldata.slice(this.cdOffset, this.cdOffset + this.copySize);
     machineState.writeMemoryChunk(this.destOffset, calldata);
+
+    this.incrementPc(machineState);
   }
 }
diff --git a/yarn-project/acir-simulator/src/avm/opcodes/opcodes.ts b/yarn-project/acir-simulator/src/avm/opcodes/opcodes.ts
index c277c0556281..e0760e102132 100644
--- a/yarn-project/acir-simulator/src/avm/opcodes/opcodes.ts
+++ b/yarn-project/acir-simulator/src/avm/opcodes/opcodes.ts
@@ -1,48 +1,38 @@
 /**
- * All avm opcodes
+ * All AVM opcodes
  */
-export enum Opcodes {
-  // Arithmetic
+export enum Opcode {
+  // Compute
+  // Compute - Arithmetic
   ADD,
   SUB,
   MUL,
   DIV,
+  // Compute - Comparators
   EQ,
   LT,
   LTE,
+  // Compute - Bitwise
   AND,
   OR,
   XOR,
   NOT,
   SHL,
   SHR,
+  // Compute - Type Conversions
   CAST,
-  // Memory
-  SET,
-  MOV,
-  CMOV,
-  CALLDATACOPY,
-
-  // Logs
-  EMITNOTEHASH,
-  EMITNULLIFIER,
-  SENDL2TOL1MSG,
-  ULOG,
-  // Control flow
-  JUMP,
-  JUMPI,
-  INTERNALCALL,
-  INTERNALRETURN,
-
-  // Storage
-  SLOAD,
-  SSTORE,
-  // Contract call control flow
-  RETURN,
-  REVERT,
-  CALL,
-  STATICCALL,
 
+  // Execution Environment
+  ADDRESS,
+  STORAGEADDRESS,
+  ORIGIN,
+  SENDER,
+  PORTAL,
+  FEEPERL1GAS,
+  FEEPERL2GAS,
+  FEEPERDAGAS,
+  CONTRACTCALLDEPTH,
+  // Execution Environment - Globals
   CHAINID,
   VERSION,
   BLOCKNUMBER,
@@ -50,28 +40,44 @@ export enum Opcodes {
   COINBASE,
   BLOCKL1GASLIMIT,
   BLOCKL2GASLIMIT,
-  NULLIFIERSOOT,
-  CONTRACTSROOT,
-  MSGSROOT,
-  NOTESROOT,
-  PUBLICDATAROOT,
-  GLOBALSHASH,
-  BLOCKSROOT,
-  GRANDROOT,
+  BLOCKDAGASLIMIT,
+  // Execution Environment - Calldata
+  CALLDATACOPY,
 
-  // Call context
-  ORIGIN,
-  REFUNDEE,
-  FEEPERL1GAS,
-  FEEPERL2GAS,
-  CALLER,
-  ADDRESS,
-  PORTAL,
-  CALLDEPTH,
-  l1GAS,
-  L2GAS,
+  // Machine State
+  // Machine State - Gas
+  L1GASLEFT,
+  L2GASLEFT,
+  DAGASLEFT,
+  // Machine State - Internal Control Flow
+  JUMP,
+  JUMPI,
+  INTERNALCALL,
+  INTERNALRETURN,
+  // Machine State - Memory
+  SET,
+  MOV,
+  CMOV,
+
+  // World State
+  BLOCKHEADERBYNUMBER,
+  SLOAD, // Public Storage
+  SSTORE, // Public Storage
+  READL1TOL2MSG, // Messages
+  SENDL2TOL1MSG, // Messages
+  EMITNOTEHASH, // Notes & Nullifiers
+  EMITNULLIFIER, // Notes & Nullifiers
+
+  // Accrued Substate
+  EMITUNENCRYPTEDLOG,
+
+  // Control Flow - Contract Calls
+  CALL,
+  STATICCALL,
+  RETURN,
+  REVERT,
 
-  // Black box
+  // Gadgets
   KECCAK,
   POSEIDON,
 }
diff --git a/yarn-project/archiver/package.json b/yarn-project/archiver/package.json
index 3dba1489b60f..b837e1d9b38e 100644
--- a/yarn-project/archiver/package.json
+++ b/yarn-project/archiver/package.json
@@ -39,6 +39,7 @@
     "@aztec/circuits.js": "workspace:^",
     "@aztec/ethereum": "workspace:^",
     "@aztec/foundation": "workspace:^",
+    "@aztec/kv-store": "workspace:^",
     "@aztec/l1-artifacts": "workspace:^",
     "@types/lodash.omit": "^4.5.7",
     "debug": "^4.3.4",
@@ -58,7 +59,6 @@
     "concurrently": "^8.0.1",
     "jest": "^29.5.0",
     "jest-mock-extended": "^3.0.4",
-    "lodash.times": "^4.3.2",
     "ts-jest": "^29.1.0",
     "ts-node": "^10.9.1",
     "typescript": "^5.0.4"
diff --git a/yarn-project/archiver/src/archiver/archiver.test.ts b/yarn-project/archiver/src/archiver/archiver.test.ts
index d873da2de833..612281c3789c 100644
--- a/yarn-project/archiver/src/archiver/archiver.test.ts
+++ b/yarn-project/archiver/src/archiver/archiver.test.ts
@@ -1,13 +1,13 @@
 import { ExtendedContractData, L2Block, L2BlockL2Logs, LogType } from '@aztec/circuit-types';
 import { NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP } from '@aztec/circuits.js';
 import { AztecAddress } from '@aztec/foundation/aztec-address';
+import { times } from '@aztec/foundation/collection';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { Fr } from '@aztec/foundation/fields';
 import { sleep } from '@aztec/foundation/sleep';
 import { ContractDeploymentEmitterAbi, InboxAbi, RollupAbi } from '@aztec/l1-artifacts';
 
 import { MockProxy, mock } from 'jest-mock-extended';
-import times from 'lodash.times';
 import { Chain, HttpTransport, Log, PublicClient, Transaction, encodeFunctionData, toHex } from 'viem';
 
 import { Archiver } from './archiver.js';
@@ -269,7 +269,7 @@ describe('Archiver', () => {
 function makeL2BlockProcessedEvent(l1BlockNum: bigint, l2BlockNum: bigint) {
   return {
     blockNumber: l1BlockNum,
-    args: { blockNum: l2BlockNum },
+    args: { blockNumber: l2BlockNum },
     transactionHash: `0x${l2BlockNum}`,
   } as Log<bigint, number, undefined, true, typeof RollupAbi, 'L2BlockProcessed'>;
 }
@@ -349,8 +349,15 @@ function makeL1ToL2MessageCancelledEvents(l1BlockNum: bigint, entryKeys: string[
  * @returns A fake tx with calldata that corresponds to calling process in the Rollup contract.
  */
 function makeRollupTx(l2Block: L2Block) {
+  const header = toHex(l2Block.header.toBuffer());
+  const archive = toHex(l2Block.archive.root.toBuffer());
+  const txsHash = toHex(l2Block.getCalldataHash());
+  const body = toHex(l2Block.bodyToBuffer());
   const proof = `0x`;
-  const block = toHex(l2Block.toBufferWithLogs());
-  const input = encodeFunctionData({ abi: RollupAbi, functionName: 'process', args: [proof, block] });
+  const input = encodeFunctionData({
+    abi: RollupAbi,
+    functionName: 'process',
+    args: [header, archive, txsHash, body, proof],
+  });
   return { input } as Transaction<bigint, number>;
 }
diff --git a/yarn-project/archiver/src/archiver/config.ts b/yarn-project/archiver/src/archiver/config.ts
index 669827c685ab..9c83ab13072c 100644
--- a/yarn-project/archiver/src/archiver/config.ts
+++ b/yarn-project/archiver/src/archiver/config.ts
@@ -56,6 +56,7 @@ export function getConfigEnvVars(): ArchiverConfig {
     ETHEREUM_HOST,
     ARCHIVER_POLLING_INTERVAL_MS,
     ARCHIVER_VIEM_POLLING_INTERVAL_MS,
+    AVAILABILITY_ORACLE_CONTRACT_ADDRESS,
     ROLLUP_CONTRACT_ADDRESS,
     CONTRACT_DEPLOYMENT_EMITTER_ADDRESS,
     API_KEY,
@@ -66,6 +67,9 @@ export function getConfigEnvVars(): ArchiverConfig {
   } = process.env;
   // Populate the relevant addresses for use by the archiver.
   const addresses: L1ContractAddresses = {
+    availabilityOracleAddress: AVAILABILITY_ORACLE_CONTRACT_ADDRESS
+      ? EthAddress.fromString(AVAILABILITY_ORACLE_CONTRACT_ADDRESS)
+      : EthAddress.ZERO,
     rollupAddress: ROLLUP_CONTRACT_ADDRESS ? EthAddress.fromString(ROLLUP_CONTRACT_ADDRESS) : EthAddress.ZERO,
     registryAddress: REGISTRY_CONTRACT_ADDRESS ? EthAddress.fromString(REGISTRY_CONTRACT_ADDRESS) : EthAddress.ZERO,
     inboxAddress: INBOX_CONTRACT_ADDRESS ? EthAddress.fromString(INBOX_CONTRACT_ADDRESS) : EthAddress.ZERO,
@@ -73,7 +77,6 @@ export function getConfigEnvVars(): ArchiverConfig {
     contractDeploymentEmitterAddress: CONTRACT_DEPLOYMENT_EMITTER_ADDRESS
       ? EthAddress.fromString(CONTRACT_DEPLOYMENT_EMITTER_ADDRESS)
       : EthAddress.ZERO,
-    decoderHelperAddress: EthAddress.ZERO,
   };
   return {
     rpcUrl: ETHEREUM_HOST || 'http://127.0.0.1:8545/',
diff --git a/yarn-project/archiver/src/archiver/eth_log_handlers.ts b/yarn-project/archiver/src/archiver/eth_log_handlers.ts
index 52133e86d17c..0d28ca2b4b23 100644
--- a/yarn-project/archiver/src/archiver/eth_log_handlers.ts
+++ b/yarn-project/archiver/src/archiver/eth_log_handlers.ts
@@ -10,7 +10,7 @@ import {
 import { AztecAddress } from '@aztec/foundation/aztec-address';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { Fr, Point } from '@aztec/foundation/fields';
-import { BufferReader } from '@aztec/foundation/serialize';
+import { BufferReader, numToUInt32BE } from '@aztec/foundation/serialize';
 import { ContractDeploymentEmitterAbi, InboxAbi, RollupAbi } from '@aztec/l1-artifacts';
 
 import { Hex, Log, PublicClient, decodeFunctionData, getAbiItem, getAddress, hexToBytes } from 'viem';
@@ -71,12 +71,12 @@ export async function processBlockLogs(
 ): Promise<L2Block[]> {
   const retrievedBlocks: L2Block[] = [];
   for (const log of logs) {
-    const blockNum = log.args.blockNum;
+    const blockNum = log.args.blockNumber;
     if (blockNum !== expectedL2BlockNumber) {
       throw new Error('Block number mismatch. Expected: ' + expectedL2BlockNumber + ' but got: ' + blockNum + '.');
     }
     // TODO: Fetch blocks from calldata in parallel
-    const newBlock = await getBlockFromCallData(publicClient, log.transactionHash!, log.args.blockNum);
+    const newBlock = await getBlockFromCallData(publicClient, log.transactionHash!, log.args.blockNumber);
     newBlock.setL1BlockNumber(log.blockNumber!);
     retrievedBlocks.push(newBlock);
     expectedL2BlockNumber++;
@@ -107,8 +107,14 @@ async function getBlockFromCallData(
   if (functionName !== 'process') {
     throw new Error(`Unexpected method called ${functionName}`);
   }
-  const [, l2BlockHex] = args! as [Hex, Hex];
-  const block = L2Block.fromBufferWithLogs(Buffer.from(hexToBytes(l2BlockHex)));
+  const [headerHex, archiveRootHex, , bodyHex] = args! as [Hex, Hex, Hex, Hex, Hex];
+  const blockBuffer = Buffer.concat([
+    Buffer.from(hexToBytes(headerHex)),
+    Buffer.from(hexToBytes(archiveRootHex)), // L2Block.archive.root
+    numToUInt32BE(Number(l2BlockNum)), // L2Block.archive.nextAvailableLeafIndex
+    Buffer.from(hexToBytes(bodyHex)),
+  ]);
+  const block = L2Block.fromBufferWithLogs(blockBuffer);
   if (BigInt(block.number) !== l2BlockNum) {
     throw new Error(`Block number mismatch: expected ${l2BlockNum} but got ${block.number}`);
   }
diff --git a/yarn-project/archiver/src/archiver/index.ts b/yarn-project/archiver/src/archiver/index.ts
index 0ef2b0025c8b..a7294537624a 100644
--- a/yarn-project/archiver/src/archiver/index.ts
+++ b/yarn-project/archiver/src/archiver/index.ts
@@ -1,5 +1,5 @@
 export * from './archiver.js';
 export * from './config.js';
 export { MemoryArchiverStore } from './memory_archiver_store/memory_archiver_store.js';
-export { LMDBArchiverStore } from './lmdb_archiver_store.js';
 export { ArchiverDataStore } from './archiver_store.js';
+export { KVArchiverDataStore } from './kv_archiver_store/kv_archiver_store.js';
diff --git a/yarn-project/archiver/src/archiver/kv_archiver_store/block_store.ts b/yarn-project/archiver/src/archiver/kv_archiver_store/block_store.ts
new file mode 100644
index 000000000000..025221fe73f4
--- /dev/null
+++ b/yarn-project/archiver/src/archiver/kv_archiver_store/block_store.ts
@@ -0,0 +1,170 @@
+import { INITIAL_L2_BLOCK_NUM, L2Block, L2Tx, TxHash } from '@aztec/circuit-types';
+import { AztecAddress } from '@aztec/circuits.js';
+import { createDebugLogger } from '@aztec/foundation/log';
+import { AztecKVStore, AztecMap, Range } from '@aztec/kv-store';
+
+/* eslint-disable */
+type BlockIndexValue = [blockNumber: number, index: number];
+
+type BlockContext = {
+  blockNumber: number;
+  l1BlockNumber: bigint;
+  block: Buffer;
+  blockHash: Buffer;
+};
+/* eslint-enable */
+
+/**
+ * LMDB implementation of the ArchiverDataStore interface.
+ */
+export class BlockStore {
+  /** Map block number to block data */
+  #blocks: AztecMap<number, BlockContext>;
+
+  /** Index mapping transaction hash (as a string) to its location in a block */
+  #txIndex: AztecMap<string, BlockIndexValue>;
+
+  /** Index mapping a contract's address (as a string) to its location in a block */
+  #contractIndex: AztecMap<string, BlockIndexValue>;
+
+  #log = createDebugLogger('aztec:archiver:block_store');
+
+  constructor(private db: AztecKVStore) {
+    this.#blocks = db.createMap('archiver_blocks');
+
+    this.#txIndex = db.createMap('archiver_tx_index');
+    this.#contractIndex = db.createMap('archiver_contract_index');
+  }
+
+  /**
+   * Append new blocks to the store's list.
+   * @param blocks - The L2 blocks to be added to the store.
+   * @returns True if the operation is successful.
+   */
+  addBlocks(blocks: L2Block[]): Promise<boolean> {
+    return this.db.transaction(() => {
+      for (const block of blocks) {
+        void this.#blocks.set(block.number, {
+          blockNumber: block.number,
+          block: block.toBuffer(),
+          l1BlockNumber: block.getL1BlockNumber(),
+          blockHash: block.getBlockHash(),
+        });
+
+        for (const [i, tx] of block.getTxs().entries()) {
+          if (tx.txHash.isZero()) {
+            continue;
+          }
+          void this.#txIndex.set(tx.txHash.toString(), [block.number, i]);
+        }
+
+        for (const [i, contractData] of block.newContractData.entries()) {
+          if (contractData.contractAddress.isZero()) {
+            continue;
+          }
+
+          void this.#contractIndex.set(contractData.contractAddress.toString(), [block.number, i]);
+        }
+      }
+
+      return true;
+    });
+  }
+
+  /**
+   * Gets up to `limit` amount of L2 blocks starting from `from`.
+   * @param start - Number of the first block to return (inclusive).
+   * @param limit - The number of blocks to return.
+   * @returns The requested L2 blocks, without logs attached
+   */
+  *getBlocks(start: number, limit: number): IterableIterator<L2Block> {
+    for (const blockCtx of this.#blocks.values(this.#computeBlockRange(start, limit))) {
+      yield L2Block.fromBuffer(blockCtx.block, blockCtx.blockHash);
+    }
+  }
+
+  /**
+   * Gets an L2 block.
+   * @param blockNumber - The number of the block to return.
+   * @returns The requested L2 block, without logs attached
+   */
+  getBlock(blockNumber: number): L2Block | undefined {
+    const blockCtx = this.#blocks.get(blockNumber);
+    if (!blockCtx || !blockCtx.block) {
+      return undefined;
+    }
+
+    const block = L2Block.fromBuffer(blockCtx.block, blockCtx.blockHash);
+
+    return block;
+  }
+
+  /**
+   * Gets an l2 tx.
+   * @param txHash - The txHash of the l2 tx.
+   * @returns The requested L2 tx.
+   */
+  getL2Tx(txHash: TxHash): L2Tx | undefined {
+    const [blockNumber, txIndex] = this.getL2TxLocation(txHash) ?? [];
+    if (typeof blockNumber !== 'number' || typeof txIndex !== 'number') {
+      return undefined;
+    }
+
+    const block = this.getBlock(blockNumber);
+    return block?.getTx(txIndex);
+  }
+
+  /**
+   * Looks up which block included the requested L2 tx.
+   * @param txHash - The txHash of the l2 tx.
+   * @returns The block number and index of the tx.
+   */
+  getL2TxLocation(txHash: TxHash): [blockNumber: number, txIndex: number] | undefined {
+    return this.#txIndex.get(txHash.toString());
+  }
+
+  /**
+   * Looks up which block deployed a particular contract.
+   * @param contractAddress - The address of the contract to look up.
+   * @returns The block number and index of the contract.
+   */
+  getContractLocation(contractAddress: AztecAddress): [blockNumber: number, index: number] | undefined {
+    return this.#contractIndex.get(contractAddress.toString());
+  }
+
+  /**
+   * Gets the number of the latest L2 block processed.
+   * @returns The number of the latest L2 block processed.
+   */
+  getBlockNumber(): number {
+    const [lastBlockNumber] = this.#blocks.keys({ reverse: true, limit: 1 });
+    return typeof lastBlockNumber === 'number' ? lastBlockNumber : INITIAL_L2_BLOCK_NUM - 1;
+  }
+
+  /**
+   * Gets the most recent L1 block processed.
+   * @returns The L1 block that published the latest L2 block
+   */
+  getL1BlockNumber(): bigint {
+    const [lastBlock] = this.#blocks.values({ reverse: true, limit: 1 });
+    if (!lastBlock) {
+      return 0n;
+    } else {
+      return lastBlock.l1BlockNumber;
+    }
+  }
+
+  #computeBlockRange(start: number, limit: number): Required<Pick<Range<number>, 'start' | 'end'>> {
+    if (limit < 1) {
+      throw new Error(`Invalid limit: ${limit}`);
+    }
+
+    if (start < INITIAL_L2_BLOCK_NUM) {
+      this.#log(`Clamping start block ${start} to ${INITIAL_L2_BLOCK_NUM}`);
+      start = INITIAL_L2_BLOCK_NUM;
+    }
+
+    const end = start + limit;
+    return { start, end };
+  }
+}
diff --git a/yarn-project/archiver/src/archiver/kv_archiver_store/contract_store.ts b/yarn-project/archiver/src/archiver/kv_archiver_store/contract_store.ts
new file mode 100644
index 000000000000..055b25af20db
--- /dev/null
+++ b/yarn-project/archiver/src/archiver/kv_archiver_store/contract_store.ts
@@ -0,0 +1,93 @@
+import { ContractData, ExtendedContractData } from '@aztec/circuit-types';
+import { AztecAddress } from '@aztec/foundation/aztec-address';
+import { createDebugLogger } from '@aztec/foundation/log';
+import { AztecKVStore, AztecMap } from '@aztec/kv-store';
+
+import { BlockStore } from './block_store.js';
+
+/**
+ * LMDB implementation of the ArchiverDataStore interface.
+ */
+export class ContractStore {
+  #blockStore: BlockStore;
+  #extendedContractData: AztecMap<number, Buffer[]>;
+  #log = createDebugLogger('aztec:archiver:contract_store');
+
+  constructor(private db: AztecKVStore, blockStore: BlockStore) {
+    this.#extendedContractData = db.createMap('archiver_extended_contract_data');
+    this.#blockStore = blockStore;
+  }
+
+  /**
+   * Add new extended contract data from an L2 block to the store's list.
+   * @param data - List of contracts' data to be added.
+   * @param blockNum - Number of the L2 block the contract data was deployed in.
+   * @returns True if the operation is successful.
+   */
+  addExtendedContractData(data: ExtendedContractData[], blockNum: number): Promise<boolean> {
+    return this.#extendedContractData.swap(blockNum, (existingData = []) => {
+      existingData.push(...data.map(d => d.toBuffer()));
+      return existingData;
+    });
+  }
+
+  /**
+   * Get the extended contract data for this contract.
+   * @param contractAddress - The contract data address.
+   * @returns The extended contract data or undefined if not found.
+   */
+  getExtendedContractData(contractAddress: AztecAddress): ExtendedContractData | undefined {
+    const [blockNumber, _] = this.#blockStore.getContractLocation(contractAddress) ?? [];
+
+    if (typeof blockNumber !== 'number') {
+      return undefined;
+    }
+
+    for (const contract of this.#extendedContractData.get(blockNumber) ?? []) {
+      const extendedContractData = ExtendedContractData.fromBuffer(contract);
+      if (extendedContractData.contractData.contractAddress.equals(contractAddress)) {
+        return extendedContractData;
+      }
+    }
+
+    return undefined;
+  }
+
+  /**
+   * Lookup all extended contract data in an L2 block.
+   * @param blockNumber - The block number to get all contract data from.
+   * @returns All extended contract data in the block (if found).
+   */
+  getExtendedContractDataInBlock(blockNumber: number): Array<ExtendedContractData> {
+    return (this.#extendedContractData.get(blockNumber) ?? []).map(contract =>
+      ExtendedContractData.fromBuffer(contract),
+    );
+  }
+
+  /**
+   * Get basic info for an L2 contract.
+   * Contains contract address & the ethereum portal address.
+   * @param contractAddress - The contract data address.
+   * @returns ContractData with the portal address (if we didn't throw an error).
+   */
+  getContractData(contractAddress: AztecAddress): ContractData | undefined {
+    const [blockNumber, index] = this.#blockStore.getContractLocation(contractAddress) ?? [];
+    if (typeof blockNumber !== 'number' || typeof index !== 'number') {
+      return undefined;
+    }
+
+    const block = this.#blockStore.getBlock(blockNumber);
+    return block?.newContractData[index];
+  }
+
+  /**
+   * Get basic info for an all L2 contracts deployed in a block.
+   * Contains contract address & the ethereum portal address.
+   * @param blockNumber - Number of the L2 block where contracts were deployed.
+   * @returns ContractData with the portal address (if we didn't throw an error).
+   */
+  getContractDataInBlock(blockNumber: number): ContractData[] {
+    const block = this.#blockStore.getBlock(blockNumber);
+    return block?.newContractData ?? [];
+  }
+}
diff --git a/yarn-project/archiver/src/archiver/kv_archiver_store/kv_archiver_store.test.ts b/yarn-project/archiver/src/archiver/kv_archiver_store/kv_archiver_store.test.ts
new file mode 100644
index 000000000000..2903ea6fe9c0
--- /dev/null
+++ b/yarn-project/archiver/src/archiver/kv_archiver_store/kv_archiver_store.test.ts
@@ -0,0 +1,15 @@
+import { EthAddress } from '@aztec/circuits.js';
+import { AztecLmdbStore } from '@aztec/kv-store';
+
+import { describeArchiverDataStore } from '../archiver_store_test_suite.js';
+import { KVArchiverDataStore } from './kv_archiver_store.js';
+
+describe('KVArchiverDataStore', () => {
+  let archiverStore: KVArchiverDataStore;
+
+  beforeEach(async () => {
+    archiverStore = new KVArchiverDataStore(await AztecLmdbStore.create(EthAddress.random()));
+  });
+
+  describeArchiverDataStore('ArchiverStore', () => archiverStore);
+});
diff --git a/yarn-project/archiver/src/archiver/kv_archiver_store/kv_archiver_store.ts b/yarn-project/archiver/src/archiver/kv_archiver_store/kv_archiver_store.ts
new file mode 100644
index 000000000000..74be29d9d586
--- /dev/null
+++ b/yarn-project/archiver/src/archiver/kv_archiver_store/kv_archiver_store.ts
@@ -0,0 +1,241 @@
+import {
+  ContractData,
+  ExtendedContractData,
+  GetUnencryptedLogsResponse,
+  L1ToL2Message,
+  L2Block,
+  L2BlockL2Logs,
+  L2Tx,
+  LogFilter,
+  LogType,
+  TxHash,
+} from '@aztec/circuit-types';
+import { Fr } from '@aztec/circuits.js';
+import { AztecAddress } from '@aztec/foundation/aztec-address';
+import { createDebugLogger } from '@aztec/foundation/log';
+import { AztecKVStore } from '@aztec/kv-store';
+
+import { ArchiverDataStore, ArchiverL1SynchPoint } from '../archiver_store.js';
+import { BlockStore } from './block_store.js';
+import { ContractStore } from './contract_store.js';
+import { LogStore } from './log_store.js';
+import { MessageStore } from './message_store.js';
+
+/**
+ * LMDB implementation of the ArchiverDataStore interface.
+ */
+export class KVArchiverDataStore implements ArchiverDataStore {
+  #blockStore: BlockStore;
+  #logStore: LogStore;
+  #contractStore: ContractStore;
+  #messageStore: MessageStore;
+
+  #log = createDebugLogger('aztec:archiver:lmdb');
+
+  constructor(db: AztecKVStore, logsMaxPageSize: number = 1000) {
+    this.#blockStore = new BlockStore(db);
+    this.#logStore = new LogStore(db, this.#blockStore, logsMaxPageSize);
+    this.#contractStore = new ContractStore(db, this.#blockStore);
+    this.#messageStore = new MessageStore(db);
+  }
+
+  /**
+   * Append new blocks to the store's list.
+   * @param blocks - The L2 blocks to be added to the store.
+   * @returns True if the operation is successful.
+   */
+  addBlocks(blocks: L2Block[]): Promise<boolean> {
+    return this.#blockStore.addBlocks(blocks);
+  }
+
+  /**
+   * Gets up to `limit` amount of L2 blocks starting from `from`.
+   * The blocks returned do not contain any logs.
+   *
+   * @param start - Number of the first block to return (inclusive).
+   * @param limit - The number of blocks to return.
+   * @returns The requested L2 blocks, without any logs attached
+   */
+  getBlocks(start: number, limit: number): Promise<L2Block[]> {
+    try {
+      return Promise.resolve(Array.from(this.#blockStore.getBlocks(start, limit)));
+    } catch (err) {
+      // this function is sync so if any errors are thrown we need to make sure they're passed on as rejected Promises
+      return Promise.reject(err);
+    }
+  }
+
+  /**
+   * Gets an l2 tx.
+   * @param txHash - The txHash of the l2 tx.
+   * @returns The requested L2 tx.
+   */
+  getL2Tx(txHash: TxHash): Promise<L2Tx | undefined> {
+    return Promise.resolve(this.#blockStore.getL2Tx(txHash));
+  }
+
+  /**
+   * Append new logs to the store's list.
+   * @param encryptedLogs - The logs to be added to the store.
+   * @param unencryptedLogs - The type of the logs to be added to the store.
+   * @param blockNumber - The block for which to add the logs.
+   * @returns True if the operation is successful.
+   */
+  addLogs(
+    encryptedLogs: L2BlockL2Logs | undefined,
+    unencryptedLogs: L2BlockL2Logs | undefined,
+    blockNumber: number,
+  ): Promise<boolean> {
+    return this.#logStore.addLogs(encryptedLogs, unencryptedLogs, blockNumber);
+  }
+
+  /**
+   * Append new pending L1 to L2 messages to the store.
+   * @param messages - The L1 to L2 messages to be added to the store.
+   * @param l1BlockNumber - The L1 block number for which to add the messages.
+   * @returns True if the operation is successful.
+   */
+  addPendingL1ToL2Messages(messages: L1ToL2Message[], l1BlockNumber: bigint): Promise<boolean> {
+    return Promise.resolve(this.#messageStore.addPendingMessages(messages, l1BlockNumber));
+  }
+
+  /**
+   * Remove pending L1 to L2 messages from the store (if they were cancelled).
+   * @param messages - The message keys to be removed from the store.
+   * @param l1BlockNumber - The L1 block number for which to remove the messages.
+   * @returns True if the operation is successful.
+   */
+  cancelPendingL1ToL2Messages(messages: Fr[], l1BlockNumber: bigint): Promise<boolean> {
+    return Promise.resolve(this.#messageStore.cancelPendingMessages(messages, l1BlockNumber));
+  }
+
+  /**
+   * Messages that have been published in an L2 block are confirmed.
+   * Add them to the confirmed store, also remove them from the pending store.
+   * @param entryKeys - The message keys to be removed from the store.
+   * @param blockNumber - The block for which to add the messages.
+   * @returns True if the operation is successful.
+   */
+  confirmL1ToL2Messages(entryKeys: Fr[]): Promise<boolean> {
+    return this.#messageStore.confirmPendingMessages(entryKeys);
+  }
+
+  /**
+   * Gets up to `limit` amount of pending L1 to L2 messages, sorted by fee
+   * @param limit - The number of messages to return (by default NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP).
+   * @returns The requested L1 to L2 message keys.
+   */
+  getPendingL1ToL2MessageKeys(limit: number): Promise<Fr[]> {
+    return Promise.resolve(this.#messageStore.getPendingMessageKeysByFee(limit));
+  }
+
+  /**
+   * Gets the confirmed L1 to L2 message corresponding to the given message key.
+   * @param messageKey - The message key to look up.
+   * @returns The requested L1 to L2 message or throws if not found.
+   */
+  getConfirmedL1ToL2Message(messageKey: Fr): Promise<L1ToL2Message> {
+    try {
+      return Promise.resolve(this.#messageStore.getConfirmedMessage(messageKey));
+    } catch (err) {
+      return Promise.reject(err);
+    }
+  }
+
+  /**
+   * Gets up to `limit` amount of logs starting from `from`.
+   * @param start - Number of the L2 block to which corresponds the first logs to be returned.
+   * @param limit - The number of logs to return.
+   * @param logType - Specifies whether to return encrypted or unencrypted logs.
+   * @returns The requested logs.
+   */
+  getLogs(start: number, limit: number, logType: LogType): Promise<L2BlockL2Logs[]> {
+    try {
+      return Promise.resolve(Array.from(this.#logStore.getLogs(start, limit, logType)));
+    } catch (err) {
+      return Promise.reject(err);
+    }
+  }
+
+  /**
+   * Gets unencrypted logs based on the provided filter.
+   * @param filter - The filter to apply to the logs.
+   * @returns The requested logs.
+   */
+  getUnencryptedLogs(filter: LogFilter): Promise<GetUnencryptedLogsResponse> {
+    try {
+      return Promise.resolve(this.#logStore.getUnencryptedLogs(filter));
+    } catch (err) {
+      return Promise.reject(err);
+    }
+  }
+
+  /**
+   * Add new extended contract data from an L2 block to the store's list.
+   * @param data - List of contracts' data to be added.
+   * @param blockNum - Number of the L2 block the contract data was deployed in.
+   * @returns True if the operation is successful.
+   */
+  addExtendedContractData(data: ExtendedContractData[], blockNum: number): Promise<boolean> {
+    return this.#contractStore.addExtendedContractData(data, blockNum);
+  }
+
+  /**
+   * Get the extended contract data for this contract.
+   * @param contractAddress - The contract data address.
+   * @returns The extended contract data or undefined if not found.
+   */
+  getExtendedContractData(contractAddress: AztecAddress): Promise<ExtendedContractData | undefined> {
+    return Promise.resolve(this.#contractStore.getExtendedContractData(contractAddress));
+  }
+
+  /**
+   * Lookup all extended contract data in an L2 block.
+   * @param blockNumber - The block number to get all contract data from.
+   * @returns All extended contract data in the block (if found).
+   */
+  getExtendedContractDataInBlock(blockNumber: number): Promise<ExtendedContractData[]> {
+    return Promise.resolve(Array.from(this.#contractStore.getExtendedContractDataInBlock(blockNumber)));
+  }
+
+  /**
+   * Get basic info for an L2 contract.
+   * Contains contract address & the ethereum portal address.
+   * @param contractAddress - The contract data address.
+   * @returns ContractData with the portal address (if we didn't throw an error).
+   */
+  getContractData(contractAddress: AztecAddress): Promise<ContractData | undefined> {
+    return Promise.resolve(this.#contractStore.getContractData(contractAddress));
+  }
+
+  /**
+   * Get basic info for an all L2 contracts deployed in a block.
+   * Contains contract address & the ethereum portal address.
+   * @param blockNumber - Number of the L2 block where contracts were deployed.
+   * @returns ContractData with the portal address (if we didn't throw an error).
+   */
+  getContractDataInBlock(blockNumber: number): Promise<ContractData[]> {
+    return Promise.resolve(Array.from(this.#contractStore.getContractDataInBlock(blockNumber)));
+  }
+
+  /**
+   * Gets the number of the latest L2 block processed.
+   * @returns The number of the latest L2 block processed.
+   */
+  getBlockNumber(): Promise<number> {
+    return Promise.resolve(this.#blockStore.getBlockNumber());
+  }
+
+  /**
+   * Gets the last L1 block number processed by the archiver
+   */
+  getL1BlockNumber(): Promise<ArchiverL1SynchPoint> {
+    const addedBlock = this.#blockStore.getL1BlockNumber();
+    const { addedMessages, cancelledMessages } = this.#messageStore.getL1BlockNumber();
+    return Promise.resolve({
+      addedBlock,
+      addedMessages,
+      cancelledMessages,
+    });
+  }
+}
diff --git a/yarn-project/archiver/src/archiver/kv_archiver_store/log_store.ts b/yarn-project/archiver/src/archiver/kv_archiver_store/log_store.ts
new file mode 100644
index 000000000000..afab800fb484
--- /dev/null
+++ b/yarn-project/archiver/src/archiver/kv_archiver_store/log_store.ts
@@ -0,0 +1,174 @@
+import {
+  ExtendedUnencryptedL2Log,
+  GetUnencryptedLogsResponse,
+  INITIAL_L2_BLOCK_NUM,
+  L2BlockL2Logs,
+  LogFilter,
+  LogId,
+  LogType,
+  UnencryptedL2Log,
+} from '@aztec/circuit-types';
+import { createDebugLogger } from '@aztec/foundation/log';
+import { AztecKVStore, AztecMap } from '@aztec/kv-store';
+
+import { BlockStore } from './block_store.js';
+
+/**
+ * A store for logs
+ */
+export class LogStore {
+  #encryptedLogs: AztecMap<number, Buffer>;
+  #unencryptedLogs: AztecMap<number, Buffer>;
+  #logsMaxPageSize: number;
+  #log = createDebugLogger('aztec:archiver:log_store');
+
+  constructor(private db: AztecKVStore, private blockStore: BlockStore, logsMaxPageSize: number = 1000) {
+    this.#encryptedLogs = db.createMap('archiver_encrypted_logs');
+    this.#unencryptedLogs = db.createMap('archiver_unencrypted_logs');
+
+    this.#logsMaxPageSize = logsMaxPageSize;
+  }
+
+  /**
+   * Append new logs to the store's list.
+   * @param encryptedLogs - The logs to be added to the store.
+   * @param unencryptedLogs - The type of the logs to be added to the store.
+   * @param blockNumber - The block for which to add the logs.
+   * @returns True if the operation is successful.
+   */
+  addLogs(
+    encryptedLogs: L2BlockL2Logs | undefined,
+    unencryptedLogs: L2BlockL2Logs | undefined,
+    blockNumber: number,
+  ): Promise<boolean> {
+    return this.db.transaction(() => {
+      if (encryptedLogs) {
+        void this.#encryptedLogs.set(blockNumber, encryptedLogs.toBuffer());
+      }
+
+      if (unencryptedLogs) {
+        void this.#unencryptedLogs.set(blockNumber, unencryptedLogs.toBuffer());
+      }
+
+      return true;
+    });
+  }
+
+  /**
+   * Gets up to `limit` amount of logs starting from `from`.
+   * @param start - Number of the L2 block to which corresponds the first logs to be returned.
+   * @param limit - The number of logs to return.
+   * @param logType - Specifies whether to return encrypted or unencrypted logs.
+   * @returns The requested logs.
+   */
+  *getLogs(start: number, limit: number, logType: LogType): IterableIterator<L2BlockL2Logs> {
+    const logMap = logType === LogType.ENCRYPTED ? this.#encryptedLogs : this.#unencryptedLogs;
+    for (const buffer of logMap.values({ start, limit })) {
+      yield L2BlockL2Logs.fromBuffer(buffer);
+    }
+  }
+
+  /**
+   * Gets unencrypted logs based on the provided filter.
+   * @param filter - The filter to apply to the logs.
+   * @returns The requested logs.
+   */
+  getUnencryptedLogs(filter: LogFilter): GetUnencryptedLogsResponse {
+    if (filter.afterLog) {
+      return this.#filterUnencryptedLogsBetweenBlocks(filter);
+    } else if (filter.txHash) {
+      return this.#filterUnencryptedLogsOfTx(filter);
+    } else {
+      return this.#filterUnencryptedLogsBetweenBlocks(filter);
+    }
+  }
+
+  #filterUnencryptedLogsOfTx(filter: LogFilter): GetUnencryptedLogsResponse {
+    if (!filter.txHash) {
+      throw new Error('Missing txHash');
+    }
+
+    const [blockNumber, txIndex] = this.blockStore.getL2TxLocation(filter.txHash) ?? [];
+    if (typeof blockNumber !== 'number' || typeof txIndex !== 'number') {
+      return { logs: [], maxLogsHit: false };
+    }
+
+    const unencryptedLogsInBlock = this.#getBlockLogs(blockNumber, LogType.UNENCRYPTED);
+    const txLogs = unencryptedLogsInBlock.txLogs[txIndex].unrollLogs().map(log => UnencryptedL2Log.fromBuffer(log));
+
+    const logs: ExtendedUnencryptedL2Log[] = [];
+    const maxLogsHit = this.#accumulateLogs(logs, blockNumber, txIndex, txLogs, filter);
+
+    return { logs, maxLogsHit };
+  }
+
+  #filterUnencryptedLogsBetweenBlocks(filter: LogFilter): GetUnencryptedLogsResponse {
+    const start =
+      filter.afterLog?.blockNumber ?? Math.max(filter.fromBlock ?? INITIAL_L2_BLOCK_NUM, INITIAL_L2_BLOCK_NUM);
+    const end = filter.toBlock;
+
+    if (typeof end === 'number' && end < start) {
+      return {
+        logs: [],
+        maxLogsHit: true,
+      };
+    }
+
+    const logs: ExtendedUnencryptedL2Log[] = [];
+
+    let maxLogsHit = false;
+    loopOverBlocks: for (const [blockNumber, logBuffer] of this.#unencryptedLogs.entries({ start, end })) {
+      const unencryptedLogsInBlock = L2BlockL2Logs.fromBuffer(logBuffer);
+      for (let txIndex = filter.afterLog?.txIndex ?? 0; txIndex < unencryptedLogsInBlock.txLogs.length; txIndex++) {
+        const txLogs = unencryptedLogsInBlock.txLogs[txIndex].unrollLogs().map(log => UnencryptedL2Log.fromBuffer(log));
+        maxLogsHit = this.#accumulateLogs(logs, blockNumber, txIndex, txLogs, filter);
+        if (maxLogsHit) {
+          this.#log(`Max logs hit at block ${blockNumber}`);
+          break loopOverBlocks;
+        }
+      }
+    }
+
+    return { logs, maxLogsHit };
+  }
+
+  #accumulateLogs(
+    results: ExtendedUnencryptedL2Log[],
+    blockNumber: number,
+    txIndex: number,
+    txLogs: UnencryptedL2Log[],
+    filter: LogFilter,
+  ): boolean {
+    let maxLogsHit = false;
+    let logIndex = typeof filter.afterLog?.logIndex === 'number' ? filter.afterLog.logIndex + 1 : 0;
+    for (; logIndex < txLogs.length; logIndex++) {
+      const log = txLogs[logIndex];
+      if (filter.contractAddress && !log.contractAddress.equals(filter.contractAddress)) {
+        continue;
+      }
+
+      if (filter.selector && !log.selector.equals(filter.selector)) {
+        continue;
+      }
+
+      results.push(new ExtendedUnencryptedL2Log(new LogId(blockNumber, txIndex, logIndex), log));
+      if (results.length >= this.#logsMaxPageSize) {
+        maxLogsHit = true;
+        break;
+      }
+    }
+
+    return maxLogsHit;
+  }
+
+  #getBlockLogs(blockNumber: number, logType: LogType): L2BlockL2Logs {
+    const logMap = logType === LogType.ENCRYPTED ? this.#encryptedLogs : this.#unencryptedLogs;
+    const buffer = logMap.get(blockNumber);
+
+    if (!buffer) {
+      return new L2BlockL2Logs([]);
+    }
+
+    return L2BlockL2Logs.fromBuffer(buffer);
+  }
+}
diff --git a/yarn-project/archiver/src/archiver/kv_archiver_store/message_store.ts b/yarn-project/archiver/src/archiver/kv_archiver_store/message_store.ts
new file mode 100644
index 000000000000..81a83e21560a
--- /dev/null
+++ b/yarn-project/archiver/src/archiver/kv_archiver_store/message_store.ts
@@ -0,0 +1,170 @@
+import { L1ToL2Message } from '@aztec/circuit-types';
+import { Fr } from '@aztec/circuits.js';
+import { createDebugLogger } from '@aztec/foundation/log';
+import { AztecCounter, AztecKVStore, AztecMap, AztecSingleton } from '@aztec/kv-store';
+
+/**
+ * A message stored in the database
+ */
+type Message = {
+  /** The L1ToL2Message */
+  message: Buffer;
+  /** The message's fee */
+  fee: number;
+  /** Has it _ever_ been confirmed? */
+  confirmed: boolean;
+};
+
+/**
+ * LMDB implementation of the ArchiverDataStore interface.
+ */
+export class MessageStore {
+  #messages: AztecMap<string, Message>;
+  #pendingMessagesByFee: AztecCounter<[number, string]>;
+  #lastL1BlockAddingMessages: AztecSingleton<bigint>;
+  #lastL1BlockCancellingMessages: AztecSingleton<bigint>;
+
+  #log = createDebugLogger('aztec:archiver:message_store');
+
+  constructor(private db: AztecKVStore) {
+    this.#messages = db.createMap('archiver_l1_to_l2_messages');
+    this.#pendingMessagesByFee = db.createCounter('archiver_messages_by_fee');
+    this.#lastL1BlockAddingMessages = db.createSingleton('archiver_last_l1_block_adding_messages');
+    this.#lastL1BlockCancellingMessages = db.createSingleton('archiver_last_l1_block_cancelling_messages');
+  }
+
+  /**
+   * Gets the last L1 block number that emitted new messages and the block that cancelled messages.
+   * @returns The last L1 block number processed
+   */
+  getL1BlockNumber() {
+    return {
+      addedMessages: this.#lastL1BlockAddingMessages.get() ?? 0n,
+      cancelledMessages: this.#lastL1BlockCancellingMessages.get() ?? 0n,
+    };
+  }
+
+  /**
+   * Append new pending L1 to L2 messages to the store.
+   * @param messages - The L1 to L2 messages to be added to the store.
+   * @param l1BlockNumber - The L1 block number for which to add the messages.
+   * @returns True if the operation is successful.
+   */
+  addPendingMessages(messages: L1ToL2Message[], l1BlockNumber: bigint): Promise<boolean> {
+    return this.db.transaction(() => {
+      const lastL1BlockNumber = this.#lastL1BlockAddingMessages.get() ?? 0n;
+      if (lastL1BlockNumber >= l1BlockNumber) {
+        return false;
+      }
+
+      void this.#lastL1BlockAddingMessages.set(l1BlockNumber);
+
+      for (const message of messages) {
+        const messageKey = message.entryKey?.toString();
+        if (!messageKey) {
+          throw new Error('Message does not have an entry key');
+        }
+
+        void this.#messages.setIfNotExists(messageKey, {
+          message: message.toBuffer(),
+          fee: message.fee,
+          confirmed: false,
+        });
+
+        void this.#pendingMessagesByFee.update([message.fee, messageKey], 1);
+      }
+
+      return true;
+    });
+  }
+
+  /**
+   * Remove pending L1 to L2 messages from the store (if they were cancelled).
+   * @param messageKeys - The message keys to be removed from the store.
+   * @param l1BlockNumber - The L1 block number for which to remove the messages.
+   * @returns True if the operation is successful.
+   */
+  cancelPendingMessages(messageKeys: Fr[], l1BlockNumber: bigint): Promise<boolean> {
+    return this.db.transaction(() => {
+      const lastL1BlockNumber = this.#lastL1BlockCancellingMessages.get() ?? 0n;
+      if (lastL1BlockNumber >= l1BlockNumber) {
+        return false;
+      }
+
+      void this.#lastL1BlockCancellingMessages.set(l1BlockNumber);
+
+      for (const messageKey of messageKeys) {
+        const messageCtx = this.#messages.get(messageKey.toString());
+        if (!messageCtx) {
+          throw new Error(`Message ${messageKey.toString()} not found`);
+        }
+
+        void this.#pendingMessagesByFee.update([messageCtx.fee, messageKey.toString()], -1);
+      }
+
+      return true;
+    });
+  }
+
+  /**
+   * Messages that have been published in an L2 block are confirmed.
+   * Add them to the confirmed store, also remove them from the pending store.
+   * @param messageKeys - The message keys to be removed from the store.
+   * @returns True if the operation is successful.
+   */
+  confirmPendingMessages(messageKeys: Fr[]): Promise<boolean> {
+    return this.db.transaction(() => {
+      for (const messageKey of messageKeys) {
+        const messageCtx = this.#messages.get(messageKey.toString());
+        if (!messageCtx) {
+          throw new Error(`Message ${messageKey.toString()} not found`);
+        }
+        messageCtx.confirmed = true;
+
+        void this.#messages.set(messageKey.toString(), messageCtx);
+        void this.#pendingMessagesByFee.update([messageCtx.fee, messageKey.toString()], -1);
+      }
+
+      return true;
+    });
+  }
+
+  /**
+   * Gets the confirmed L1 to L2 message corresponding to the given message key.
+   * @param messageKey - The message key to look up.
+   * @returns The requested L1 to L2 message or throws if not found.
+   */
+  getConfirmedMessage(messageKey: Fr): L1ToL2Message {
+    const messageCtx = this.#messages.get(messageKey.toString());
+    if (!messageCtx) {
+      throw new Error(`Message ${messageKey.toString()} not found`);
+    }
+
+    if (!messageCtx.confirmed) {
+      throw new Error(`Message ${messageKey.toString()} not confirmed`);
+    }
+
+    return L1ToL2Message.fromBuffer(messageCtx.message);
+  }
+
+  /**
+   * Gets up to `limit` amount of pending L1 to L2 messages, sorted by fee
+   * @param limit - The number of messages to return (by default NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP).
+   * @returns The requested L1 to L2 message keys.
+   */
+  getPendingMessageKeysByFee(limit: number): Fr[] {
+    const messageKeys: Fr[] = [];
+
+    for (const [[_, messageKey], count] of this.#pendingMessagesByFee.entries({
+      reverse: true,
+    })) {
+      // put `count` copies of this message in the result list
+      messageKeys.push(...Array(count).fill(Fr.fromString(messageKey)));
+      if (messageKeys.length >= limit) {
+        break;
+      }
+    }
+
+    return messageKeys;
+  }
+}
diff --git a/yarn-project/archiver/src/archiver/lmdb_archiver_store.test.ts b/yarn-project/archiver/src/archiver/lmdb_archiver_store.test.ts
deleted file mode 100644
index 7a1ceacb4f1e..000000000000
--- a/yarn-project/archiver/src/archiver/lmdb_archiver_store.test.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { open } from 'lmdb';
-
-import { describeArchiverDataStore } from './archiver_store_test_suite.js';
-import { LMDBArchiverStore } from './lmdb_archiver_store.js';
-
-describe('LMDB Memory Store', () => {
-  let archiverStore: LMDBArchiverStore;
-
-  beforeEach(() => {
-    archiverStore = new LMDBArchiverStore(open({} as any));
-  });
-
-  describeArchiverDataStore('LMDBArchiverStore', () => archiverStore);
-});
diff --git a/yarn-project/archiver/src/archiver/lmdb_archiver_store.ts b/yarn-project/archiver/src/archiver/lmdb_archiver_store.ts
deleted file mode 100644
index 6343c7dd0d9d..000000000000
--- a/yarn-project/archiver/src/archiver/lmdb_archiver_store.ts
+++ /dev/null
@@ -1,708 +0,0 @@
-import {
-  ContractData,
-  ExtendedContractData,
-  ExtendedUnencryptedL2Log,
-  GetUnencryptedLogsResponse,
-  INITIAL_L2_BLOCK_NUM,
-  L1ToL2Message,
-  L2Block,
-  L2BlockL2Logs,
-  L2Tx,
-  LogFilter,
-  LogId,
-  LogType,
-  TxHash,
-  UnencryptedL2Log,
-} from '@aztec/circuit-types';
-import { Fr } from '@aztec/circuits.js';
-import { AztecAddress } from '@aztec/foundation/aztec-address';
-import { createDebugLogger } from '@aztec/foundation/log';
-
-import { Database, RangeOptions, RootDatabase } from 'lmdb';
-
-import { ArchiverDataStore, ArchiverL1SynchPoint } from './archiver_store.js';
-
-/* eslint-disable */
-type L1ToL2MessageAndCount = {
-  message: Buffer;
-  pendingCount: number;
-  confirmedCount: number;
-};
-
-type BlockIndexValue = [blockNumber: number, index: number];
-
-type BlockContext = {
-  block?: Uint8Array;
-  blockHash?: Uint8Array;
-  l1BlockNumber?: bigint;
-  encryptedLogs?: Uint8Array;
-  unencryptedLogs?: Uint8Array;
-  extendedContractData?: Array<Uint8Array>;
-};
-
-const L1_BLOCK_ADDED_PENDING_MESSAGE = 'l1BlockAddedPendingMessage';
-const L1_BLOCK_CANCELLED_MESSAGE = 'l1BlockCancelledMessage';
-/* eslint-enable */
-
-/**
- * LMDB implementation of the ArchiverDataStore interface.
- */
-export class LMDBArchiverStore implements ArchiverDataStore {
-  #tables: {
-    /** Where block information will be stored */
-    blocks: Database<BlockContext, number>;
-    /** Transactions index */
-    txIndex: Database<BlockIndexValue, Buffer>;
-    /** Contracts index */
-    contractIndex: Database<BlockIndexValue, Buffer>;
-    /** L1 to L2 messages */
-    l1ToL2Messages: Database<L1ToL2MessageAndCount, Buffer>;
-    /** Which blocks emitted which messages */
-    l1ToL2MessagesByBlock: Database<bigint, typeof L1_BLOCK_CANCELLED_MESSAGE | typeof L1_BLOCK_ADDED_PENDING_MESSAGE>;
-    /** Pending L1 to L2 messages sorted by their fee, in buckets (dupSort=true)  */
-    pendingMessagesByFee: Database<Buffer, number>;
-  };
-
-  #logsMaxPageSize: number;
-
-  #log = createDebugLogger('aztec:archiver:lmdb');
-
-  constructor(db: RootDatabase, logsMaxPageSize: number = 1000) {
-    this.#tables = {
-      blocks: db.openDB('blocks', {
-        keyEncoding: 'uint32',
-        encoding: 'msgpack',
-      }),
-      txIndex: db.openDB('tx_index', {
-        keyEncoding: 'binary',
-        encoding: 'msgpack',
-      }),
-      contractIndex: db.openDB('contract_index', {
-        keyEncoding: 'binary',
-        encoding: 'msgpack',
-      }),
-      l1ToL2Messages: db.openDB('l1_to_l2_messages', {
-        keyEncoding: 'binary',
-        encoding: 'msgpack',
-      }),
-      l1ToL2MessagesByBlock: db.openDB('l1_to_l2_message_nonces', {
-        keyEncoding: 'ordered-binary',
-        encoding: 'msgpack',
-      }),
-      pendingMessagesByFee: db.openDB('pending_messages_by_fee', {
-        keyEncoding: 'ordered-binary',
-        encoding: 'binary',
-        dupSort: true,
-      }),
-    };
-
-    this.#logsMaxPageSize = logsMaxPageSize;
-  }
-
-  public async close() {
-    await Promise.all(Object.values(this.#tables).map(table => table.close()));
-  }
-
-  /**
-   * Append new blocks to the store's list.
-   * @param blocks - The L2 blocks to be added to the store.
-   * @returns True if the operation is successful.
-   */
-  addBlocks(blocks: L2Block[]): Promise<boolean> {
-    // LMDB transactions are shared across databases, so we can use a single transaction for all the writes
-    // https://github.com/kriszyp/lmdb-js/blob/67505a979ab63187953355a88747a7ad703d50b6/README.md#dbopendbdatabase-stringnamestring
-    return this.#tables.blocks.transaction(() => {
-      for (const block of blocks) {
-        const blockCtx = this.#tables.blocks.get(block.number) ?? {};
-        blockCtx.block = block.toBuffer();
-        blockCtx.l1BlockNumber = block.getL1BlockNumber();
-        blockCtx.blockHash = block.getBlockHash();
-
-        // no need to await, all writes are enqueued in the transaction
-        // awaiting would interrupt the execution flow of this callback and "leak" the transaction to some other part
-        // of the system and any writes would then be part of our transaction here
-        void this.#tables.blocks.put(block.number, blockCtx);
-
-        for (const [i, tx] of block.getTxs().entries()) {
-          if (tx.txHash.isZero()) {
-            continue;
-          }
-          void this.#tables.txIndex.put(tx.txHash.buffer, [block.number, i]);
-        }
-
-        for (const [i, contractData] of block.newContractData.entries()) {
-          if (contractData.contractAddress.isZero()) {
-            continue;
-          }
-
-          void this.#tables.contractIndex.put(contractData.contractAddress.toBuffer(), [block.number, i]);
-        }
-      }
-
-      return true;
-    });
-  }
-
-  /**
-   * Gets up to `limit` amount of L2 blocks starting from `from`.
-   * @param start - Number of the first block to return (inclusive).
-   * @param limit - The number of blocks to return.
-   * @returns The requested L2 blocks.
-   */
-  getBlocks(start: number, limit: number): Promise<L2Block[]> {
-    try {
-      const blocks = this.#tables.blocks
-        .getRange(this.#computeBlockRange(start, limit))
-        .filter(({ value }) => value.block)
-        .map(({ value }) => {
-          const block = L2Block.fromBuffer(
-            asBuffer(value.block!),
-            value.blockHash ? asBuffer(value.blockHash) : undefined,
-          );
-          return block;
-        }).asArray;
-
-      return Promise.resolve(blocks);
-    } catch (err) {
-      // this function is sync so if any errors are thrown we need to make sure they're passed on as rejected Promises
-      return Promise.reject(err);
-    }
-  }
-
-  /**
-   * Gets an l2 tx.
-   * @param txHash - The txHash of the l2 tx.
-   * @returns The requested L2 tx.
-   */
-  getL2Tx(txHash: TxHash): Promise<L2Tx | undefined> {
-    const [blockNumber, txIndex] = this.#tables.txIndex.get(txHash.buffer) ?? [];
-    if (typeof blockNumber !== 'number' || typeof txIndex !== 'number') {
-      return Promise.resolve(undefined);
-    }
-
-    const block = this.#getBlock(blockNumber);
-    return Promise.resolve(block?.getTx(txIndex));
-  }
-
-  /**
-   * Append new logs to the store's list.
-   * @param encryptedLogs - The logs to be added to the store.
-   * @param unencryptedLogs - The type of the logs to be added to the store.
-   * @param blockNumber - The block for which to add the logs.
-   * @returns True if the operation is successful.
-   */
-  addLogs(
-    encryptedLogs: L2BlockL2Logs | undefined,
-    unencryptedLogs: L2BlockL2Logs | undefined,
-    blockNumber: number,
-  ): Promise<boolean> {
-    return this.#tables.blocks.transaction(() => {
-      const blockCtx = this.#tables.blocks.get(blockNumber) ?? {};
-
-      if (encryptedLogs) {
-        blockCtx.encryptedLogs = encryptedLogs.toBuffer();
-      }
-
-      if (unencryptedLogs) {
-        blockCtx.unencryptedLogs = unencryptedLogs.toBuffer();
-      }
-
-      void this.#tables.blocks.put(blockNumber, blockCtx);
-      return true;
-    });
-  }
-
-  /**
-   * Append new pending L1 to L2 messages to the store.
-   * @param messages - The L1 to L2 messages to be added to the store.
-   * @param l1BlockNumber - The L1 block number for which to add the messages.
-   * @returns True if the operation is successful.
-   */
-  addPendingL1ToL2Messages(messages: L1ToL2Message[], l1BlockNumber: bigint): Promise<boolean> {
-    return this.#tables.l1ToL2Messages.transaction(() => {
-      if ((this.#tables.l1ToL2MessagesByBlock.get(L1_BLOCK_ADDED_PENDING_MESSAGE) ?? 0n) >= l1BlockNumber) {
-        return false;
-      }
-      // ensure we don't add the same messages twice
-      void this.#tables.l1ToL2MessagesByBlock.put(L1_BLOCK_ADDED_PENDING_MESSAGE, l1BlockNumber);
-
-      for (const message of messages) {
-        const messageKey = message.entryKey?.toBuffer();
-        if (!messageKey) {
-          throw new Error('Message does not have an entry key');
-        }
-
-        let messageCtx = this.#tables.l1ToL2Messages.get(messageKey);
-        if (!messageCtx) {
-          messageCtx = {
-            message: message.toBuffer(),
-            pendingCount: 0,
-            confirmedCount: 0,
-          };
-          void this.#tables.l1ToL2Messages.put(messageKey, messageCtx);
-        }
-
-        this.#updateMessageCountInTx(messageKey, message, 1, 0);
-      }
-
-      return true;
-    });
-  }
-
-  /**
-   * Remove pending L1 to L2 messages from the store (if they were cancelled).
-   * @param cancelledMessages - The message keys to be removed from the store.
-   * @param l1BlockNumber - The L1 block number for which to remove the messages.
-   * @returns True if the operation is successful.
-   */
-  cancelPendingL1ToL2Messages(cancelledMessages: Fr[], l1BlockNumber: bigint): Promise<boolean> {
-    return this.#tables.l1ToL2Messages.transaction(() => {
-      if ((this.#tables.l1ToL2MessagesByBlock.get(L1_BLOCK_CANCELLED_MESSAGE) ?? 0n) >= l1BlockNumber) {
-        return false;
-      }
-      void this.#tables.l1ToL2MessagesByBlock.put(L1_BLOCK_CANCELLED_MESSAGE, l1BlockNumber);
-
-      for (const messageKey of cancelledMessages) {
-        const message = this.#getL1ToL2Message(messageKey.toBuffer());
-        if (!message) {
-          continue;
-        }
-        this.#updateMessageCountInTx(messageKey.toBuffer(), message, -1, 0);
-      }
-
-      return true;
-    });
-  }
-
-  /**
-   * Messages that have been published in an L2 block are confirmed.
-   * Add them to the confirmed store, also remove them from the pending store.
-   * @param entryKeys - The message keys to be removed from the store.
-   * @returns True if the operation is successful.
-   */
-  confirmL1ToL2Messages(entryKeys: Fr[]): Promise<boolean> {
-    return this.#tables.l1ToL2Messages.transaction(() => {
-      for (const entryKey of entryKeys) {
-        const messageKey = entryKey.toBuffer();
-        const message = this.#getL1ToL2Message(messageKey);
-        this.#updateMessageCountInTx(messageKey, message, -1, 1);
-      }
-      return true;
-    });
-  }
-
-  /**
-   * Gets up to `limit` amount of pending L1 to L2 messages, sorted by fee
-   * @param limit - The number of messages to return (by default NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP).
-   * @returns The requested L1 to L2 message keys.
-   */
-  getPendingL1ToL2MessageKeys(limit: number): Promise<Fr[]> {
-    // start a read transaction in order to have a consistent view of the data
-    // this is all sync code, but better to be safe in case it changes in the future
-    // or we end up having multiple processes touching the same db
-    const transaction = this.#tables.pendingMessagesByFee.useReadTransaction();
-
-    try {
-      // get all the keys, in reverse order
-      const fees = this.#tables.pendingMessagesByFee.getKeys({ reverse: true, transaction });
-      const messages: Fr[] = [];
-
-      loopOverFees: for (const fee of fees) {
-        const pendingMessages = this.#tables.pendingMessagesByFee.getValues(fee, { transaction });
-        this.#log(`Found pending messages for ${fee}`);
-
-        for (const messageKey of pendingMessages) {
-          const messageWithCount = this.#tables.l1ToL2Messages.get(messageKey, { transaction });
-          if (!messageWithCount || messageWithCount.pendingCount === 0) {
-            this.#log(
-              `Message ${messageKey.toString(
-                'hex',
-              )} has no pending count but it got picked up by getPEndingL1ToL2MessageKeys`,
-            );
-            continue;
-          }
-          const toAdd = Array(messageWithCount.pendingCount).fill(Fr.fromBuffer(messageKey));
-          this.#log(`Adding ${toAdd.length} copies of ${messageKey.toString('hex')} for ${fee}`);
-          messages.push(...toAdd);
-
-          if (messages.length >= limit) {
-            break loopOverFees;
-          }
-        }
-      }
-
-      return Promise.resolve(messages);
-    } catch (err) {
-      return Promise.reject(err);
-    } finally {
-      transaction.done();
-    }
-  }
-
-  /**
-   * Gets the confirmed L1 to L2 message corresponding to the given message key.
-   * @param messageKey - The message key to look up.
-   * @returns The requested L1 to L2 message or throws if not found.
-   */
-  getConfirmedL1ToL2Message(messageKey: Fr): Promise<L1ToL2Message> {
-    const value = this.#tables.l1ToL2Messages.get(messageKey.toBuffer());
-    if (!value) {
-      return Promise.reject(new Error(`Message with key ${messageKey} not found`));
-    }
-
-    if (value.confirmedCount === 0) {
-      return Promise.reject(new Error(`Message with key ${messageKey} not confirmed`));
-    }
-
-    return Promise.resolve(L1ToL2Message.fromBuffer(value.message));
-  }
-
-  /**
-   * Gets up to `limit` amount of logs starting from `from`.
-   * @param start - Number of the L2 block to which corresponds the first logs to be returned.
-   * @param limit - The number of logs to return.
-   * @param logType - Specifies whether to return encrypted or unencrypted logs.
-   * @returns The requested logs.
-   */
-  getLogs(start: number, limit: number, logType: LogType): Promise<L2BlockL2Logs[]> {
-    try {
-      const blockCtxKey = logType === LogType.ENCRYPTED ? 'encryptedLogs' : 'unencryptedLogs';
-      const logs = this.#tables.blocks
-        .getRange(this.#computeBlockRange(start, limit))
-        .map(({ value: { [blockCtxKey]: logs } }) =>
-          logs ? L2BlockL2Logs.fromBuffer(asBuffer(logs)) : new L2BlockL2Logs([]),
-        ).asArray;
-
-      return Promise.resolve(logs);
-    } catch (err) {
-      return Promise.reject(err);
-    }
-  }
-
-  /**
-   * Gets unencrypted logs based on the provided filter.
-   * @param filter - The filter to apply to the logs.
-   * @returns The requested logs.
-   */
-  getUnencryptedLogs(filter: LogFilter): Promise<GetUnencryptedLogsResponse> {
-    try {
-      if (filter.afterLog) {
-        return Promise.resolve(this.#filterUnencryptedLogsBetweenBlocks(filter));
-      } else if (filter.txHash) {
-        return Promise.resolve(this.#filterUnencryptedLogsOfTx(filter));
-      } else {
-        return Promise.resolve(this.#filterUnencryptedLogsBetweenBlocks(filter));
-      }
-    } catch (err) {
-      return Promise.reject(err);
-    }
-  }
-
-  #filterUnencryptedLogsOfTx(filter: LogFilter): GetUnencryptedLogsResponse {
-    if (!filter.txHash) {
-      throw new Error('Missing txHash');
-    }
-
-    const [blockNumber, txIndex] = this.#tables.txIndex.get(filter.txHash.buffer) ?? [];
-    if (typeof blockNumber !== 'number' || typeof txIndex !== 'number') {
-      return { logs: [], maxLogsHit: false };
-    }
-
-    const unencryptedLogsInBlock = this.#getBlockLogs(blockNumber, LogType.UNENCRYPTED);
-    const txLogs = unencryptedLogsInBlock.txLogs[txIndex].unrollLogs().map(log => UnencryptedL2Log.fromBuffer(log));
-
-    const logs: ExtendedUnencryptedL2Log[] = [];
-    const maxLogsHit = this.#accumulateLogs(logs, blockNumber, txIndex, txLogs, filter);
-
-    return { logs, maxLogsHit };
-  }
-
-  #filterUnencryptedLogsBetweenBlocks(filter: LogFilter): GetUnencryptedLogsResponse {
-    const start =
-      filter.afterLog?.blockNumber ?? Math.max(filter.fromBlock ?? INITIAL_L2_BLOCK_NUM, INITIAL_L2_BLOCK_NUM);
-    const end = filter.toBlock;
-
-    if (typeof end === 'number' && end < start) {
-      return {
-        logs: [],
-        maxLogsHit: true,
-      };
-    }
-
-    const logs: ExtendedUnencryptedL2Log[] = [];
-
-    const blockNumbers = this.#tables.blocks.getKeys({ start, end, snapshot: false });
-    let maxLogsHit = false;
-
-    loopOverBlocks: for (const blockNumber of blockNumbers) {
-      const unencryptedLogsInBlock = this.#getBlockLogs(blockNumber, LogType.UNENCRYPTED);
-      for (let txIndex = filter.afterLog?.txIndex ?? 0; txIndex < unencryptedLogsInBlock.txLogs.length; txIndex++) {
-        const txLogs = unencryptedLogsInBlock.txLogs[txIndex].unrollLogs().map(log => UnencryptedL2Log.fromBuffer(log));
-        maxLogsHit = this.#accumulateLogs(logs, blockNumber, txIndex, txLogs, filter);
-        if (maxLogsHit) {
-          break loopOverBlocks;
-        }
-      }
-    }
-
-    return { logs, maxLogsHit };
-  }
-
-  #accumulateLogs(
-    results: ExtendedUnencryptedL2Log[],
-    blockNumber: number,
-    txIndex: number,
-    txLogs: UnencryptedL2Log[],
-    filter: LogFilter,
-  ): boolean {
-    let maxLogsHit = false;
-    let logIndex = typeof filter.afterLog?.logIndex === 'number' ? filter.afterLog.logIndex + 1 : 0;
-    for (; logIndex < txLogs.length; logIndex++) {
-      const log = txLogs[logIndex];
-      if (filter.contractAddress && !log.contractAddress.equals(filter.contractAddress)) {
-        continue;
-      }
-
-      if (filter.selector && !log.selector.equals(filter.selector)) {
-        continue;
-      }
-
-      results.push(new ExtendedUnencryptedL2Log(new LogId(blockNumber, txIndex, logIndex), log));
-      if (results.length >= this.#logsMaxPageSize) {
-        maxLogsHit = true;
-        break;
-      }
-    }
-
-    return maxLogsHit;
-  }
-
-  /**
-   * Add new extended contract data from an L2 block to the store's list.
-   * @param data - List of contracts' data to be added.
-   * @param blockNum - Number of the L2 block the contract data was deployed in.
-   * @returns True if the operation is successful.
-   */
-  addExtendedContractData(data: ExtendedContractData[], blockNum: number): Promise<boolean> {
-    return this.#tables.blocks.transaction(() => {
-      const blockCtx = this.#tables.blocks.get(blockNum) ?? {};
-      if (!blockCtx.extendedContractData) {
-        blockCtx.extendedContractData = [];
-      }
-      this.#log(`Adding ${data.length} extended contract data to block ${blockNum}`);
-      blockCtx.extendedContractData.push(...data.map(data => data.toBuffer()));
-      void this.#tables.blocks.put(blockNum, blockCtx);
-
-      return true;
-    });
-  }
-
-  /**
-   * Get the extended contract data for this contract.
-   * @param contractAddress - The contract data address.
-   * @returns The extended contract data or undefined if not found.
-   */
-  getExtendedContractData(contractAddress: AztecAddress): Promise<ExtendedContractData | undefined> {
-    const [blockNumber, _] = this.#tables.contractIndex.get(contractAddress.toBuffer()) ?? [];
-
-    if (typeof blockNumber !== 'number') {
-      return Promise.resolve(undefined);
-    }
-
-    const blockCtx = this.#tables.blocks.get(blockNumber);
-    if (!blockCtx) {
-      return Promise.resolve(undefined);
-    }
-
-    for (const data of blockCtx.extendedContractData ?? []) {
-      const extendedContractData = ExtendedContractData.fromBuffer(asBuffer(data));
-      if (extendedContractData.contractData.contractAddress.equals(contractAddress)) {
-        return Promise.resolve(extendedContractData);
-      }
-    }
-
-    return Promise.resolve(undefined);
-  }
-
-  /**
-   * Lookup all extended contract data in an L2 block.
-   * @param blockNum - The block number to get all contract data from.
-   * @returns All extended contract data in the block (if found).
-   */
-  getExtendedContractDataInBlock(blockNum: number): Promise<ExtendedContractData[]> {
-    const blockCtx = this.#tables.blocks.get(blockNum);
-    if (!blockCtx || !blockCtx.extendedContractData) {
-      return Promise.resolve([]);
-    }
-
-    return Promise.resolve(blockCtx.extendedContractData.map(data => ExtendedContractData.fromBuffer(asBuffer(data))));
-  }
-
-  /**
-   * Get basic info for an L2 contract.
-   * Contains contract address & the ethereum portal address.
-   * @param contractAddress - The contract data address.
-   * @returns ContractData with the portal address (if we didn't throw an error).
-   */
-  getContractData(contractAddress: AztecAddress): Promise<ContractData | undefined> {
-    const [blockNumber, index] = this.#tables.contractIndex.get(contractAddress.toBuffer()) ?? [];
-    if (typeof blockNumber !== 'number' || typeof index !== 'number') {
-      return Promise.resolve(undefined);
-    }
-
-    const block = this.#getBlock(blockNumber);
-    return Promise.resolve(block?.newContractData[index]);
-  }
-
-  /**
-   * Get basic info for an all L2 contracts deployed in a block.
-   * Contains contract address & the ethereum portal address.
-   * @param blockNumber - Number of the L2 block where contracts were deployed.
-   * @returns ContractData with the portal address (if we didn't throw an error).
-   */
-  getContractDataInBlock(blockNumber: number): Promise<ContractData[] | undefined> {
-    const block = this.#getBlock(blockNumber);
-    return Promise.resolve(block?.newContractData ?? []);
-  }
-
-  /**
-   * Gets the number of the latest L2 block processed.
-   * @returns The number of the latest L2 block processed.
-   */
-  getBlockNumber(): Promise<number> {
-    // inverse range with no start/end will return the last key
-    const [lastBlockNumber] = this.#tables.blocks.getKeys({ reverse: true, limit: 1 }).asArray;
-    return Promise.resolve(typeof lastBlockNumber === 'number' ? lastBlockNumber : INITIAL_L2_BLOCK_NUM - 1);
-  }
-
-  /**
-   * Gets the last L1 block number processed by the archiver
-   */
-  getL1BlockNumber(): Promise<ArchiverL1SynchPoint> {
-    // inverse range with no start/end will return the last value
-    const [lastL2Block] = this.#tables.blocks.getRange({ reverse: true, limit: 1 }).asArray;
-    const addedBlock = lastL2Block?.value?.l1BlockNumber ?? 0n;
-    const addedMessages = this.#tables.l1ToL2MessagesByBlock.get(L1_BLOCK_ADDED_PENDING_MESSAGE) ?? 0n;
-    const cancelledMessages = this.#tables.l1ToL2MessagesByBlock.get(L1_BLOCK_CANCELLED_MESSAGE) ?? 0n;
-
-    return Promise.resolve({
-      addedBlock,
-      addedMessages,
-      cancelledMessages,
-    });
-  }
-
-  #getBlock(blockNumber: number, withLogs = false): L2Block | undefined {
-    const blockCtx = this.#tables.blocks.get(blockNumber);
-    if (!blockCtx || !blockCtx.block) {
-      return undefined;
-    }
-
-    const block = L2Block.fromBuffer(
-      asBuffer(blockCtx.block),
-      blockCtx.blockHash ? asBuffer(blockCtx.blockHash) : undefined,
-    );
-
-    if (withLogs) {
-      if (blockCtx.encryptedLogs) {
-        block.attachLogs(L2BlockL2Logs.fromBuffer(asBuffer(blockCtx.encryptedLogs)), LogType.ENCRYPTED);
-      }
-
-      if (blockCtx.unencryptedLogs) {
-        block.attachLogs(L2BlockL2Logs.fromBuffer(asBuffer(blockCtx.unencryptedLogs)), LogType.UNENCRYPTED);
-      }
-    }
-
-    return block;
-  }
-
-  #getBlockLogs(blockNumber: number, logType: LogType): L2BlockL2Logs {
-    const blockCtx = this.#tables.blocks.get(blockNumber);
-    const logs = blockCtx?.[logType === LogType.ENCRYPTED ? 'encryptedLogs' : 'unencryptedLogs'];
-
-    if (!logs) {
-      return new L2BlockL2Logs([]);
-    }
-
-    return L2BlockL2Logs.fromBuffer(asBuffer(logs));
-  }
-
-  #computeBlockRange(start: number, limit: number): Required<Pick<RangeOptions, 'start' | 'end'>> {
-    if (limit < 1) {
-      throw new Error(`Invalid limit: ${limit}`);
-    }
-
-    if (start < INITIAL_L2_BLOCK_NUM) {
-      this.#log(`Clamping start block ${start} to ${INITIAL_L2_BLOCK_NUM}`);
-      start = INITIAL_L2_BLOCK_NUM;
-    }
-
-    const end = start + limit;
-    return { start, end };
-  }
-
-  #getL1ToL2Message(entryKey: Buffer): L1ToL2Message {
-    const value = this.#tables.l1ToL2Messages.get(entryKey);
-    if (!value) {
-      throw new Error('Unknown message: ' + entryKey.toString());
-    }
-
-    return L1ToL2Message.fromBuffer(value.message);
-  }
-
-  /**
-   * Atomically updates the pending and confirmed count for a message.
-   * If both counts are 0 after adding their respective deltas, the message is removed from the store.
-   *
-   * Only call this method from inside a _transaction_!
-   *
-   * @param messageKey - The message key to update.
-   * @param message - The message to update.
-   * @param deltaPendingCount - The amount to add to the pending count.
-   * @param deltaConfirmedCount - The amount to add to the confirmed count.
-   */
-  #updateMessageCountInTx(
-    messageKey: Buffer,
-    message: L1ToL2Message,
-    deltaPendingCount: number,
-    deltaConfirmedCount: number,
-  ): void {
-    const entry = this.#tables.l1ToL2Messages.getEntry(messageKey);
-    if (!entry) {
-      return;
-    }
-
-    const { value } = entry;
-
-    value.pendingCount = Math.max(0, value.pendingCount + deltaPendingCount);
-    value.confirmedCount = Math.max(0, value.confirmedCount + deltaConfirmedCount);
-
-    this.#log(
-      `Updating count of ${messageKey.toString('hex')} to ${value.pendingCount} pending and ${
-        value.confirmedCount
-      } confirmed}`,
-    );
-
-    if (value.pendingCount === 0) {
-      this.#log(`Removing message ${messageKey.toString('hex')} from pending messages group with fee ${message.fee}`);
-      void this.#tables.pendingMessagesByFee.remove(message.fee, messageKey);
-    } else if (value.pendingCount > 0) {
-      this.#log(`Adding message ${messageKey.toString('hex')} to pending message group with fee ${message.fee}`);
-      void this.#tables.pendingMessagesByFee.put(message.fee, messageKey);
-    }
-
-    if (value.pendingCount === 0 && value.confirmedCount === 0) {
-      void this.#tables.l1ToL2Messages.remove(messageKey);
-    } else {
-      void this.#tables.l1ToL2Messages.put(messageKey, value);
-    }
-  }
-}
-
-/**
- * Creates a Buffer viewing the same memory location as the passed array.
- * @param arr - A Uint8Array
- */
-function asBuffer(arr: Uint8Array | Buffer): Buffer {
-  return Buffer.isBuffer(arr) ? arr : Buffer.from(arr.buffer, arr.byteOffset, arr.length / arr.BYTES_PER_ELEMENT);
-}
diff --git a/yarn-project/archiver/tsconfig.json b/yarn-project/archiver/tsconfig.json
index 902e0c054906..6a0c794ba6dd 100644
--- a/yarn-project/archiver/tsconfig.json
+++ b/yarn-project/archiver/tsconfig.json
@@ -18,6 +18,9 @@
     {
       "path": "../foundation"
     },
+    {
+      "path": "../kv-store"
+    },
     {
       "path": "../l1-artifacts"
     }
diff --git a/yarn-project/aztec-node/src/aztec-node/server.ts b/yarn-project/aztec-node/src/aztec-node/server.ts
index 1d24a3e17b4e..0c65a9c488df 100644
--- a/yarn-project/aztec-node/src/aztec-node/server.ts
+++ b/yarn-project/aztec-node/src/aztec-node/server.ts
@@ -1,4 +1,4 @@
-import { Archiver, LMDBArchiverStore } from '@aztec/archiver';
+import { Archiver, KVArchiverDataStore } from '@aztec/archiver';
 import {
   AztecNode,
   ContractData,
@@ -107,10 +107,10 @@ export class AztecNodeService implements AztecNode {
 
     const log = createDebugLogger('aztec:node');
     const store = await AztecLmdbStore.create(config.l1Contracts.rollupAddress, config.dataDirectory);
-    const [nodeDb, worldStateDb] = await openDb(config, log);
+    const [_, worldStateDb] = await openDb(config, log);
 
     // first create and sync the archiver
-    const archiverStore = new LMDBArchiverStore(nodeDb, config.maxLogs);
+    const archiverStore = new KVArchiverDataStore(store, config.maxLogs);
     const archiver = await Archiver.createAndSync(config, archiverStore, true);
 
     // we identify the P2P transaction protocol by using the rollup contract address.
diff --git a/yarn-project/aztec-nr/.gitrepo b/yarn-project/aztec-nr/.gitrepo
index 879c65ffafe1..5374705e2dfd 100644
--- a/yarn-project/aztec-nr/.gitrepo
+++ b/yarn-project/aztec-nr/.gitrepo
@@ -6,7 +6,7 @@
 [subrepo]
 	remote = https://github.com/AztecProtocol/aztec-nr
 	branch = master
-	commit = 8e2f097cdb016eba9650161d669d583b902405c6
+	commit = ecbd4b0a4bf02c8221499b700b7da72363d561fc
 	method = merge
 	cmdver = 0.4.6
-	parent = 84dc42110cf307dd5c95f1077728910757c01d3a
+	parent = eb0c17382c5ae5f97b4a796b42bfe59edc24699c
diff --git a/yarn-project/aztec-nr/README.md b/yarn-project/aztec-nr/README.md
index d42d9a882fd0..31b4527801cc 100644
--- a/yarn-project/aztec-nr/README.md
+++ b/yarn-project/aztec-nr/README.md
@@ -53,7 +53,7 @@ value_note = { git = "https://github.com/AztecProtocol/aztec-nr", tag = "master"
 To use `Aztec.nr` you must have [Noir](https://noir-lang.org/) installed. Noir is a general purpose programming language for creating zero-knowledge-proofs. `Aztec.nr` supercharges the Noir language with Aztec Smart Contract capabilities.
 
 ### Quick Installation
-The fastest way to install is with [noirup](https://noir-lang.org/docs/getting_started/nargo_installation#option-1-noirup).
+The fastest way to install is with [noirup](https://noir-lang.org/docs/getting_started/installation/#installing-noirup).
 
 To use `Aztec-nr` the `aztec` version of `Noir` is required (Note; this version is temporarily required if you would like to use `#[aztec()]` macros).
 
@@ -67,5 +67,5 @@ Replace `NARGO_VERSION_COMPATIBLE_WITH_YOUR_SANDBOX` with the version from the o
 aztec-cli get-node-info
 ```
 
-For more installation options, please view [Noir's getting started.](https://noir-lang.org/docs/getting_started/nargo_installation)
+For more installation options, please view [Noir's getting started.](https://noir-lang.org/docs/getting_started/installation/other_install_methods)
 
diff --git a/yarn-project/aztec-nr/aztec/src/state_vars/public_state.nr b/yarn-project/aztec-nr/aztec/src/state_vars/public_state.nr
index b24c4a3323e0..10970a92c0dd 100644
--- a/yarn-project/aztec-nr/aztec/src/state_vars/public_state.nr
+++ b/yarn-project/aztec-nr/aztec/src/state_vars/public_state.nr
@@ -31,7 +31,7 @@ impl<T, T_SERIALIZED_LEN> PublicState<T, T_SERIALIZED_LEN> {
 
     // docs:start:public_state_struct_read
     pub fn read(self) -> T {
-        assert(self.context.private.is_none(), "Public state writes only supported in public functions");
+        assert(self.context.private.is_none(), "Public state reads only supported in public functions");
         storage_read(self.storage_slot, self.serialization_methods.deserialize)
     }
     // docs:end:public_state_struct_read
diff --git a/yarn-project/aztec-sandbox/src/bin/index.ts b/yarn-project/aztec-sandbox/src/bin/index.ts
index 75b8d3113474..97aa2d790ea1 100644
--- a/yarn-project/aztec-sandbox/src/bin/index.ts
+++ b/yarn-project/aztec-sandbox/src/bin/index.ts
@@ -7,7 +7,6 @@ import { init } from '@aztec/foundation/crypto';
 import { createStatusRouter, startHttpRpcServer } from '@aztec/foundation/json-rpc/server';
 import { createDebugLogger } from '@aztec/foundation/log';
 import { fileURLToPath } from '@aztec/foundation/url';
-import { NoirCommit, NoirTag } from '@aztec/noir-compiler/versions';
 import { BootstrapNode, getP2PConfigEnvVars } from '@aztec/p2p';
 import { GrumpkinScalar, PXEService, createPXERpcServer } from '@aztec/pxe';
 
@@ -121,7 +120,7 @@ async function main() {
 
   // Code path for starting Sandbox
   if (mode === SandboxMode.Sandbox) {
-    logger.info(`Setting up Aztec Sandbox v${version} (noir ${NoirCommit} ${NoirTag}), please stand by...`);
+    logger.info(`Setting up Aztec Sandbox v${version} please stand by...`);
 
     const { pxe, node, stop, accounts } = await createAndInitialiseSandbox(deployTestAccounts);
 
@@ -139,7 +138,7 @@ async function main() {
       const accountLogStrings = await createAccountLogs(accounts, pxe);
       logStrings.push(...accountLogStrings);
     }
-    logStrings.push(`Aztec Sandbox v${version} (noir ${NoirCommit}) is now ready for use!`);
+    logStrings.push(`Aztec Sandbox v${version} is now ready for use!`);
   } else if (mode === SandboxMode.Node) {
     // Code path for starting Node only
     const nodeConfig = getNodeConfigEnvVars();
@@ -170,7 +169,7 @@ async function main() {
     const httpServer = http.createServer(app.callback());
     httpServer.listen(port);
 
-    logStrings.push(`Aztec Node v${version} (noir ${NoirCommit}) is now ready for use in port ${port}!`);
+    logStrings.push(`Aztec Node v${version} is now ready for use in port ${port}!`);
   } else if (mode === SandboxMode.PXE) {
     // Code path for starting PXE only
 
@@ -190,7 +189,7 @@ async function main() {
       logStrings.push(...accountLogStrings);
     }
 
-    logStrings.push(`PXE v${version} (noir ${NoirCommit}) is now ready for use in port ${PXE_PORT}!`);
+    logStrings.push(`PXE v${version} is now ready for use in port ${PXE_PORT}!`);
   } else if (mode === SandboxMode.P2PBootstrap) {
     // Code path for starting a P2P bootstrap node
     const config = getP2PConfigEnvVars();
diff --git a/yarn-project/aztec-sandbox/src/sandbox.ts b/yarn-project/aztec-sandbox/src/sandbox.ts
index a268904da116..acb868e4bca4 100644
--- a/yarn-project/aztec-sandbox/src/sandbox.ts
+++ b/yarn-project/aztec-sandbox/src/sandbox.ts
@@ -11,6 +11,8 @@ import {
 import { createDebugLogger } from '@aztec/foundation/log';
 import { retryUntil } from '@aztec/foundation/retry';
 import {
+  AvailabilityOracleAbi,
+  AvailabilityOracleBytecode,
   ContractDeploymentEmitterAbi,
   ContractDeploymentEmitterBytecode,
   InboxAbi,
@@ -90,6 +92,10 @@ export async function deployContractsToL1(aztecNodeConfig: AztecNodeConfig, hdAc
       contractAbi: OutboxAbi,
       contractBytecode: OutboxBytecode,
     },
+    availabilityOracle: {
+      contractAbi: AvailabilityOracleAbi,
+      contractBytecode: AvailabilityOracleBytecode,
+    },
     rollup: {
       contractAbi: RollupAbi,
       contractBytecode: RollupBytecode,
diff --git a/yarn-project/aztec.js/src/contract/contract.test.ts b/yarn-project/aztec.js/src/contract/contract.test.ts
index 14bdbe71f297..3ea687ebd7ea 100644
--- a/yarn-project/aztec.js/src/contract/contract.test.ts
+++ b/yarn-project/aztec.js/src/contract/contract.test.ts
@@ -21,16 +21,15 @@ describe('Contract Class', () => {
   const mockTxReceipt = { type: 'TxReceipt' } as any as TxReceipt;
   const mockViewResultValue = 1;
   const l1Addresses: L1ContractAddresses = {
+    availabilityOracleAddress: EthAddress.random(),
     rollupAddress: EthAddress.random(),
     registryAddress: EthAddress.random(),
     inboxAddress: EthAddress.random(),
     outboxAddress: EthAddress.random(),
     contractDeploymentEmitterAddress: EthAddress.random(),
-    decoderHelperAddress: EthAddress.random(),
   };
   const mockNodeInfo: NodeInfo = {
     nodeVersion: 'vx.x.x',
-    compatibleNargoVersion: 'vx.x.x-aztec.x',
     chainId: 1,
     protocolVersion: 2,
     l1ContractAddresses: l1Addresses,
diff --git a/yarn-project/circuit-types/src/l2_block.ts b/yarn-project/circuit-types/src/l2_block.ts
index 2a8efb85a3db..620659b01f13 100644
--- a/yarn-project/circuit-types/src/l2_block.ts
+++ b/yarn-project/circuit-types/src/l2_block.ts
@@ -1,6 +1,5 @@
 import {
   AppendOnlyTreeSnapshot,
-  GlobalVariables,
   Header,
   MAX_NEW_COMMITMENTS_PER_TX,
   MAX_NEW_CONTRACTS_PER_TX,
@@ -8,19 +7,15 @@ import {
   MAX_NEW_NULLIFIERS_PER_TX,
   MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX,
   NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP,
-  NUM_BYTES_PER_SHA256,
-  PartialStateReference,
   STRING_ENCODING,
-  StateReference,
 } from '@aztec/circuits.js';
 import { makeAppendOnlyTreeSnapshot, makeGlobalVariables, makeHeader } from '@aztec/circuits.js/factories';
+import { times } from '@aztec/foundation/collection';
 import { keccak, sha256 } from '@aztec/foundation/crypto';
 import { Fr } from '@aztec/foundation/fields';
 import { createDebugLogger } from '@aztec/foundation/log';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 
-import times from 'lodash.times';
-
 import { ContractData } from './contract_data.js';
 import { L2Tx } from './l2_tx.js';
 import { LogType, TxL2Logs } from './logs/index.js';
@@ -264,19 +259,7 @@ export class L2Block {
    */
   toBuffer() {
     return serializeToBuffer(
-      this.header.globalVariables,
-      // TODO(#3868)
-      AppendOnlyTreeSnapshot.empty(), // this.startNoteHashTreeSnapshot,
-      AppendOnlyTreeSnapshot.empty(), // this.startNullifierTreeSnapshot,
-      AppendOnlyTreeSnapshot.empty(), // this.startContractTreeSnapshot,
-      AppendOnlyTreeSnapshot.empty(), // this.startPublicDataTreeSnapshot,
-      AppendOnlyTreeSnapshot.empty(), // this.startL1ToL2MessageTreeSnapshot,
-      this.header.lastArchive,
-      this.header.state.partial.noteHashTree,
-      this.header.state.partial.nullifierTree,
-      this.header.state.partial.contractTree,
-      this.header.state.partial.publicDataTree,
-      this.header.state.l1ToL2MessageTree,
+      this.header,
       this.archive,
       this.newCommitments.length,
       this.newCommitments,
@@ -309,6 +292,32 @@ export class L2Block {
     return serializeToBuffer(this.toBuffer(), this.newEncryptedLogs, this.newUnencryptedLogs);
   }
 
+  bodyToBuffer(): Buffer {
+    if (this.newEncryptedLogs === undefined || this.newUnencryptedLogs === undefined) {
+      throw new Error(
+        `newEncryptedLogs and newUnencryptedLogs must be defined when encoding L2BlockData (block ${this.header.globalVariables.blockNumber})`,
+      );
+    }
+
+    return serializeToBuffer(
+      this.newCommitments.length,
+      this.newCommitments,
+      this.newNullifiers.length,
+      this.newNullifiers,
+      this.newPublicDataWrites.length,
+      this.newPublicDataWrites,
+      this.newL2ToL1Msgs.length,
+      this.newL2ToL1Msgs,
+      this.newContracts.length,
+      this.newContracts,
+      this.newContractData,
+      this.newL1ToL2Messages.length,
+      this.newL1ToL2Messages,
+      this.newEncryptedLogs,
+      this.newUnencryptedLogs,
+    );
+  }
+
   /**
    * Serializes a block without logs to a string.
    * @remarks This is used when the block is being served via JSON-RPC because the logs are expected to be served
@@ -327,20 +336,8 @@ export class L2Block {
    */
   static fromBuffer(buf: Buffer | BufferReader, blockHash?: Buffer) {
     const reader = BufferReader.asReader(buf);
-    const globalVariables = reader.readObject(GlobalVariables);
-    // TODO(#3938): update the encoding here
-    reader.readObject(AppendOnlyTreeSnapshot); // startNoteHashTreeSnapshot
-    reader.readObject(AppendOnlyTreeSnapshot); // startNullifierTreeSnapshot
-    reader.readObject(AppendOnlyTreeSnapshot); // startContractTreeSnapshot
-    reader.readObject(AppendOnlyTreeSnapshot); // startPublicDataTreeSnapshot
-    reader.readObject(AppendOnlyTreeSnapshot); // startL1ToL2MessageTreeSnapshot
-    const startArchiveSnapshot = reader.readObject(AppendOnlyTreeSnapshot);
-    const endNoteHashTreeSnapshot = reader.readObject(AppendOnlyTreeSnapshot);
-    const endNullifierTreeSnapshot = reader.readObject(AppendOnlyTreeSnapshot);
-    const endContractTreeSnapshot = reader.readObject(AppendOnlyTreeSnapshot);
-    const endPublicDataTreeSnapshot = reader.readObject(AppendOnlyTreeSnapshot);
-    const endL1ToL2MessageTreeSnapshot = reader.readObject(AppendOnlyTreeSnapshot);
-    const endArchiveSnapshot = reader.readObject(AppendOnlyTreeSnapshot);
+    const header = reader.readObject(Header);
+    const archive = reader.readObject(AppendOnlyTreeSnapshot);
     const newCommitments = reader.readVector(Fr);
     const newNullifiers = reader.readVector(Fr);
     const newPublicDataWrites = reader.readVector(PublicDataWrite);
@@ -350,19 +347,9 @@ export class L2Block {
     // TODO(sean): could an optimization of this be that it is encoded such that zeros are assumed
     const newL1ToL2Messages = reader.readVector(Fr);
 
-    const partial = new PartialStateReference(
-      endNoteHashTreeSnapshot,
-      endNullifierTreeSnapshot,
-      endContractTreeSnapshot,
-      endPublicDataTreeSnapshot,
-    );
-    const state = new StateReference(endL1ToL2MessageTreeSnapshot, partial);
-    // TODO(#3938): populate bodyHash
-    const header = new Header(startArchiveSnapshot, Buffer.alloc(NUM_BYTES_PER_SHA256), state, globalVariables);
-
     return L2Block.fromFields(
       {
-        archive: endArchiveSnapshot,
+        archive,
         header,
         newCommitments,
         newNullifiers,
diff --git a/yarn-project/circuit-types/src/l2_tx.ts b/yarn-project/circuit-types/src/l2_tx.ts
index 293e87f89e42..65588476418d 100644
--- a/yarn-project/circuit-types/src/l2_tx.ts
+++ b/yarn-project/circuit-types/src/l2_tx.ts
@@ -6,11 +6,10 @@ import {
   MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX,
   Vector,
 } from '@aztec/circuits.js';
+import { times } from '@aztec/foundation/collection';
 import { Fr } from '@aztec/foundation/fields';
 import { BufferReader, numToUInt32BE } from '@aztec/foundation/serialize';
 
-import times from 'lodash.times';
-
 import { ContractData } from './contract_data.js';
 import { PublicDataWrite } from './public_data_write.js';
 import { TxHash } from './tx/tx_hash.js';
diff --git a/yarn-project/circuit-types/src/mocks.ts b/yarn-project/circuit-types/src/mocks.ts
index c4d9827e8526..5dbddd45d595 100644
--- a/yarn-project/circuit-types/src/mocks.ts
+++ b/yarn-project/circuit-types/src/mocks.ts
@@ -9,11 +9,10 @@ import {
 } from '@aztec/circuits.js';
 import { makePrivateKernelPublicInputsFinal, makePublicCallRequest } from '@aztec/circuits.js/factories';
 import { ContractArtifact } from '@aztec/foundation/abi';
+import { times } from '@aztec/foundation/collection';
 import { randomBytes } from '@aztec/foundation/crypto';
 import { Tuple } from '@aztec/foundation/serialize';
 
-import times from 'lodash.times';
-
 import { ExtendedContractData } from './contract_data.js';
 import { DeployedContract } from './interfaces/index.js';
 import { FunctionL2Logs, Note, TxL2Logs } from './logs/index.js';
diff --git a/yarn-project/circuits.js/package.json b/yarn-project/circuits.js/package.json
index 10befd0fe2ba..e3f18a3ca83b 100644
--- a/yarn-project/circuits.js/package.json
+++ b/yarn-project/circuits.js/package.json
@@ -43,14 +43,12 @@
     "@aztec/foundation": "workspace:^",
     "eslint": "^8.35.0",
     "lodash.chunk": "^4.2.0",
-    "lodash.times": "^4.3.2",
     "tslib": "^2.4.0"
   },
   "devDependencies": {
     "@jest/globals": "^29.5.0",
     "@types/jest": "^29.5.0",
     "@types/lodash.chunk": "^4.2.7",
-    "@types/lodash.times": "^4.3.7",
     "@types/node": "^18.7.23",
     "jest": "^29.5.0",
     "prettier": "^2.8.4",
diff --git a/yarn-project/circuits.js/src/abis/abis.test.ts b/yarn-project/circuits.js/src/abis/abis.test.ts
index 51113d7497fa..ab0132ce8b67 100644
--- a/yarn-project/circuits.js/src/abis/abis.test.ts
+++ b/yarn-project/circuits.js/src/abis/abis.test.ts
@@ -1,4 +1,4 @@
-import times from 'lodash.times';
+import { times } from '@aztec/foundation/collection';
 
 import {
   AztecAddress,
diff --git a/yarn-project/circuits.js/src/structs/aggregation_object.ts b/yarn-project/circuits.js/src/structs/aggregation_object.ts
index 798cc126b11e..b05d57d43aeb 100644
--- a/yarn-project/circuits.js/src/structs/aggregation_object.ts
+++ b/yarn-project/circuits.js/src/structs/aggregation_object.ts
@@ -1,8 +1,7 @@
+import { times } from '@aztec/foundation/collection';
 import { Fq, Fr } from '@aztec/foundation/fields';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 
-import times from 'lodash.times';
-
 import { UInt32, Vector } from './shared.js';
 import { G1AffineElement } from './verification_key.js';
 
diff --git a/yarn-project/circuits.js/src/structs/header.ts b/yarn-project/circuits.js/src/structs/header.ts
index 12aebcf39af4..6c70655e81d2 100644
--- a/yarn-project/circuits.js/src/structs/header.ts
+++ b/yarn-project/circuits.js/src/structs/header.ts
@@ -25,16 +25,16 @@ export class Header {
 
   toBuffer() {
     // Note: The order here must match the order in the HeaderDecoder solidity library.
-    return serializeToBuffer(this.lastArchive, this.bodyHash, this.state, this.globalVariables);
+    return serializeToBuffer(this.globalVariables, this.state, this.lastArchive, this.bodyHash);
   }
 
   static fromBuffer(buffer: Buffer | BufferReader): Header {
     const reader = BufferReader.asReader(buffer);
-    return new Header(
-      reader.readObject(AppendOnlyTreeSnapshot),
-      reader.readBytes(NUM_BYTES_PER_SHA256),
-      reader.readObject(StateReference),
-      reader.readObject(GlobalVariables),
-    );
+    // TODO(#4045): unify ordering here with ordering in constructor.
+    const globalVariables = reader.readObject(GlobalVariables);
+    const state = reader.readObject(StateReference);
+    const lastArchive = reader.readObject(AppendOnlyTreeSnapshot);
+    const bodyHash = reader.readBytes(NUM_BYTES_PER_SHA256);
+    return new Header(lastArchive, bodyHash, state, globalVariables);
   }
 }
diff --git a/yarn-project/circuits.js/src/structs/verification_key.ts b/yarn-project/circuits.js/src/structs/verification_key.ts
index 91e773d843f6..1e397cec8cef 100644
--- a/yarn-project/circuits.js/src/structs/verification_key.ts
+++ b/yarn-project/circuits.js/src/structs/verification_key.ts
@@ -1,7 +1,6 @@
+import { times } from '@aztec/foundation/collection';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 
-import times from 'lodash.times';
-
 import { Fq } from './index.js';
 import { CircuitType } from './shared.js';
 
diff --git a/yarn-project/cli/README.md b/yarn-project/cli/README.md
index 70007f28da5d..15fe370f1838 100644
--- a/yarn-project/cli/README.md
+++ b/yarn-project/cli/README.md
@@ -3,20 +3,12 @@
 The Aztec CLI `aztec-cli` is a command-line interface (CLI) tool for interacting with Aztec. It provides various commands for deploying contracts, creating accounts, interacting with contracts, and retrieving blockchain data.
 
 ## Installation
+1. In your terminal, download the sandbox by running
+```
+bash -i <(curl -s install.aztec.network)
+```
 
-To use `aztec-cli`, you need to have Node.js installed on your system. Follow these steps to install and set up the CLI tool:
-
-1. Install Node.js: Visit the official Node.js website (https://nodejs.org) and download the installer for your operating system. Follow the installation instructions to install Node.js.
-
-2. Install `aztec-cli` package: Open a terminal or command prompt and run the following command to install `aztec-cli` globally on your system:
-
-   ```shell
-   npm install -g @aztec/cli
-   ```
-
-   This will install the `aztec-cli` globally, making it accessible from any location in your terminal.
-
-3. Verify the installation: After the installation is complete, run the following command to verify that `aztec-cli` is installed correctly:
+2. Verify the installation: After the installation is complete, run the following command to verify that `aztec-cli` is installed correctly:
 
    ```shell
    aztec-cli --version
diff --git a/yarn-project/cli/src/cmds/get_node_info.ts b/yarn-project/cli/src/cmds/get_node_info.ts
index 4d98da411cdf..2f14d5f5a24c 100644
--- a/yarn-project/cli/src/cmds/get_node_info.ts
+++ b/yarn-project/cli/src/cmds/get_node_info.ts
@@ -10,7 +10,6 @@ export async function getNodeInfo(rpcUrl: string, debugLogger: DebugLogger, log:
   const info = await client.getNodeInfo();
   log(`\nNode Info:\n`);
   log(`Node Version: ${info.nodeVersion}\n`);
-  log(`Compatible Nargo Version: ${info.compatibleNargoVersion}\n`);
   log(`Chain Id: ${info.chainId}\n`);
   log(`Protocol Version: ${info.protocolVersion}\n`);
   log(`Rollup Address: ${info.l1ContractAddresses.rollupAddress.toString()}`);
diff --git a/yarn-project/cli/src/utils.ts b/yarn-project/cli/src/utils.ts
index 6745c533194e..a3926ae67502 100644
--- a/yarn-project/cli/src/utils.ts
+++ b/yarn-project/cli/src/utils.ts
@@ -4,6 +4,7 @@ import { type L1ContractArtifactsForDeployment } from '@aztec/aztec.js/ethereum'
 import { type PXE } from '@aztec/aztec.js/interfaces/pxe';
 import { DebugLogger, LogFn } from '@aztec/foundation/log';
 import { NoirPackageConfig } from '@aztec/foundation/noir';
+import { AvailabilityOracleAbi, AvailabilityOracleBytecode } from '@aztec/l1-artifacts';
 
 import TOML from '@iarna/toml';
 import { CommanderError, InvalidArgumentError } from 'commander';
@@ -80,6 +81,10 @@ export async function deployAztecContracts(
       contractAbi: OutboxAbi,
       contractBytecode: OutboxBytecode,
     },
+    availabilityOracle: {
+      contractAbi: AvailabilityOracleAbi,
+      contractBytecode: AvailabilityOracleBytecode,
+    },
     rollup: {
       contractAbi: RollupAbi,
       contractBytecode: RollupBytecode,
diff --git a/yarn-project/end-to-end/package.json b/yarn-project/end-to-end/package.json
index bd1e835e57d2..88ccca29173f 100644
--- a/yarn-project/end-to-end/package.json
+++ b/yarn-project/end-to-end/package.json
@@ -32,6 +32,7 @@
     "@aztec/cli": "workspace:^",
     "@aztec/ethereum": "workspace:^",
     "@aztec/foundation": "workspace:^",
+    "@aztec/kv-store": "workspace:^",
     "@aztec/l1-artifacts": "workspace:^",
     "@aztec/merkle-tree": "workspace:^",
     "@aztec/noir-contracts": "workspace:^",
@@ -48,7 +49,6 @@
     "@types/koa-static": "^4.0.2",
     "@types/levelup": "^5.1.2",
     "@types/lodash.every": "^4.6.7",
-    "@types/lodash.times": "^4.3.7",
     "@types/memdown": "^3.0.3",
     "@types/node": "^18.7.23",
     "buffer": "^6.0.3",
@@ -58,10 +58,8 @@
     "koa": "^2.14.2",
     "koa-static": "^5.0.0",
     "levelup": "^5.1.1",
-    "lmdb": "^2.9.1",
     "lodash.compact": "^3.0.1",
     "lodash.every": "^4.6.0",
-    "lodash.times": "^4.3.2",
     "memdown": "^6.1.1",
     "process": "^0.11.10",
     "puppeteer": "^21.3.4",
diff --git a/yarn-project/end-to-end/src/benchmarks/utils.ts b/yarn-project/end-to-end/src/benchmarks/utils.ts
index 780d2561d6c3..348932f7b607 100644
--- a/yarn-project/end-to-end/src/benchmarks/utils.ts
+++ b/yarn-project/end-to-end/src/benchmarks/utils.ts
@@ -10,12 +10,12 @@ import {
   retryUntil,
   sleep,
 } from '@aztec/aztec.js';
+import { times } from '@aztec/foundation/collection';
 import { BenchmarkingContract } from '@aztec/noir-contracts/Benchmarking';
 import { PXEService, createPXEService } from '@aztec/pxe';
 
 import { mkdirpSync } from 'fs-extra';
 import { globSync } from 'glob';
-import times from 'lodash.times';
 import { join } from 'path';
 
 import { EndToEndContext, setup } from '../fixtures/utils.js';
diff --git a/yarn-project/end-to-end/src/cli_docs_sandbox.test.ts b/yarn-project/end-to-end/src/cli_docs_sandbox.test.ts
index 46411f3e3af6..c03353a9a889 100644
--- a/yarn-project/end-to-end/src/cli_docs_sandbox.test.ts
+++ b/yarn-project/end-to-end/src/cli_docs_sandbox.test.ts
@@ -30,7 +30,6 @@ describe('CLI docs sandbox', () => {
 Node Info:
 
 Node Version: #include_aztec_short_version
-Compatible Nargo Version: #include_noir_version
 Chain Id: 31337
 Protocol Version: 1
 Rollup Address: 0x0dcd1bf9a1b36ce34237eeafef220932846bcd82
diff --git a/yarn-project/end-to-end/src/e2e_block_building.test.ts b/yarn-project/end-to-end/src/e2e_block_building.test.ts
index 8cf476f323cd..d21b5a4a4470 100644
--- a/yarn-project/end-to-end/src/e2e_block_building.test.ts
+++ b/yarn-project/end-to-end/src/e2e_block_building.test.ts
@@ -12,12 +12,11 @@ import {
   Wallet,
   isContractDeployed,
 } from '@aztec/aztec.js';
+import { times } from '@aztec/foundation/collection';
 import { pedersenHash } from '@aztec/foundation/crypto';
 import { TestContract, TestContractArtifact } from '@aztec/noir-contracts/Test';
 import { TokenContract } from '@aztec/noir-contracts/Token';
 
-import times from 'lodash.times';
-
 import { setup } from './fixtures/utils.js';
 
 describe('e2e_block_building', () => {
diff --git a/yarn-project/end-to-end/src/fixtures/utils.ts b/yarn-project/end-to-end/src/fixtures/utils.ts
index 9121ca0e114c..8942bded2971 100644
--- a/yarn-project/end-to-end/src/fixtures/utils.ts
+++ b/yarn-project/end-to-end/src/fixtures/utils.ts
@@ -20,10 +20,10 @@ import {
   waitForPXE,
 } from '@aztec/aztec.js';
 import {
+  AvailabilityOracleAbi,
+  AvailabilityOracleBytecode,
   ContractDeploymentEmitterAbi,
   ContractDeploymentEmitterBytecode,
-  DecoderHelperAbi,
-  DecoderHelperBytecode,
   InboxAbi,
   InboxBytecode,
   OutboxAbi,
@@ -71,7 +71,6 @@ export const setupL1Contracts = async (
   l1RpcUrl: string,
   account: HDAccount | PrivateKeyAccount,
   logger: DebugLogger,
-  deployDecoderHelper = false,
 ) => {
   const l1Artifacts: L1ContractArtifactsForDeployment = {
     contractDeploymentEmitter: {
@@ -90,17 +89,15 @@ export const setupL1Contracts = async (
       contractAbi: OutboxAbi,
       contractBytecode: OutboxBytecode,
     },
+    availabilityOracle: {
+      contractAbi: AvailabilityOracleAbi,
+      contractBytecode: AvailabilityOracleBytecode,
+    },
     rollup: {
       contractAbi: RollupAbi,
       contractBytecode: RollupBytecode,
     },
   };
-  if (deployDecoderHelper) {
-    l1Artifacts.decoderHelper = {
-      contractAbi: DecoderHelperAbi,
-      contractBytecode: DecoderHelperBytecode,
-    };
-  }
   return await deployL1Contracts(l1RpcUrl, account, localAnvil, logger, l1Artifacts);
 };
 
@@ -288,12 +285,7 @@ export async function setup(
     opts.deployL1ContractsValues ?? (await setupL1Contracts(config.rpcUrl, hdAccount, logger));
 
   config.publisherPrivateKey = `0x${publisherPrivKey!.toString('hex')}`;
-  config.l1Contracts.rollupAddress = deployL1ContractsValues.l1ContractAddresses.rollupAddress;
-  config.l1Contracts.registryAddress = deployL1ContractsValues.l1ContractAddresses.registryAddress;
-  config.l1Contracts.contractDeploymentEmitterAddress =
-    deployL1ContractsValues.l1ContractAddresses.contractDeploymentEmitterAddress;
-  config.l1Contracts.inboxAddress = deployL1ContractsValues.l1ContractAddresses.inboxAddress;
-  config.l1Contracts.outboxAddress = deployL1ContractsValues.l1ContractAddresses.outboxAddress;
+  config.l1Contracts = deployL1ContractsValues.l1ContractAddresses;
 
   logger('Creating and synching an aztec node...');
   const aztecNode = await AztecNodeService.createAndSync(config);
diff --git a/yarn-project/end-to-end/src/integration_archiver_l1_to_l2.test.ts b/yarn-project/end-to-end/src/integration_archiver_l1_to_l2.test.ts
index b546356c6300..eb57e00eb21c 100644
--- a/yarn-project/end-to-end/src/integration_archiver_l1_to_l2.test.ts
+++ b/yarn-project/end-to-end/src/integration_archiver_l1_to_l2.test.ts
@@ -1,4 +1,4 @@
-import { Archiver, LMDBArchiverStore } from '@aztec/archiver';
+import { Archiver, KVArchiverDataStore } from '@aztec/archiver';
 import { AztecNodeConfig } from '@aztec/aztec-node';
 import {
   AztecAddress,
@@ -10,9 +10,9 @@ import {
   Wallet,
   computeMessageSecretHash,
 } from '@aztec/aztec.js';
+import { AztecLmdbStore } from '@aztec/kv-store';
 import { TokenContract } from '@aztec/noir-contracts/Token';
 
-import { open } from 'lmdb';
 import { Chain, HttpTransport, PublicClient } from 'viem';
 
 import { delay, deployAndInitializeTokenAndBridgeContracts, setNextBlockTimestamp, setup } from './fixtures/utils.js';
@@ -43,7 +43,7 @@ describe('archiver integration with l1 to l2 messages', () => {
     config.archiverPollingIntervalMS = 100;
     archiver = await Archiver.createAndSync(
       { ...config, l1Contracts: deployL1ContractsValues.l1ContractAddresses },
-      new LMDBArchiverStore(open({} as any)),
+      new KVArchiverDataStore(await AztecLmdbStore.create(deployL1ContractsValues.l1ContractAddresses.rollupAddress)),
     );
 
     const walletClient = deployL1ContractsValues.walletClient;
diff --git a/yarn-project/end-to-end/src/integration_l1_publisher.test.ts b/yarn-project/end-to-end/src/integration_l1_publisher.test.ts
index a4f2156ad331..be9d3ddad02c 100644
--- a/yarn-project/end-to-end/src/integration_l1_publisher.test.ts
+++ b/yarn-project/end-to-end/src/integration_l1_publisher.test.ts
@@ -28,7 +28,7 @@ import {
 } from '@aztec/circuits.js/factories';
 import { createEthereumChain } from '@aztec/ethereum';
 import { makeTuple, range } from '@aztec/foundation/array';
-import { DecoderHelperAbi, InboxAbi, OutboxAbi, RollupAbi } from '@aztec/l1-artifacts';
+import { InboxAbi, OutboxAbi, RollupAbi } from '@aztec/l1-artifacts';
 import {
   EmptyRollupProver,
   L1Publisher,
@@ -79,7 +79,6 @@ describe('L1Publisher integration', () => {
   let rollupAddress: Address;
   let inboxAddress: Address;
   let outboxAddress: Address;
-  let decoderHelperAddress: Address;
 
   let rollup: GetContractReturnType<typeof RollupAbi, PublicClient<HttpTransport, Chain>>;
   let inbox: GetContractReturnType<
@@ -88,7 +87,6 @@ describe('L1Publisher integration', () => {
     WalletClient<HttpTransport, Chain>
   >;
   let outbox: GetContractReturnType<typeof OutboxAbi, PublicClient<HttpTransport, Chain>>;
-  let decoderHelper: GetContractReturnType<typeof DecoderHelperAbi, PublicClient<HttpTransport, Chain>>;
 
   let publisher: L1Publisher;
   let l2Proof: Buffer;
@@ -110,13 +108,12 @@ describe('L1Publisher integration', () => {
       l1ContractAddresses,
       walletClient,
       publicClient: publicClient_,
-    } = await setupL1Contracts(config.rpcUrl, deployerAccount, logger, true);
+    } = await setupL1Contracts(config.rpcUrl, deployerAccount, logger);
     publicClient = publicClient_;
 
     rollupAddress = getAddress(l1ContractAddresses.rollupAddress.toString());
     inboxAddress = getAddress(l1ContractAddresses.inboxAddress.toString());
     outboxAddress = getAddress(l1ContractAddresses.outboxAddress.toString());
-    decoderHelperAddress = getAddress(l1ContractAddresses.decoderHelperAddress.toString());
 
     // Set up contract instances
     rollup = getContract({
@@ -135,11 +132,6 @@ describe('L1Publisher integration', () => {
       abi: OutboxAbi,
       publicClient,
     });
-    decoderHelper = getContract({
-      address: decoderHelperAddress!,
-      abi: DecoderHelperAbi,
-      publicClient,
-    });
 
     builderDb = await MerkleTrees.new(levelup((memdown as any)())).then(t => t.asLatest());
     const vks = getVerificationKeys();
@@ -253,6 +245,7 @@ describe('L1Publisher integration', () => {
     }
     // Path relative to the package.json in the end-to-end folder
     const path = `../../l1-contracts/test/fixtures/${fileName}.json`;
+
     const jsonObject = {
       populate: {
         l1ToL2Content: l1ToL2Content.map(c => `0x${c.toBuffer().toString('hex').padStart(64, '0')}`),
@@ -264,14 +257,54 @@ describe('L1Publisher integration', () => {
         l2ToL1Messages: block.newL2ToL1Msgs.map(m => `0x${m.toBuffer().toString('hex').padStart(64, '0')}`),
       },
       block: {
-        blockNumber: block.number,
-        startStateHash: `0x${block.getStartStateHash().toString('hex').padStart(64, '0')}`,
-        endStateHash: `0x${block.getEndStateHash().toString('hex').padStart(64, '0')}`,
-        publicInputsHash: `0x${block.getPublicInputsHash().toBuffer().toString('hex').padStart(64, '0')}`,
+        // The json formatting in forge is a bit brittle, so we convert Fr to a number in the few values bellow.
+        // This should not be a problem for testing as long as the values are not larger than u32.
+        archive: `0x${block.archive.root.toBuffer().toString('hex').padStart(64, '0')}`,
+        body: `0x${block.bodyToBuffer().toString('hex')}`,
         calldataHash: `0x${block.getCalldataHash().toString('hex').padStart(64, '0')}`,
+        decodedHeader: {
+          bodyHash: `0x${block.header.bodyHash.toString('hex').padStart(64, '0')}`,
+          globalVariables: {
+            blockNumber: block.number,
+            chainId: Number(block.header.globalVariables.chainId.toBigInt()),
+            timestamp: Number(block.header.globalVariables.timestamp.toBigInt()),
+            version: Number(block.header.globalVariables.version.toBigInt()),
+          },
+          lastArchive: {
+            nextAvailableLeafIndex: block.header.lastArchive.nextAvailableLeafIndex,
+            root: `0x${block.header.lastArchive.root.toBuffer().toString('hex').padStart(64, '0')}`,
+          },
+          stateReference: {
+            l1ToL2MessageTree: {
+              nextAvailableLeafIndex: block.header.state.l1ToL2MessageTree.nextAvailableLeafIndex,
+              root: `0x${block.header.state.l1ToL2MessageTree.root.toBuffer().toString('hex').padStart(64, '0')}`,
+            },
+            partialStateReference: {
+              contractTree: {
+                nextAvailableLeafIndex: block.header.state.partial.contractTree.nextAvailableLeafIndex,
+                root: `0x${block.header.state.partial.contractTree.root.toBuffer().toString('hex').padStart(64, '0')}`,
+              },
+              noteHashTree: {
+                nextAvailableLeafIndex: block.header.state.partial.noteHashTree.nextAvailableLeafIndex,
+                root: `0x${block.header.state.partial.noteHashTree.root.toBuffer().toString('hex').padStart(64, '0')}`,
+              },
+              nullifierTree: {
+                nextAvailableLeafIndex: block.header.state.partial.nullifierTree.nextAvailableLeafIndex,
+                root: `0x${block.header.state.partial.nullifierTree.root.toBuffer().toString('hex').padStart(64, '0')}`,
+              },
+              publicDataTree: {
+                nextAvailableLeafIndex: block.header.state.partial.publicDataTree.nextAvailableLeafIndex,
+                root: `0x${block.header.state.partial.publicDataTree.root
+                  .toBuffer()
+                  .toString('hex')
+                  .padStart(64, '0')}`,
+              },
+            },
+          },
+        },
+        header: `0x${block.header.toBuffer().toString('hex')}`,
         l1ToL2MessagesHash: `0x${block.getL1ToL2MessagesHash().toString('hex').padStart(64, '0')}`,
-        body: `0x${block.toBufferWithLogs().toString('hex')}`,
-        timestamp: Number(block.header.globalVariables.timestamp.toBigInt()), // The json formatting in forge is a bit brittle, so we convert to a number here. This should not be a problem for testing as longs as the timestamp is not larger than u32.
+        publicInputsHash: `0x${block.getPublicInputsHash().toBuffer().toString('hex').padStart(64, '0')}`,
       },
     };
 
@@ -280,8 +313,8 @@ describe('L1Publisher integration', () => {
   };
 
   it(`Build ${numberOfConsecutiveBlocks} blocks of 4 bloated txs building on each other`, async () => {
-    const stateInRollup_ = await rollup.read.rollupStateHash();
-    expect(hexStringToBuffer(stateInRollup_.toString())).toEqual(Buffer.alloc(32, 0));
+    const archiveInRollup_ = await rollup.read.archive();
+    expect(hexStringToBuffer(archiveInRollup_.toString())).toEqual(Buffer.alloc(32, 0));
 
     const blockNumber = await publicClient.getBlockNumber();
     // random recipient address, just kept consistent for easy testing ts/sol.
@@ -362,7 +395,7 @@ describe('L1Publisher integration', () => {
         fromBlock: blockNumber + 1n,
       });
       expect(logs).toHaveLength(i + 1);
-      expect(logs[i].args.blockNum).toEqual(BigInt(i + 1));
+      expect(logs[i].args.blockNumber).toEqual(BigInt(i + 1));
 
       const ethTx = await publicClient.getTransaction({
         hash: logs[i].transactionHash!,
@@ -371,23 +404,16 @@ describe('L1Publisher integration', () => {
       const expectedData = encodeFunctionData({
         abi: RollupAbi,
         functionName: 'process',
-        args: [`0x${l2Proof.toString('hex')}`, `0x${block.toBufferWithLogs().toString('hex')}`],
+        args: [
+          `0x${block.header.toBuffer().toString('hex')}`,
+          `0x${block.archive.root.toBuffer().toString('hex')}`,
+          `0x${block.getCalldataHash().toString('hex')}`,
+          `0x${block.bodyToBuffer().toString('hex')}`,
+          `0x${l2Proof.toString('hex')}`,
+        ],
       });
       expect(ethTx.input).toEqual(expectedData);
 
-      const decoderArgs = [`0x${block.toBufferWithLogs().toString('hex')}`] as const;
-      const decodedHashes = await decoderHelper.read.computeDiffRootAndMessagesHash(decoderArgs);
-      const decodedRes = await decoderHelper.read.decode(decoderArgs);
-      const stateInRollup = await rollup.read.rollupStateHash();
-
-      expect(block.number).toEqual(Number(decodedRes[0]));
-      expect(block.getStartStateHash()).toEqual(hexStringToBuffer(decodedRes[1].toString()));
-      expect(block.getEndStateHash()).toEqual(hexStringToBuffer(decodedRes[2].toString()));
-      expect(block.getEndStateHash()).toEqual(hexStringToBuffer(stateInRollup.toString()));
-      expect(block.getPublicInputsHash().toBuffer()).toEqual(hexStringToBuffer(decodedRes[3].toString()));
-      expect(block.getCalldataHash()).toEqual(hexStringToBuffer(decodedHashes[0].toString()));
-      expect(block.getL1ToL2MessagesHash()).toEqual(hexStringToBuffer(decodedHashes[1].toString()));
-
       // check that values have been consumed from the inbox
       for (let j = 0; j < l1ToL2Messages.length; j++) {
         if (l1ToL2Messages[j].isZero()) {
@@ -403,8 +429,8 @@ describe('L1Publisher integration', () => {
   }, 360_000);
 
   it(`Build ${numberOfConsecutiveBlocks} blocks of 4 empty txs building on each other`, async () => {
-    const stateInRollup_ = await rollup.read.rollupStateHash();
-    expect(hexStringToBuffer(stateInRollup_.toString())).toEqual(Buffer.alloc(32, 0));
+    const archiveInRollup_ = await rollup.read.archive();
+    expect(hexStringToBuffer(archiveInRollup_.toString())).toEqual(Buffer.alloc(32, 0));
 
     const blockNumber = await publicClient.getBlockNumber();
 
@@ -438,7 +464,7 @@ describe('L1Publisher integration', () => {
         fromBlock: blockNumber + 1n,
       });
       expect(logs).toHaveLength(i + 1);
-      expect(logs[i].args.blockNum).toEqual(BigInt(i + 1));
+      expect(logs[i].args.blockNumber).toEqual(BigInt(i + 1));
 
       const ethTx = await publicClient.getTransaction({
         hash: logs[i].transactionHash!,
@@ -447,22 +473,15 @@ describe('L1Publisher integration', () => {
       const expectedData = encodeFunctionData({
         abi: RollupAbi,
         functionName: 'process',
-        args: [`0x${l2Proof.toString('hex')}`, `0x${block.toBufferWithLogs().toString('hex')}`],
+        args: [
+          `0x${block.header.toBuffer().toString('hex')}`,
+          `0x${block.archive.root.toBuffer().toString('hex')}`,
+          `0x${block.getCalldataHash().toString('hex')}`,
+          `0x${block.bodyToBuffer().toString('hex')}`,
+          `0x${l2Proof.toString('hex')}`,
+        ],
       });
       expect(ethTx.input).toEqual(expectedData);
-
-      const decoderArgs = [`0x${block.toBufferWithLogs().toString('hex')}`] as const;
-      const decodedHashes = await decoderHelper.read.computeDiffRootAndMessagesHash(decoderArgs);
-      const decodedRes = await decoderHelper.read.decode(decoderArgs);
-      const stateInRollup = await rollup.read.rollupStateHash();
-
-      expect(block.number).toEqual(Number(decodedRes[0]));
-      expect(block.getStartStateHash()).toEqual(hexStringToBuffer(decodedRes[1].toString()));
-      expect(block.getEndStateHash()).toEqual(hexStringToBuffer(decodedRes[2].toString()));
-      expect(block.getEndStateHash()).toEqual(hexStringToBuffer(stateInRollup.toString()));
-      expect(block.getPublicInputsHash().toBuffer()).toEqual(hexStringToBuffer(decodedRes[3].toString()));
-      expect(block.getCalldataHash()).toEqual(hexStringToBuffer(decodedHashes[0].toString()));
-      expect(block.getL1ToL2MessagesHash()).toEqual(hexStringToBuffer(decodedHashes[1].toString()));
     }
   }, 60_000);
 });
diff --git a/yarn-project/end-to-end/tsconfig.json b/yarn-project/end-to-end/tsconfig.json
index 2cd953c345db..e467ab65bf4b 100644
--- a/yarn-project/end-to-end/tsconfig.json
+++ b/yarn-project/end-to-end/tsconfig.json
@@ -33,6 +33,9 @@
     {
       "path": "../foundation"
     },
+    {
+      "path": "../kv-store"
+    },
     {
       "path": "../l1-artifacts"
     },
diff --git a/yarn-project/ethereum/src/deploy_l1_contracts.ts b/yarn-project/ethereum/src/deploy_l1_contracts.ts
index 9682cc4e18b3..689423cf8346 100644
--- a/yarn-project/ethereum/src/deploy_l1_contracts.ts
+++ b/yarn-project/ethereum/src/deploy_l1_contracts.ts
@@ -60,10 +60,6 @@ export interface L1ContractArtifactsForDeployment {
    * Contract deployment emitter artifacts
    */
   contractDeploymentEmitter: ContractArtifacts;
-  /**
-   * Decoder contract artifacts
-   */
-  decoderHelper?: ContractArtifacts;
   /**
    * Inbox contract artifacts
    */
@@ -72,6 +68,10 @@ export interface L1ContractArtifactsForDeployment {
    * Outbox contract artifacts
    */
   outbox: ContractArtifacts;
+  /**
+   * Availability Oracle contract artifacts
+   */
+  availabilityOracle: ContractArtifacts;
   /**
    * Registry contract artifacts
    */
@@ -136,12 +136,20 @@ export const deployL1Contracts = async (
   );
   logger(`Deployed Outbox at ${outboxAddress}`);
 
+  const availabilityOracleAddress = await deployL1Contract(
+    walletClient,
+    publicClient,
+    contractsToDeploy.availabilityOracle.contractAbi,
+    contractsToDeploy.availabilityOracle.contractBytecode,
+  );
+  logger(`Deployed AvailabilityOracle at ${availabilityOracleAddress}`);
+
   const rollupAddress = await deployL1Contract(
     walletClient,
     publicClient,
     contractsToDeploy.rollup.contractAbi,
     contractsToDeploy.rollup.contractBytecode,
-    [getAddress(registryAddress.toString())],
+    [getAddress(registryAddress.toString()), getAddress(availabilityOracleAddress.toString())],
   );
   logger(`Deployed Rollup at ${rollupAddress}`);
 
@@ -165,24 +173,13 @@ export const deployL1Contracts = async (
   );
   logger(`Deployed contract deployment emitter at ${contractDeploymentEmitterAddress}`);
 
-  let decoderHelperAddress: EthAddress | undefined;
-  if (contractsToDeploy.decoderHelper) {
-    decoderHelperAddress = await deployL1Contract(
-      walletClient,
-      publicClient,
-      contractsToDeploy.decoderHelper.contractAbi,
-      contractsToDeploy.decoderHelper.contractBytecode,
-    );
-    logger(`Deployed DecoderHelper at ${decoderHelperAddress}`);
-  }
-
   const l1Contracts: L1ContractAddresses = {
+    availabilityOracleAddress,
     rollupAddress,
     registryAddress,
     inboxAddress,
     outboxAddress,
     contractDeploymentEmitterAddress,
-    decoderHelperAddress: decoderHelperAddress ?? EthAddress.ZERO,
   };
 
   return {
diff --git a/yarn-project/ethereum/src/l1_contract_addresses.ts b/yarn-project/ethereum/src/l1_contract_addresses.ts
index a5021698775e..272faccb370d 100644
--- a/yarn-project/ethereum/src/l1_contract_addresses.ts
+++ b/yarn-project/ethereum/src/l1_contract_addresses.ts
@@ -4,6 +4,10 @@ import { EthAddress } from '@aztec/foundation/eth-address';
  * Provides the directory of current L1 contract addresses
  */
 export interface L1ContractAddresses {
+  /**
+   * Availability Oracle Address.
+   */
+  availabilityOracleAddress: EthAddress;
   /**
    * Rollup Address.
    */
@@ -24,8 +28,4 @@ export interface L1ContractAddresses {
    * Data Emitter Address.
    */
   contractDeploymentEmitterAddress: EthAddress;
-  /**
-   * Decoder Helper Address.
-   */
-  decoderHelperAddress: EthAddress;
 }
diff --git a/yarn-project/foundation/src/collection/array.test.ts b/yarn-project/foundation/src/collection/array.test.ts
new file mode 100644
index 000000000000..d750c129ad86
--- /dev/null
+++ b/yarn-project/foundation/src/collection/array.test.ts
@@ -0,0 +1,13 @@
+import { times } from './array.js';
+
+describe('times', () => {
+  it('should return an array with the result from all executions', () => {
+    const result = times(5, i => i * 2);
+    expect(result).toEqual([0, 2, 4, 6, 8]);
+  });
+
+  it('should return an empty array when n is 0', () => {
+    const result = times(0, i => i * 2);
+    expect(result).toEqual([]);
+  });
+});
diff --git a/yarn-project/foundation/src/collection/array.ts b/yarn-project/foundation/src/collection/array.ts
index 1e4eb934d4c2..d60786489dc0 100644
--- a/yarn-project/foundation/src/collection/array.ts
+++ b/yarn-project/foundation/src/collection/array.ts
@@ -52,3 +52,13 @@ export function isArrayEmpty<T>(arr: T[], isEmpty: (item: T) => boolean): boolea
 export function arrayNonEmptyLength<T>(arr: T[], isEmpty: (item: T) => boolean): number {
   return arr.reduce((sum, item) => (isEmpty(item) ? sum : sum + 1), 0);
 }
+
+/**
+ * Executes the given function n times and returns the results in an array.
+ * @param n - How many times to repeat.
+ * @param fn - Mapper from index to value.
+ * @returns The array with the result from all executions.
+ */
+export function times<T>(n: number, fn: (i: number) => T): T[] {
+  return [...Array(n).keys()].map(i => fn(i));
+}
diff --git a/yarn-project/foundation/src/fields/fields.ts b/yarn-project/foundation/src/fields/fields.ts
index 90600643cfe5..bbf2f3b9a20c 100644
--- a/yarn-project/foundation/src/fields/fields.ts
+++ b/yarn-project/foundation/src/fields/fields.ts
@@ -192,6 +192,30 @@ export class Fr extends BaseField {
   static fromString(buf: string) {
     return fromString(buf, Fr);
   }
+
+  /** Arithmetic */
+
+  add(rhs: Fr) {
+    return new Fr((this.toBigInt() + rhs.toBigInt()) % Fr.MODULUS);
+  }
+
+  sub(rhs: Fr) {
+    const result = this.toBigInt() - rhs.toBigInt();
+    return new Fr(result < 0 ? result + Fr.MODULUS : result);
+  }
+
+  mul(rhs: Fr) {
+    return new Fr((this.toBigInt() * rhs.toBigInt()) % Fr.MODULUS);
+  }
+
+  div(rhs: Fr) {
+    if (rhs.isZero()) {
+      throw new Error('Division by zero');
+    }
+
+    const bInv = modInverse(rhs.toBigInt());
+    return this.mul(bInv);
+  }
 }
 
 /**
@@ -252,6 +276,33 @@ export class Fq extends BaseField {
   }
 }
 
+// Beware: Performance bottleneck below
+
+/**
+ * Find the modular inverse of a given element, for BN254 Fr.
+ */
+function modInverse(b: bigint) {
+  const [gcd, x, _] = extendedEuclidean(b, Fr.MODULUS);
+  if (gcd != 1n) {
+    throw Error('Inverse does not exist');
+  }
+  // Add modulus to ensure positive
+  return new Fr(x + Fr.MODULUS);
+}
+
+/**
+ * The extended Euclidean algorithm can be used to find the multiplicative inverse of a field element
+ * This is used to perform field division.
+ */
+function extendedEuclidean(a: bigint, modulus: bigint): [bigint, bigint, bigint] {
+  if (a == 0n) {
+    return [modulus, 0n, 1n];
+  } else {
+    const [gcd, x, y] = extendedEuclidean(modulus % a, a);
+    return [gcd, y - (modulus / a) * x, x];
+  }
+}
+
 /**
  * GrumpkinScalar is an Fq.
  * @remarks Called GrumpkinScalar because it is used to represent elements in Grumpkin's scalar field as defined in
diff --git a/yarn-project/key-store/src/test_key_store.ts b/yarn-project/key-store/src/test_key_store.ts
index f050a7129042..1a5a96c2d1b8 100644
--- a/yarn-project/key-store/src/test_key_store.ts
+++ b/yarn-project/key-store/src/test_key_store.ts
@@ -50,7 +50,7 @@ export class TestKeyStore implements KeyStore {
     const privKey = this.#keys.get(pubKey.toString());
     if (!privKey) {
       throw new Error(
-        'Unknown account.\nSee docs for context: https://docs.aztec.network/dev_docs/contracts/common_errors#unknown-contract-error',
+        'Unknown account.\nSee docs for context: https://docs.aztec.network/dev_docs/debugging/aztecnr-errors#could-not-process-note-because-of-error-unknown-account-skipping-note',
       );
     }
     return ConstantKeyPair.fromPrivateKey(this.curve, GrumpkinScalar.fromBuffer(privKey));
diff --git a/yarn-project/kv-store/src/index.ts b/yarn-project/kv-store/src/index.ts
index 2a71333f9e6b..b35a4fb3d535 100644
--- a/yarn-project/kv-store/src/index.ts
+++ b/yarn-project/kv-store/src/index.ts
@@ -1,5 +1,7 @@
 export * from './interfaces/array.js';
 export * from './interfaces/map.js';
+export * from './interfaces/counter.js';
 export * from './interfaces/singleton.js';
 export * from './interfaces/store.js';
 export * from './lmdb/store.js';
+export { Range } from './interfaces/common.js';
diff --git a/yarn-project/kv-store/src/interfaces/common.ts b/yarn-project/kv-store/src/interfaces/common.ts
new file mode 100644
index 000000000000..c4e0effa8c83
--- /dev/null
+++ b/yarn-project/kv-store/src/interfaces/common.ts
@@ -0,0 +1,18 @@
+/**
+ * The key type for use with the kv-store
+ */
+export type Key = string | number | Array<string | number>;
+
+/**
+ * A range of keys to iterate over.
+ */
+export type Range<K extends Key = Key> = {
+  /** The key of the first item to include */
+  start?: K;
+  /** The key of the last item to include */
+  end?: K;
+  /** Whether to iterate in reverse */
+  reverse?: boolean;
+  /** The maximum number of items to iterate over */
+  limit?: number;
+};
diff --git a/yarn-project/kv-store/src/interfaces/counter.ts b/yarn-project/kv-store/src/interfaces/counter.ts
new file mode 100644
index 000000000000..0f68626e6911
--- /dev/null
+++ b/yarn-project/kv-store/src/interfaces/counter.ts
@@ -0,0 +1,43 @@
+import { Key, Range } from './common.js';
+
+/**
+ * A map that counts how many times it sees a key. Once 0 is reached,  that key is removed from the map.
+ * Iterating over the map will only return keys that have a count over 0.
+ *
+ * Keys are stored in sorted order
+ */
+export interface AztecCounter<K extends Key = Key> {
+  /**
+   * Resets the count of the given key to the given value.
+   * @param key - The key to reset
+   * @param value - The value to reset the key to
+   */
+  set(key: K, value: number): Promise<boolean>;
+
+  /**
+   * Updates the count of the given key by the given delta. This can be used to increment or decrement the count.
+   * Once a key's count reaches 0, it is removed from the map.
+   *
+   * @param key - The key to update
+   * @param delta - The amount to modify the key by
+   */
+  update(key: K, delta: number): Promise<boolean>;
+
+  /**
+   * Gets the current count.
+   * @param key - The key to get the count of
+   */
+  get(key: K): number;
+
+  /**
+   * Returns keys in the map in sorted order. Only returns keys that have been seen at least once.
+   * @param range - The range of keys to iterate over
+   */
+  keys(range: Range<K>): IterableIterator<K>;
+
+  /**
+   * Returns keys and their counts in the map sorted by the key. Only returns keys that have been seen at least once.
+   * @param range - The range of keys to iterate over
+   */
+  entries(range: Range<K>): IterableIterator<[K, number]>;
+}
diff --git a/yarn-project/kv-store/src/interfaces/map.ts b/yarn-project/kv-store/src/interfaces/map.ts
index 8de773837b71..0916146a4ab9 100644
--- a/yarn-project/kv-store/src/interfaces/map.ts
+++ b/yarn-project/kv-store/src/interfaces/map.ts
@@ -1,7 +1,9 @@
+import { Key, Range } from './common.js';
+
 /**
  * A map backed by a persistent store.
  */
-export interface AztecMap<K extends string | number, V> {
+export interface AztecMap<K extends Key, V> {
   /**
    * Gets the value at the given key.
    * @param key - The key to get the value from
@@ -22,6 +24,13 @@ export interface AztecMap<K extends string | number, V> {
    */
   set(key: K, val: V): Promise<boolean>;
 
+  /**
+   * Atomically swap the value at the given key
+   * @param key - The key to swap the value at
+   * @param fn - The function to swap the value with
+   */
+  swap(key: K, fn: (val: V | undefined) => V): Promise<boolean>;
+
   /**
    * Sets the value at the given key if it does not already exist.
    * @param key - The key to set the value at
@@ -36,25 +45,28 @@ export interface AztecMap<K extends string | number, V> {
   delete(key: K): Promise<boolean>;
 
   /**
-   * Iterates over the map's key-value entries
+   * Iterates over the map's key-value entries in the key's natural order
+   * @param range - The range of keys to iterate over
    */
-  entries(): IterableIterator<[K, V]>;
+  entries(range?: Range<K>): IterableIterator<[K, V]>;
 
   /**
-   * Iterates over the map's values
+   * Iterates over the map's values in the key's natural order
+   * @param range - The range of keys to iterate over
    */
-  values(): IterableIterator<V>;
+  values(range?: Range<K>): IterableIterator<V>;
 
   /**
-   * Iterates over the map's keys
+   * Iterates over the map's keys in the key's natural order
+   * @param range - The range of keys to iterate over
    */
-  keys(): IterableIterator<K>;
+  keys(range?: Range<K>): IterableIterator<K>;
 }
 
 /**
  * A map backed by a persistent store that can have multiple values for a single key.
  */
-export interface AztecMultiMap<K extends string | number, V> extends AztecMap<K, V> {
+export interface AztecMultiMap<K extends Key, V> extends AztecMap<K, V> {
   /**
    * Gets all the values at the given key.
    * @param key - The key to get the values from
diff --git a/yarn-project/kv-store/src/interfaces/store.ts b/yarn-project/kv-store/src/interfaces/store.ts
index d7ccfa3cd29a..73a2901387cd 100644
--- a/yarn-project/kv-store/src/interfaces/store.ts
+++ b/yarn-project/kv-store/src/interfaces/store.ts
@@ -1,4 +1,6 @@
 import { AztecArray } from './array.js';
+import { Key } from './common.js';
+import { AztecCounter } from './counter.js';
 import { AztecMap, AztecMultiMap } from './map.js';
 import { AztecSingleton } from './singleton.js';
 
@@ -32,6 +34,12 @@ export interface AztecKVStore {
    */
   createSingleton<T>(name: string): AztecSingleton<T>;
 
+  /**
+   * Creates a new count map.
+   * @param name - name of the counter
+   */
+  createCounter<K extends Key>(name: string): AztecCounter<K>;
+
   /**
    * Starts a transaction. All calls to read/write data while in a transaction are queued and executed atomically.
    * @param callback - The callback to execute in a transaction
diff --git a/yarn-project/kv-store/src/lmdb/counter.test.ts b/yarn-project/kv-store/src/lmdb/counter.test.ts
new file mode 100644
index 000000000000..fdd1204b15c4
--- /dev/null
+++ b/yarn-project/kv-store/src/lmdb/counter.test.ts
@@ -0,0 +1,122 @@
+import { randomBytes } from 'crypto';
+import { Database, open } from 'lmdb';
+
+import { LmdbAztecCounter } from './counter.js';
+
+describe('LmdbAztecCounter', () => {
+  let db: Database;
+
+  beforeEach(() => {
+    db = open({} as any);
+  });
+
+  describe.each([
+    ['floating point number', () => Math.random()],
+    ['integers', () => (Math.random() * 1000) | 0],
+    ['strings', () => randomBytes(8).toString('hex')],
+    ['strings', () => [Math.random(), randomBytes(8).toString('hex')]],
+  ])('counts occurrences of %s values', (_, genKey) => {
+    let counter: LmdbAztecCounter<ReturnType<typeof genKey>>;
+    beforeEach(() => {
+      counter = new LmdbAztecCounter(db, 'test');
+    });
+
+    it('returns 0 for unknown keys', () => {
+      expect(counter.get(genKey())).toEqual(0);
+    });
+
+    it('increments values', async () => {
+      const key = genKey();
+      await counter.update(key, 1);
+
+      expect(counter.get(key)).toEqual(1);
+    });
+
+    it('decrements values', async () => {
+      const key = genKey();
+      await counter.update(key, 1);
+      await counter.update(key, -1);
+
+      expect(counter.get(key)).toEqual(0);
+    });
+
+    it('throws when decrementing below zero', async () => {
+      const key = genKey();
+      await counter.update(key, 1);
+
+      await expect(counter.update(key, -2)).rejects.toThrow();
+    });
+
+    it('increments values by a delta', async () => {
+      const key = genKey();
+      await counter.update(key, 1);
+      await counter.update(key, 2);
+
+      expect(counter.get(key)).toEqual(3);
+    });
+
+    it('resets the counter', async () => {
+      const key = genKey();
+      await counter.update(key, 1);
+      await counter.update(key, 2);
+      await counter.set(key, 0);
+
+      expect(counter.get(key)).toEqual(0);
+    });
+
+    it('iterates over entries', async () => {
+      const key = genKey();
+      await counter.update(key, 1);
+      await counter.update(key, 2);
+
+      expect([...counter.entries()]).toEqual([[key, 3]]);
+    });
+  });
+
+  it.each([
+    [
+      [
+        ['c', 2342],
+        ['a', 8],
+        ['b', 1],
+      ],
+      [
+        ['a', 8],
+        ['b', 1],
+        ['c', 2342],
+      ],
+    ],
+    [
+      [
+        [10, 2],
+        [18, 1],
+        [1, 2],
+      ],
+      [
+        [1, 2],
+        [10, 2],
+        [18, 1],
+      ],
+    ],
+    [
+      [
+        [[10, 'a'], 1],
+        [[10, 'c'], 2],
+        [[11, 'b'], 1],
+        [[9, 'f'], 1],
+        [[10, 'b'], 1],
+      ],
+      [
+        [[9, 'f'], 1],
+        [[10, 'a'], 1],
+        [[10, 'b'], 1],
+        [[10, 'c'], 2],
+        [[11, 'b'], 1],
+      ],
+    ],
+  ])('iterates in key order', async (insertOrder, expectedOrder) => {
+    const counter = new LmdbAztecCounter(db, 'test');
+    await Promise.all(insertOrder.map(([key, value]) => counter.update(key, value as number)));
+    expect([...counter.entries()]).toEqual(expectedOrder);
+  });
+});
diff --git a/yarn-project/kv-store/src/lmdb/counter.ts b/yarn-project/kv-store/src/lmdb/counter.ts
new file mode 100644
index 000000000000..74886e89dbf3
--- /dev/null
+++ b/yarn-project/kv-store/src/lmdb/counter.ts
@@ -0,0 +1,57 @@
+import { Key as BaseKey, Database } from 'lmdb';
+
+import { Key, Range } from '../interfaces/common.js';
+import { AztecCounter } from '../interfaces/counter.js';
+import { LmdbAztecMap } from './map.js';
+
+/**
+ * A counter implementation backed by LMDB
+ */
+export class LmdbAztecCounter<K extends Key> implements AztecCounter<K> {
+  #db: Database;
+  #name: string;
+  #map: LmdbAztecMap<K, number>;
+
+  constructor(db: Database<unknown, BaseKey>, name: string) {
+    this.#db = db;
+    this.#name = name;
+    this.#map = new LmdbAztecMap(db, name);
+  }
+
+  set(key: K, value: number): Promise<boolean> {
+    return this.#map.set(key, value);
+  }
+
+  update(key: K, delta = 1): Promise<boolean> {
+    return this.#db.childTransaction(() => {
+      const current = this.#map.get(key) ?? 0;
+      const next = current + delta;
+
+      if (next < 0) {
+        throw new Error(`Cannot update ${key} in counter ${this.#name} below zero`);
+      }
+
+      if (next === 0) {
+        void this.#map.delete(key);
+      } else {
+        // store the key inside the entry because LMDB might return an internal representation
+        // of the key when iterating over the database
+        void this.#map.set(key, next);
+      }
+
+      return true;
+    });
+  }
+
+  get(key: K): number {
+    return this.#map.get(key) ?? 0;
+  }
+
+  entries(range: Range<K> = {}): IterableIterator<[K, number]> {
+    return this.#map.entries(range);
+  }
+
+  keys(range: Range<K> = {}): IterableIterator<K> {
+    return this.#map.keys(range);
+  }
+}
diff --git a/yarn-project/kv-store/src/lmdb/map.test.ts b/yarn-project/kv-store/src/lmdb/map.test.ts
index 5319e0a26c3f..007b4c4eb8fa 100644
--- a/yarn-project/kv-store/src/lmdb/map.test.ts
+++ b/yarn-project/kv-store/src/lmdb/map.test.ts
@@ -41,26 +41,24 @@ describe('LmdbAztecMap', () => {
     await map.set('foo', 'bar');
     await map.set('baz', 'qux');
 
-    expect([...map.entries()]).toEqual(
-      expect.arrayContaining([
-        ['foo', 'bar'],
-        ['baz', 'qux'],
-      ]),
-    );
+    expect([...map.entries()]).toEqual([
+      ['baz', 'qux'],
+      ['foo', 'bar'],
+    ]);
   });
 
   it('should be able to iterate over values', async () => {
     await map.set('foo', 'bar');
-    await map.set('baz', 'qux');
+    await map.set('baz', 'quux');
 
-    expect([...map.values()]).toEqual(expect.arrayContaining(['bar', 'qux']));
+    expect([...map.values()]).toEqual(['quux', 'bar']);
   });
 
   it('should be able to iterate over keys', async () => {
     await map.set('foo', 'bar');
     await map.set('baz', 'qux');
 
-    expect([...map.keys()]).toEqual(expect.arrayContaining(['foo', 'baz']));
+    expect([...map.keys()]).toEqual(['baz', 'foo']);
   });
 
   it('should be able to get multiple values for a single key', async () => {
@@ -69,4 +67,33 @@ describe('LmdbAztecMap', () => {
 
     expect([...map.getValues('foo')]).toEqual(['bar', 'baz']);
   });
+
+  it('supports tuple keys', async () => {
+    const map = new LmdbAztecMap<[number, string], string>(db, 'test');
+
+    await map.set([5, 'bar'], 'val');
+    await map.set([0, 'foo'], 'val');
+
+    expect([...map.keys()]).toEqual([
+      [0, 'foo'],
+      [5, 'bar'],
+    ]);
+
+    expect(map.get([5, 'bar'])).toEqual('val');
+  });
+
+  it('supports range queries', async () => {
+    await map.set('a', 'a');
+    await map.set('b', 'b');
+    await map.set('c', 'c');
+    await map.set('d', 'd');
+
+    expect([...map.keys({ start: 'b', end: 'c' })]).toEqual(['b']);
+    expect([...map.keys({ start: 'b' })]).toEqual(['b', 'c', 'd']);
+    expect([...map.keys({ end: 'c' })]).toEqual(['a', 'b']);
+    expect([...map.keys({ start: 'b', end: 'c', reverse: true })]).toEqual(['c']);
+    expect([...map.keys({ start: 'b', limit: 1 })]).toEqual(['b']);
+    expect([...map.keys({ start: 'b', reverse: true })]).toEqual(['d', 'c']);
+    expect([...map.keys({ end: 'b', reverse: true })]).toEqual(['b', 'a']);
+  });
 });
diff --git a/yarn-project/kv-store/src/lmdb/map.ts b/yarn-project/kv-store/src/lmdb/map.ts
index b883b8097383..6e5fa67ef1e1 100644
--- a/yarn-project/kv-store/src/lmdb/map.ts
+++ b/yarn-project/kv-store/src/lmdb/map.ts
@@ -1,20 +1,30 @@
-import { Database, Key } from 'lmdb';
+import { Database, RangeOptions } from 'lmdb';
 
+import { Key, Range } from '../interfaces/common.js';
 import { AztecMultiMap } from '../interfaces/map.js';
 
 /** The slot where a key-value entry would be stored */
-type MapKeyValueSlot<K extends string | number> = ['map', string, 'slot', K];
+type MapValueSlot<K extends Key | Buffer> = ['map', string, 'slot', K];
 
 /**
  * A map backed by LMDB.
  */
-export class LmdbAztecMap<K extends string | number, V> implements AztecMultiMap<K, V> {
-  protected db: Database<V, MapKeyValueSlot<K>>;
+export class LmdbAztecMap<K extends Key, V> implements AztecMultiMap<K, V> {
+  protected db: Database<[K, V], MapValueSlot<K>>;
   protected name: string;
 
-  constructor(rootDb: Database<unknown, Key>, mapName: string) {
+  #startSentinel: MapValueSlot<Buffer>;
+  #endSentinel: MapValueSlot<Buffer>;
+
+  constructor(rootDb: Database, mapName: string) {
     this.name = mapName;
-    this.db = rootDb as Database<V, MapKeyValueSlot<K>>;
+    this.db = rootDb as Database<[K, V], MapValueSlot<K>>;
+
+    // sentinels are used to define the start and end of the map
+    // with LMDB's key encoding, no _primitive value_ can be "less than" an empty buffer or greater than Byte 255
+    // these will be used later to answer range queries
+    this.#startSentinel = ['map', this.name, 'slot', Buffer.from([])];
+    this.#endSentinel = ['map', this.name, 'slot', Buffer.from([255])];
   }
 
   close(): Promise<void> {
@@ -22,13 +32,13 @@ export class LmdbAztecMap<K extends string | number, V> implements AztecMultiMap
   }
 
   get(key: K): V | undefined {
-    return this.db.get(this.#slot(key)) as V | undefined;
+    return this.db.get(this.#slot(key))?.[1];
   }
 
   *getValues(key: K): IterableIterator<V> {
     const values = this.db.getValues(this.#slot(key));
     for (const value of values) {
-      yield value;
+      yield value?.[1];
     }
   }
 
@@ -37,13 +47,23 @@ export class LmdbAztecMap<K extends string | number, V> implements AztecMultiMap
   }
 
   set(key: K, val: V): Promise<boolean> {
-    return this.db.put(this.#slot(key), val);
+    return this.db.put(this.#slot(key), [key, val]);
+  }
+
+  swap(key: K, fn: (val: V | undefined) => V): Promise<boolean> {
+    return this.db.childTransaction(() => {
+      const slot = this.#slot(key);
+      const entry = this.db.get(slot);
+      void this.db.put(slot, [key, fn(entry?.[1])]);
+
+      return true;
+    });
   }
 
   setIfNotExists(key: K, val: V): Promise<boolean> {
     const slot = this.#slot(key);
     return this.db.ifNoExists(slot, () => {
-      void this.db.put(slot, val);
+      void this.db.put(slot, [key, val]);
     });
   }
 
@@ -52,37 +72,58 @@ export class LmdbAztecMap<K extends string | number, V> implements AztecMultiMap
   }
 
   async deleteValue(key: K, val: V): Promise<void> {
-    await this.db.remove(this.#slot(key), val);
+    await this.db.remove(this.#slot(key), [key, val]);
   }
 
-  *entries(): IterableIterator<[K, V]> {
-    const iterator = this.db.getRange({
-      start: ['map', this.name, 'slot'],
-    });
-
-    for (const { key, value } of iterator) {
-      if (key[0] !== 'map' || key[1] !== this.name) {
-        break;
-      }
-
-      const originalKey = key[3];
-      yield [originalKey, value];
+  *entries(range: Range<K> = {}): IterableIterator<[K, V]> {
+    const { reverse = false, limit } = range;
+    // LMDB has a quirk where it expects start > end when reverse=true
+    // in that case, we need to swap the start and end sentinels
+    const start = reverse
+      ? range.end
+        ? this.#slot(range.end)
+        : this.#endSentinel
+      : range.start
+      ? this.#slot(range.start)
+      : this.#startSentinel;
+
+    const end = reverse
+      ? range.start
+        ? this.#slot(range.start)
+        : this.#startSentinel
+      : range.end
+      ? this.#slot(range.end)
+      : this.#endSentinel;
+
+    const lmdbRange: RangeOptions = {
+      start,
+      end,
+      reverse,
+      limit,
+    };
+
+    const iterator = this.db.getRange(lmdbRange);
+
+    for (const {
+      value: [key, value],
+    } of iterator) {
+      yield [key, value];
     }
   }
 
-  *values(): IterableIterator<V> {
-    for (const [_, value] of this.entries()) {
+  *values(range: Range<K> = {}): IterableIterator<V> {
+    for (const [_, value] of this.entries(range)) {
       yield value;
     }
   }
 
-  *keys(): IterableIterator<K> {
-    for (const [key, _] of this.entries()) {
+  *keys(range: Range<K> = {}): IterableIterator<K> {
+    for (const [key, _] of this.entries(range)) {
       yield key;
     }
   }
 
-  #slot(key: K): MapKeyValueSlot<K> {
+  #slot(key: K): MapValueSlot<K> {
     return ['map', this.name, 'slot', key];
   }
 }
diff --git a/yarn-project/kv-store/src/lmdb/store.ts b/yarn-project/kv-store/src/lmdb/store.ts
index 9ede111a8755..8c3cebd07372 100644
--- a/yarn-project/kv-store/src/lmdb/store.ts
+++ b/yarn-project/kv-store/src/lmdb/store.ts
@@ -4,10 +4,12 @@ import { Logger, createDebugLogger } from '@aztec/foundation/log';
 import { Database, Key, RootDatabase, open } from 'lmdb';
 
 import { AztecArray } from '../interfaces/array.js';
+import { AztecCounter } from '../interfaces/counter.js';
 import { AztecMap, AztecMultiMap } from '../interfaces/map.js';
 import { AztecSingleton } from '../interfaces/singleton.js';
 import { AztecKVStore } from '../interfaces/store.js';
 import { LmdbAztecArray } from './array.js';
+import { LmdbAztecCounter } from './counter.js';
 import { LmdbAztecMap } from './map.js';
 import { LmdbAztecSingleton } from './singleton.js';
 
@@ -88,6 +90,10 @@ export class AztecLmdbStore implements AztecKVStore {
     return new LmdbAztecMap(this.#multiMapData, name);
   }
 
+  createCounter<K extends string | number | Array<string | number>>(name: string): AztecCounter<K> {
+    return new LmdbAztecCounter(this.#data, name);
+  }
+
   /**
    * Creates a new AztecArray in the store.
    * @param name - Name of the array
diff --git a/yarn-project/l1-artifacts/scripts/generate-artifacts.sh b/yarn-project/l1-artifacts/scripts/generate-artifacts.sh
index 37a07c35e17f..83112e1fa89f 100755
--- a/yarn-project/l1-artifacts/scripts/generate-artifacts.sh
+++ b/yarn-project/l1-artifacts/scripts/generate-artifacts.sh
@@ -10,7 +10,7 @@ target_dir=./generated
 #   - a .{CONTRACT_NAME}Abi.ts containing the contract ABI.
 
 CONTRACTS=(
-  "l1-contracts:DecoderHelper"
+  "l1-contracts:AvailabilityOracle"
   "l1-contracts:Registry"
   "l1-contracts:Inbox"
   "l1-contracts:Outbox"
diff --git a/yarn-project/noir-compiler/package.json b/yarn-project/noir-compiler/package.json
index 71c96a4db416..a184351fea07 100644
--- a/yarn-project/noir-compiler/package.json
+++ b/yarn-project/noir-compiler/package.json
@@ -4,8 +4,7 @@
   "type": "module",
   "exports": {
     ".": "./dest/index.js",
-    "./cli": "./dest/cli/index.js",
-    "./versions": "./dest/versions.js"
+    "./cli": "./dest/cli/index.js"
   },
   "typedocOptions": {
     "entryPoints": [
@@ -49,13 +48,11 @@
     "@aztec/foundation": "workspace:^",
     "@aztec/types": "workspace:^",
     "@iarna/toml": "^2.2.5",
-    "@noir-lang/noir_wasm": "portal:../../noir/packages/noir_wasm",
     "base64-js": "^1.5.1",
     "commander": "^9.0.0",
     "fs-extra": "^11.1.1",
     "lodash.camelcase": "^4.3.0",
     "lodash.capitalize": "^4.2.1",
-    "lodash.times": "^4.3.2",
     "memfs": "^4.6.0",
     "pako": "^2.1.0",
     "semver": "^7.5.4",
@@ -68,7 +65,6 @@
     "@types/jest": "^29.5.0",
     "@types/lodash.camelcase": "^4.3.7",
     "@types/lodash.capitalize": "^4.2.7",
-    "@types/lodash.times": "^4.3.7",
     "@types/node": "^18.7.23",
     "@types/pako": "^2.0.0",
     "@types/semver": "^7.5.4",
diff --git a/yarn-project/noir-compiler/src/contract-interface-gen/noir.ts b/yarn-project/noir-compiler/src/contract-interface-gen/noir.ts
index a3d1a23c5e76..c33c23590c08 100644
--- a/yarn-project/noir-compiler/src/contract-interface-gen/noir.ts
+++ b/yarn-project/noir-compiler/src/contract-interface-gen/noir.ts
@@ -7,10 +7,10 @@ import {
   FunctionType,
   StructType,
 } from '@aztec/foundation/abi';
+import { times } from '@aztec/foundation/collection';
 
 import camelCase from 'lodash.camelcase';
 import capitalize from 'lodash.capitalize';
-import times from 'lodash.times';
 
 /**
  * Returns whether this function type corresponds to a private call.
diff --git a/yarn-project/noir-compiler/src/index.ts b/yarn-project/noir-compiler/src/index.ts
index 88416ef42821..a28e4f093031 100644
--- a/yarn-project/noir-compiler/src/index.ts
+++ b/yarn-project/noir-compiler/src/index.ts
@@ -1,4 +1,2 @@
-export * from './versions.js';
-
 export { generateTypescriptContractInterface } from './contract-interface-gen/typescript.js';
 export { generateNoirContractInterface } from './contract-interface-gen/noir.js';
diff --git a/yarn-project/noir-compiler/src/noir-version.json b/yarn-project/noir-compiler/src/noir-version.json
deleted file mode 100644
index e81ecb08315e..000000000000
--- a/yarn-project/noir-compiler/src/noir-version.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "tag": "v0.18.0-aztec.5",
-  "commit": "6ca33a223ccce6a295414a3ce078180e8a22b68c"
-}
diff --git a/yarn-project/noir-compiler/src/versions.ts b/yarn-project/noir-compiler/src/versions.ts
deleted file mode 100644
index 9cf6fd768b35..000000000000
--- a/yarn-project/noir-compiler/src/versions.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { readFile } from 'node:fs/promises';
-
-import NoirVersion from './noir-version.json' assert { type: 'json' };
-
-// read package.json at runtime instead of compile time so that we keep rootDir as-is in tsconfig
-const pkg = JSON.parse(await readFile(new URL('../package.json', import.meta.url), 'utf-8'));
-
-export const NoirWasmVersion = pkg.dependencies['@noir-lang/noir_wasm'];
-export const NoirTag = NoirVersion.tag;
-export const NoirCommit = NoirVersion.commit;
-
-export { NoirVersion };
diff --git a/yarn-project/p2p/package.json b/yarn-project/p2p/package.json
index 6203bc731238..1e4aab4e5efb 100644
--- a/yarn-project/p2p/package.json
+++ b/yarn-project/p2p/package.json
@@ -49,14 +49,12 @@
     "@libp2p/tcp": "^8.0.4",
     "it-pipe": "^3.0.1",
     "libp2p": "^0.46.6",
-    "lodash.times": "^4.3.2",
     "sha3": "^2.1.4",
     "tslib": "^2.4.0"
   },
   "devDependencies": {
     "@jest/globals": "^29.5.0",
     "@types/jest": "^29.5.0",
-    "@types/lodash.times": "^4.3.7",
     "@types/node": "^18.14.6",
     "jest": "^29.5.0",
     "jest-mock-extended": "^3.0.4",
diff --git a/yarn-project/pxe/package.json b/yarn-project/pxe/package.json
index 223b5f7abd47..82bf35b49e67 100644
--- a/yarn-project/pxe/package.json
+++ b/yarn-project/pxe/package.json
@@ -46,7 +46,6 @@
     "koa": "^2.14.2",
     "koa-router": "^12.0.0",
     "lodash.omit": "^4.5.0",
-    "lodash.times": "^4.3.2",
     "sha3": "^2.1.4",
     "tslib": "^2.4.0",
     "viem": "^1.2.5"
@@ -55,7 +54,6 @@
     "@jest/globals": "^29.5.0",
     "@types/jest": "^29.5.0",
     "@types/lodash.omit": "^4.5.7",
-    "@types/lodash.times": "^4.3.7",
     "@types/node": "^18.7.23",
     "jest": "^29.5.0",
     "jest-mock-extended": "^3.0.3",
diff --git a/yarn-project/pxe/src/pxe_service/pxe_service.ts b/yarn-project/pxe/src/pxe_service/pxe_service.ts
index 5ae775e29b90..0d7329711583 100644
--- a/yarn-project/pxe/src/pxe_service/pxe_service.ts
+++ b/yarn-project/pxe/src/pxe_service/pxe_service.ts
@@ -52,7 +52,6 @@ import { Fr } from '@aztec/foundation/fields';
 import { SerialQueue } from '@aztec/foundation/fifo';
 import { DebugLogger, createDebugLogger } from '@aztec/foundation/log';
 import { Timer } from '@aztec/foundation/timer';
-import { NoirWasmVersion } from '@aztec/noir-compiler/versions';
 import { NodeInfo } from '@aztec/types/interfaces';
 
 import { PXEServiceConfig, getPackageInfo } from '../config/index.js';
@@ -463,7 +462,7 @@ export class PXEService implements PXE {
     const contract = await this.db.getContract(to);
     if (!contract) {
       throw new Error(
-        `Unknown contract ${to}: add it to PXE Service by calling server.addContracts(...).\nSee docs for context: https://docs.aztec.network/dev_docs/contracts/common_errors#unknown-contract-error`,
+        `Unknown contract ${to}: add it to PXE Service by calling server.addContracts(...).\nSee docs for context: https://docs.aztec.network/dev_docs/debugging/aztecnr-errors#unknown-contract-0x0-add-it-to-pxe-by-calling-serveraddcontracts`,
       );
     }
 
@@ -488,7 +487,6 @@ export class PXEService implements PXE {
 
     const nodeInfo: NodeInfo = {
       nodeVersion: this.nodeVersion,
-      compatibleNargoVersion: NoirWasmVersion,
       chainId,
       protocolVersion: version,
       l1ContractAddresses: contractAddresses,
diff --git a/yarn-project/pxe/src/pxe_service/test/pxe_service.test.ts b/yarn-project/pxe/src/pxe_service/test/pxe_service.test.ts
index aa5801a715b2..617fdd3de96a 100644
--- a/yarn-project/pxe/src/pxe_service/test/pxe_service.test.ts
+++ b/yarn-project/pxe/src/pxe_service/test/pxe_service.test.ts
@@ -25,12 +25,12 @@ async function createPXEService(): Promise<PXE> {
   node.getVersion.mockResolvedValue(1);
   node.getChainId.mockResolvedValue(1);
   const mockedContracts: L1ContractAddresses = {
+    availabilityOracleAddress: EthAddress.random(),
     rollupAddress: EthAddress.random(),
     registryAddress: EthAddress.random(),
     inboxAddress: EthAddress.random(),
     outboxAddress: EthAddress.random(),
     contractDeploymentEmitterAddress: EthAddress.random(),
-    decoderHelperAddress: EthAddress.random(),
   };
   node.getL1ContractAddresses.mockResolvedValue(mockedContracts);
 
diff --git a/yarn-project/pxe/src/simulator_oracle/index.ts b/yarn-project/pxe/src/simulator_oracle/index.ts
index d33010931b1a..1caa8fb88452 100644
--- a/yarn-project/pxe/src/simulator_oracle/index.ts
+++ b/yarn-project/pxe/src/simulator_oracle/index.ts
@@ -43,7 +43,7 @@ export class SimulatorOracle implements DBOracle {
     const completeAddress = await this.db.getCompleteAddress(address);
     if (!completeAddress) {
       throw new Error(
-        `No public key registered for address ${address.toString()}. Register it by calling pxe.registerRecipient(...) or pxe.registerAccount(...).\nSee docs for context: https://docs.aztec.network/dev_docs/contracts/common_errors#no-public-key-registered-error`,
+        `No public key registered for address ${address.toString()}. Register it by calling pxe.registerRecipient(...) or pxe.registerAccount(...).\nSee docs for context: https://docs.aztec.network/dev_docs/debugging/aztecnr-errors#simulation-error-No-public-key-registered-for-address-0x0-Register-it-by-calling-pxeregisterRecipient-or-pxeregisterAccount`,
       );
     }
     return completeAddress;
diff --git a/yarn-project/sequencer-client/package.json b/yarn-project/sequencer-client/package.json
index 879838cf0527..8c11e1f877fe 100644
--- a/yarn-project/sequencer-client/package.json
+++ b/yarn-project/sequencer-client/package.json
@@ -45,7 +45,6 @@
     "@aztec/world-state": "workspace:^",
     "lodash.chunk": "^4.2.0",
     "lodash.pick": "^4.4.0",
-    "lodash.times": "^4.3.2",
     "tslib": "^2.4.0",
     "viem": "^1.2.5"
   },
@@ -55,7 +54,6 @@
     "@types/levelup": "^5.1.2",
     "@types/lodash.chunk": "^4.2.7",
     "@types/lodash.pick": "^4.4.7",
-    "@types/lodash.times": "^4.3.7",
     "@types/memdown": "^3.0.0",
     "@types/node": "^18.7.23",
     "concurrently": "^7.6.0",
diff --git a/yarn-project/sequencer-client/src/block_builder/solo_block_builder.test.ts b/yarn-project/sequencer-client/src/block_builder/solo_block_builder.test.ts
index a0e03bb5afc8..3ab5e249e60b 100644
--- a/yarn-project/sequencer-client/src/block_builder/solo_block_builder.test.ts
+++ b/yarn-project/sequencer-client/src/block_builder/solo_block_builder.test.ts
@@ -47,12 +47,12 @@ import {
 } from '@aztec/circuits.js/factories';
 import { makeTuple, range } from '@aztec/foundation/array';
 import { toBufferBE } from '@aztec/foundation/bigint-buffer';
+import { times } from '@aztec/foundation/collection';
 import { to2Fields } from '@aztec/foundation/serialize';
 import { MerkleTreeOperations, MerkleTrees } from '@aztec/world-state';
 
 import { MockProxy, mock } from 'jest-mock-extended';
 import { default as levelup } from 'levelup';
-import times from 'lodash.times';
 import { type MemDown, default as memdown } from 'memdown';
 
 import { VerificationKeys, getVerificationKeys } from '../mocks/verification_keys.js';
diff --git a/yarn-project/sequencer-client/src/config.ts b/yarn-project/sequencer-client/src/config.ts
index 370e9f137021..ee407d8410a9 100644
--- a/yarn-project/sequencer-client/src/config.ts
+++ b/yarn-project/sequencer-client/src/config.ts
@@ -39,6 +39,7 @@ export function getConfigEnvVars(): SequencerClientConfig {
     SEQ_TX_POLLING_INTERVAL_MS,
     SEQ_MAX_TX_PER_BLOCK,
     SEQ_MIN_TX_PER_BLOCK,
+    AVAILABILITY_ORACLE_CONTRACT_ADDRESS,
     ROLLUP_CONTRACT_ADDRESS,
     REGISTRY_CONTRACT_ADDRESS,
     INBOX_CONTRACT_ADDRESS,
@@ -51,6 +52,9 @@ export function getConfigEnvVars(): SequencerClientConfig {
     : NULL_KEY;
   // Populate the relevant addresses for use by the sequencer
   const addresses: L1ContractAddresses = {
+    availabilityOracleAddress: AVAILABILITY_ORACLE_CONTRACT_ADDRESS
+      ? EthAddress.fromString(AVAILABILITY_ORACLE_CONTRACT_ADDRESS)
+      : EthAddress.ZERO,
     rollupAddress: ROLLUP_CONTRACT_ADDRESS ? EthAddress.fromString(ROLLUP_CONTRACT_ADDRESS) : EthAddress.ZERO,
     registryAddress: REGISTRY_CONTRACT_ADDRESS ? EthAddress.fromString(REGISTRY_CONTRACT_ADDRESS) : EthAddress.ZERO,
     inboxAddress: INBOX_CONTRACT_ADDRESS ? EthAddress.fromString(INBOX_CONTRACT_ADDRESS) : EthAddress.ZERO,
@@ -58,7 +62,6 @@ export function getConfigEnvVars(): SequencerClientConfig {
     contractDeploymentEmitterAddress: CONTRACT_DEPLOYMENT_EMITTER_ADDRESS
       ? EthAddress.fromString(CONTRACT_DEPLOYMENT_EMITTER_ADDRESS)
       : EthAddress.ZERO,
-    decoderHelperAddress: EthAddress.ZERO,
   };
 
   return {
diff --git a/yarn-project/sequencer-client/src/publisher/l1-publisher.test.ts b/yarn-project/sequencer-client/src/publisher/l1-publisher.test.ts
index 123203a59dde..b3de75cebbba 100644
--- a/yarn-project/sequencer-client/src/publisher/l1-publisher.test.ts
+++ b/yarn-project/sequencer-client/src/publisher/l1-publisher.test.ts
@@ -7,24 +7,47 @@ import { L1Publisher, L1PublisherTxSender, MinimalTransactionReceipt } from './l
 
 describe('L1Publisher', () => {
   let txSender: MockProxy<L1PublisherTxSender>;
-  let txHash: string;
-  let txReceipt: MinimalTransactionReceipt;
+  let publishTxHash: string;
+  let processTxHash: string;
+  let processTxReceipt: MinimalTransactionReceipt;
+  let publishTxReceipt: MinimalTransactionReceipt;
   let l2Block: L2Block;
-  let l2Inputs: Buffer;
-  let l2Proof: Buffer;
+
+  let header: Buffer;
+  let archive: Buffer;
+  let txsHash: Buffer;
+  let body: Buffer;
+  let proof: Buffer;
+
   let publisher: L1Publisher;
 
   beforeEach(() => {
     l2Block = L2Block.random(42);
-    l2Inputs = l2Block.toBufferWithLogs();
-    l2Proof = Buffer.alloc(0);
+
+    header = l2Block.header.toBuffer();
+    archive = l2Block.archive.root.toBuffer();
+    txsHash = l2Block.getCalldataHash();
+    body = l2Block.bodyToBuffer();
+    proof = Buffer.alloc(0);
 
     txSender = mock<L1PublisherTxSender>();
-    txHash = `0x${Buffer.from('txHash').toString('hex')}`; // random tx hash
-    txReceipt = { transactionHash: txHash, status: true } as MinimalTransactionReceipt;
-    txSender.sendProcessTx.mockResolvedValueOnce(txHash);
-    txSender.getTransactionReceipt.mockResolvedValueOnce(txReceipt);
-    txSender.getCurrentStateHash.mockResolvedValue(l2Block.getStartStateHash());
+
+    publishTxHash = `0x${Buffer.from('txHashPublish').toString('hex')}`; // random tx hash
+    processTxHash = `0x${Buffer.from('txHashProcess').toString('hex')}`; // random tx hash
+    publishTxReceipt = {
+      transactionHash: publishTxHash,
+      status: true,
+      logs: [{ data: txsHash.toString('hex') }],
+    } as MinimalTransactionReceipt;
+    processTxReceipt = {
+      transactionHash: processTxHash,
+      status: true,
+      logs: [{ data: '' }],
+    } as MinimalTransactionReceipt;
+    txSender.sendPublishTx.mockResolvedValueOnce(publishTxHash);
+    txSender.sendProcessTx.mockResolvedValueOnce(processTxHash);
+    txSender.getTransactionReceipt.mockResolvedValueOnce(publishTxReceipt).mockResolvedValueOnce(processTxReceipt);
+    txSender.getCurrentArchive.mockResolvedValue(l2Block.header.lastArchive.root.toBuffer());
 
     publisher = new L1Publisher(txSender, { l1BlockPublishRetryIntervalMS: 1 });
   });
@@ -33,46 +56,84 @@ describe('L1Publisher', () => {
     const result = await publisher.processL2Block(l2Block);
 
     expect(result).toEqual(true);
-    expect(txSender.sendProcessTx).toHaveBeenCalledWith({ proof: l2Proof, inputs: l2Inputs });
-    expect(txSender.getTransactionReceipt).toHaveBeenCalledWith(txHash);
+    expect(txSender.sendProcessTx).toHaveBeenCalledWith({ header, archive, txsHash, body, proof });
+    expect(txSender.getTransactionReceipt).toHaveBeenCalledWith(processTxHash);
+  });
+
+  it('does not publish if last archive root is different to expected', async () => {
+    txSender.getCurrentArchive.mockResolvedValueOnce(L2Block.random(43).archive.root.toBuffer());
+    const result = await publisher.processL2Block(l2Block);
+    expect(result).toBe(false);
+    expect(txSender.sendPublishTx).not.toHaveBeenCalled();
+    expect(txSender.sendProcessTx).not.toHaveBeenCalled();
   });
 
-  // TODO(#3936): Temporarily disabling this because L2Block encoding has not yet been updated.
-  // it('does not publish if start hash is different to expected', async () => {
-  //   txSender.getCurrentStateHash.mockResolvedValueOnce(L2Block.random(43).getStartStateHash());
-  //   const result = await publisher.processL2Block(l2Block);
-  //   expect(result).toBe(false);
-  //   expect(txSender.sendProcessTx).not.toHaveBeenCalled();
-  // });
+  it('does not retry if sending a publish tx fails', async () => {
+    txSender.sendPublishTx.mockReset().mockRejectedValueOnce(new Error()).mockResolvedValueOnce(publishTxHash);
 
-  it('does not retry if sending a tx fails', async () => {
-    txSender.sendProcessTx.mockReset().mockRejectedValueOnce(new Error()).mockResolvedValueOnce(txHash);
+    const result = await publisher.processL2Block(l2Block);
+
+    expect(result).toEqual(false);
+    expect(txSender.sendPublishTx).toHaveBeenCalledTimes(1);
+    expect(txSender.sendProcessTx).toHaveBeenCalledTimes(0);
+  });
+
+  it('does not retry if sending a process tx fails', async () => {
+    txSender.sendProcessTx.mockReset().mockRejectedValueOnce(new Error()).mockResolvedValueOnce(processTxHash);
 
     const result = await publisher.processL2Block(l2Block);
 
     expect(result).toEqual(false);
+    expect(txSender.sendPublishTx).toHaveBeenCalledTimes(1);
     expect(txSender.sendProcessTx).toHaveBeenCalledTimes(1);
   });
 
   it('retries if fetching the receipt fails', async () => {
-    txSender.getTransactionReceipt.mockReset().mockRejectedValueOnce(new Error()).mockResolvedValueOnce(txReceipt);
+    txSender.getTransactionReceipt
+      .mockReset()
+      .mockRejectedValueOnce(new Error())
+      .mockResolvedValueOnce(publishTxReceipt)
+      .mockRejectedValueOnce(new Error())
+      .mockResolvedValueOnce(processTxReceipt);
 
     const result = await publisher.processL2Block(l2Block);
 
     expect(result).toEqual(true);
-    expect(txSender.getTransactionReceipt).toHaveBeenCalledTimes(2);
+    expect(txSender.getTransactionReceipt).toHaveBeenCalledTimes(4);
   });
 
-  it('returns false if tx reverts', async () => {
-    txSender.getTransactionReceipt.mockReset().mockResolvedValueOnce({ ...txReceipt, status: false });
+  it('returns false if publish tx reverts', async () => {
+    txSender.getTransactionReceipt.mockReset().mockResolvedValueOnce({ ...publishTxReceipt, status: false });
 
     const result = await publisher.processL2Block(l2Block);
 
     expect(result).toEqual(false);
   });
 
-  it('returns false if interrupted', async () => {
-    txSender.sendProcessTx.mockReset().mockImplementationOnce(() => sleep(10, txHash));
+  it('returns false if process tx reverts', async () => {
+    txSender.getTransactionReceipt
+      .mockReset()
+      .mockResolvedValueOnce(publishTxReceipt)
+      .mockResolvedValueOnce({ ...publishTxReceipt, status: false });
+
+    const result = await publisher.processL2Block(l2Block);
+
+    expect(result).toEqual(false);
+  });
+
+  it('returns false if sending publish tx is interrupted', async () => {
+    txSender.sendPublishTx.mockReset().mockImplementationOnce(() => sleep(10, publishTxHash));
+
+    const resultPromise = publisher.processL2Block(l2Block);
+    publisher.interrupt();
+    const result = await resultPromise;
+
+    expect(result).toEqual(false);
+    expect(txSender.getTransactionReceipt).not.toHaveBeenCalled();
+  });
+
+  it('returns false if sending process tx is interrupted', async () => {
+    txSender.sendProcessTx.mockReset().mockImplementationOnce(() => sleep(10, processTxHash));
 
     const resultPromise = publisher.processL2Block(l2Block);
     publisher.interrupt();
diff --git a/yarn-project/sequencer-client/src/publisher/l1-publisher.ts b/yarn-project/sequencer-client/src/publisher/l1-publisher.ts
index d30b32de7667..c985c6d49aab 100644
--- a/yarn-project/sequencer-client/src/publisher/l1-publisher.ts
+++ b/yarn-project/sequencer-client/src/publisher/l1-publisher.ts
@@ -28,16 +28,25 @@ export type MinimalTransactionReceipt = {
   status: boolean;
   /** Hash of the transaction. */
   transactionHash: string;
-  /** Effective gas used by the tx */
+  /** Effective gas used by the tx. */
   gasUsed: bigint;
-  /** Effective gas price paid by the tx */
+  /** Effective gas price paid by the tx. */
   gasPrice: bigint;
+  /** Logs emitted in this tx. */
+  logs: any[];
 };
 
 /**
  * Pushes txs to the L1 chain and waits for their completion.
  */
 export interface L1PublisherTxSender {
+  /**
+   * Publishes tx effects to Availability Oracle.
+   * @param encodedBody - Encoded block body.
+   * @returns The hash of the mined tx.
+   */
+  sendPublishTx(encodedBody: Buffer): Promise<string | undefined>;
+
   /**
    * Sends a tx to the L1 rollup contract with a new L2 block. Returns once the tx has been mined.
    * @param encodedData - Serialized data for processing the new L2 block.
@@ -75,24 +84,33 @@ export interface L1PublisherTxSender {
   getTransactionStats(txHash: string): Promise<TransactionStats | undefined>;
 
   /**
-   * Returns the current state hash.
-   * @returns The current state hash of the rollup contract.
+   * Returns the current archive root.
+   * @returns The current archive root of the rollup contract.
+   */
+  getCurrentArchive(): Promise<Buffer>;
+
+  /**
+   * Checks if the transaction effects of the given block are available.
+   * @param block - The block of which to check whether txs are available.
+   * @returns True if the txs are available, false otherwise.
    */
-  getCurrentStateHash(): Promise<Buffer>;
+  checkIfTxsAreAvailable(block: L2Block): Promise<boolean>;
 }
 
 /**
- * Encoded block data and proof ready to be pushed to the L1 contract.
+ * Encoded block and proof ready to be pushed to the L1 contract.
  */
 export type L1ProcessArgs = {
-  /**
-   * Root rollup proof for an L1 block.
-   */
+  /** The L2 block header. */
+  header: Buffer;
+  /** A root of the archive tree after the L2 block is applied. */
+  archive: Buffer;
+  /** Transactions hash. */
+  txsHash: Buffer;
+  /** L2 block body. */
+  body: Buffer;
+  /** Root rollup proof of the L2 block. */
   proof: Buffer;
-  /**
-   * Serialized L2Block data.
-   */
-  inputs: Buffer;
 };
 
 /**
@@ -124,24 +142,65 @@ export class L1Publisher implements L2BlockReceiver {
   }
 
   /**
-   * Processes incoming L2 block data by publishing it to the L1 rollup contract.
-   * @param l2BlockData - L2 block data to publish.
+   * Publishes L2 block on L1.
+   * @param block - L2 block to publish.
    * @returns True once the tx has been confirmed and is successful, false on revert or interrupt, blocks otherwise.
    */
-  public async processL2Block(l2BlockData: L2Block): Promise<boolean> {
-    const proof = Buffer.alloc(0);
-    const txData = { proof, inputs: l2BlockData.toBufferWithLogs() };
-    const startStateHash = l2BlockData.getStartStateHash();
+  public async processL2Block(block: L2Block): Promise<boolean> {
+    // TODO(#4148) Remove this block number check, it's here because we don't currently have proper genesis state on the contract
+    const lastArchive = block.header.lastArchive.root.toBuffer();
+    if (block.number != 1 && !(await this.checkLastArchiveHash(lastArchive))) {
+      this.log(`Detected different last archive prior to publishing a block, aborting publish...`);
+      return false;
+    }
+
+    const encodedBody = block.bodyToBuffer();
+
+    // Publish block transaction effects
+    while (!this.interrupted) {
+      if (await this.txSender.checkIfTxsAreAvailable(block)) {
+        this.log(`Transaction effects of a block ${block.number} already published.`);
+        break;
+      }
+
+      const txHash = await this.sendPublishTx(encodedBody);
+      if (!txHash) {
+        return false;
+      }
 
+      const receipt = await this.getTransactionReceipt(txHash);
+      if (!receipt) {
+        return false;
+      }
+
+      if (receipt.status) {
+        let txsHash;
+        if (receipt.logs.length === 1) {
+          // txsHash from IAvailabilityOracle.TxsPublished event
+          txsHash = receipt.logs[0].data;
+        } else {
+          this.log(`Expected 1 log, got ${receipt.logs.length}`);
+        }
+
+        this.log.info(`Block txs effects published, txsHash: ${txsHash}`);
+        break;
+      }
+
+      this.log(`AvailabilityOracle.publish tx status failed: ${receipt.transactionHash}`);
+      await this.sleepOrInterrupted();
+    }
+
+    const processTxArgs = {
+      header: block.header.toBuffer(),
+      archive: block.archive.root.toBuffer(),
+      txsHash: block.getCalldataHash(),
+      body: encodedBody,
+      proof: Buffer.alloc(0),
+    };
+
+    // Process block
     while (!this.interrupted) {
-      // TODO: Remove this block number check, it's here because we don't currently have proper genesis state on the contract
-      // TODO(#3936): Temporarily disabling this because L2Block encoding has not yet been updated.
-      // if (l2BlockData.number != 1 && !(await this.checkStartStateHash(startStateHash))) {
-      //   this.log(`Detected different state hash prior to publishing rollup, aborting publish...`);
-      //   break;
-      // }
-
-      const txHash = await this.sendProcessTx(txData);
+      const txHash = await this.sendProcessTx(processTxArgs);
       if (!txHash) {
         break;
       }
@@ -157,7 +216,7 @@ export class L1Publisher implements L2BlockReceiver {
         const stats: L1PublishStats = {
           ...pick(receipt, 'gasPrice', 'gasUsed', 'transactionHash'),
           ...pick(tx!, 'calldataGas', 'calldataSize'),
-          ...l2BlockData.getStats(),
+          ...block.getStats(),
           eventName: 'rollup-published-to-l1',
         };
         this.log.info(`Published L2 block to L1 rollup contract`, stats);
@@ -165,12 +224,12 @@ export class L1Publisher implements L2BlockReceiver {
       }
 
       // Check if someone else incremented the block number
-      if (!(await this.checkStartStateHash(startStateHash))) {
-        this.log('Publish failed. Detected different state hash.');
+      if (!(await this.checkLastArchiveHash(lastArchive))) {
+        this.log('Publish failed. Detected different last archive hash.');
         break;
       }
 
-      this.log(`Transaction status failed: ${receipt.transactionHash}`);
+      this.log(`Rollup.process tx status failed: ${receipt.transactionHash}`);
       await this.sleepOrInterrupted();
     }
 
@@ -238,20 +297,31 @@ export class L1Publisher implements L2BlockReceiver {
   }
 
   /**
-   * Verifies that the given value of start state hash equals that on the rollup contract
-   * @param startStateHash - The start state hash of the block we wish to publish.
+   * Verifies that the given value of last archive in a block header equals current archive of the rollup contract
+   * @param lastArchive - The last archive of the block we wish to publish.
    * @returns Boolean indicating if the hashes are equal.
    */
-  private async checkStartStateHash(startStateHash: Buffer): Promise<boolean> {
-    const fromChain = await this.txSender.getCurrentStateHash();
-    const areSame = startStateHash.equals(fromChain);
+  private async checkLastArchiveHash(lastArchive: Buffer): Promise<boolean> {
+    const fromChain = await this.txSender.getCurrentArchive();
+    const areSame = lastArchive.equals(fromChain);
     if (!areSame) {
-      this.log(`CONTRACT STATE HASH: ${fromChain.toString('hex')}`);
-      this.log(`NEW BLOCK STATE HASH: ${startStateHash.toString('hex')}`);
+      this.log(`CONTRACT ARCHIVE: ${fromChain.toString('hex')}`);
+      this.log(`NEW BLOCK LAST ARCHIVE: ${lastArchive.toString('hex')}`);
     }
     return areSame;
   }
 
+  private async sendPublishTx(encodedBody: Buffer): Promise<string | undefined> {
+    while (!this.interrupted) {
+      try {
+        return await this.txSender.sendPublishTx(encodedBody);
+      } catch (err) {
+        this.log.error(`TxEffects publish failed`, err);
+        return undefined;
+      }
+    }
+  }
+
   private async sendProcessTx(encodedData: L1ProcessArgs): Promise<string | undefined> {
     while (!this.interrupted) {
       try {
diff --git a/yarn-project/sequencer-client/src/publisher/viem-tx-sender.ts b/yarn-project/sequencer-client/src/publisher/viem-tx-sender.ts
index 89a3037ec325..33911815709a 100644
--- a/yarn-project/sequencer-client/src/publisher/viem-tx-sender.ts
+++ b/yarn-project/sequencer-client/src/publisher/viem-tx-sender.ts
@@ -1,7 +1,7 @@
-import { BLOB_SIZE_IN_BYTES, ExtendedContractData } from '@aztec/circuit-types';
+import { BLOB_SIZE_IN_BYTES, ExtendedContractData, L2Block } from '@aztec/circuit-types';
 import { createEthereumChain } from '@aztec/ethereum';
 import { createDebugLogger } from '@aztec/foundation/log';
-import { ContractDeploymentEmitterAbi, RollupAbi } from '@aztec/l1-artifacts';
+import { AvailabilityOracleAbi, ContractDeploymentEmitterAbi, RollupAbi } from '@aztec/l1-artifacts';
 
 import {
   GetContractReturnType,
@@ -31,6 +31,11 @@ import {
  * Pushes transactions to the L1 rollup contract using viem.
  */
 export class ViemTxSender implements L1PublisherTxSender {
+  private availabilityOracleContract: GetContractReturnType<
+    typeof AvailabilityOracleAbi,
+    PublicClient<HttpTransport, chains.Chain>,
+    WalletClient<HttpTransport, chains.Chain, PrivateKeyAccount>
+  >;
   private rollupContract: GetContractReturnType<
     typeof RollupAbi,
     PublicClient<HttpTransport, chains.Chain>,
@@ -61,6 +66,12 @@ export class ViemTxSender implements L1PublisherTxSender {
       transport: http(chain.rpcUrl),
     });
 
+    this.availabilityOracleContract = getContract({
+      address: getAddress(l1Contracts.availabilityOracleAddress.toString()),
+      abi: AvailabilityOracleAbi,
+      publicClient: this.publicClient,
+      walletClient,
+    });
     this.rollupContract = getContract({
       address: getAddress(l1Contracts.rollupAddress.toString()),
       abi: RollupAbi,
@@ -75,9 +86,14 @@ export class ViemTxSender implements L1PublisherTxSender {
     });
   }
 
-  async getCurrentStateHash(): Promise<Buffer> {
-    const stateHash = await this.rollupContract.read.rollupStateHash();
-    return Buffer.from(stateHash.replace('0x', ''), 'hex');
+  async getCurrentArchive(): Promise<Buffer> {
+    const archive = await this.rollupContract.read.archive();
+    return Buffer.from(archive.replace('0x', ''), 'hex');
+  }
+
+  checkIfTxsAreAvailable(block: L2Block): Promise<boolean> {
+    const args = [`0x${block.getCalldataHash().toString('hex')}`] as const;
+    return this.availabilityOracleContract.read.isAvailable(args);
   }
 
   async getTransactionStats(txHash: string): Promise<TransactionStats | undefined> {
@@ -109,6 +125,7 @@ export class ViemTxSender implements L1PublisherTxSender {
         transactionHash: txHash,
         gasUsed: receipt.gasUsed,
         gasPrice: receipt.effectiveGasPrice,
+        logs: receipt.logs,
       };
     }
 
@@ -116,13 +133,37 @@ export class ViemTxSender implements L1PublisherTxSender {
     return undefined;
   }
 
+  /**
+   * Publishes tx effects to Availability Oracle.
+   * @param encodedBody - Encoded block body.
+   * @returns The hash of the mined tx.
+   */
+  async sendPublishTx(encodedBody: Buffer): Promise<string | undefined> {
+    const args = [`0x${encodedBody.toString('hex')}`] as const;
+
+    const gas = await this.availabilityOracleContract.estimateGas.publish(args, {
+      account: this.account,
+    });
+    const hash = await this.availabilityOracleContract.write.publish(args, {
+      gas,
+      account: this.account,
+    });
+    return hash;
+  }
+
   /**
    * Sends a tx to the L1 rollup contract with a new L2 block. Returns once the tx has been mined.
    * @param encodedData - Serialized data for processing the new L2 block.
    * @returns The hash of the mined tx.
    */
   async sendProcessTx(encodedData: ProcessTxArgs): Promise<string | undefined> {
-    const args = [`0x${encodedData.proof.toString('hex')}`, `0x${encodedData.inputs.toString('hex')}`] as const;
+    const args = [
+      `0x${encodedData.header.toString('hex')}`,
+      `0x${encodedData.archive.toString('hex')}`,
+      `0x${encodedData.txsHash.toString('hex')}`,
+      `0x${encodedData.body.toString('hex')}`,
+      `0x${encodedData.proof.toString('hex')}`,
+    ] as const;
 
     const gas = await this.rollupContract.estimateGas.process(args, {
       account: this.account,
diff --git a/yarn-project/sequencer-client/src/sequencer/public_processor.test.ts b/yarn-project/sequencer-client/src/sequencer/public_processor.test.ts
index 98db4d5e64ed..14174865bdb9 100644
--- a/yarn-project/sequencer-client/src/sequencer/public_processor.test.ts
+++ b/yarn-project/sequencer-client/src/sequencer/public_processor.test.ts
@@ -34,12 +34,11 @@ import {
   makeSelector,
 } from '@aztec/circuits.js/factories';
 import { makeTuple } from '@aztec/foundation/array';
-import { padArrayEnd } from '@aztec/foundation/collection';
+import { padArrayEnd, times } from '@aztec/foundation/collection';
 import { SiblingPath } from '@aztec/types/membership';
 import { MerkleTreeOperations, TreeInfo } from '@aztec/world-state';
 
 import { MockProxy, mock } from 'jest-mock-extended';
-import times from 'lodash.times';
 
 import { PublicProver } from '../prover/index.js';
 import { PublicKernelCircuitSimulator } from '../simulator/index.js';
diff --git a/yarn-project/sequencer-client/src/sequencer/sequencer.test.ts b/yarn-project/sequencer-client/src/sequencer/sequencer.test.ts
index 1bc34c9dc690..2e4af5ba3af0 100644
--- a/yarn-project/sequencer-client/src/sequencer/sequencer.test.ts
+++ b/yarn-project/sequencer-client/src/sequencer/sequencer.test.ts
@@ -15,11 +15,11 @@ import {
   NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP,
   makeEmptyProof,
 } from '@aztec/circuits.js';
+import { times } from '@aztec/foundation/collection';
 import { P2P, P2PClientState } from '@aztec/p2p';
 import { MerkleTreeOperations, WorldStateRunningState, WorldStateSynchronizer } from '@aztec/world-state';
 
 import { MockProxy, mock, mockFn } from 'jest-mock-extended';
-import times from 'lodash.times';
 
 import { BlockBuilder } from '../block_builder/index.js';
 import { GlobalVariableBuilder } from '../global_variable_builder/global_builder.js';
diff --git a/yarn-project/sequencer-client/src/sequencer/sequencer.ts b/yarn-project/sequencer-client/src/sequencer/sequencer.ts
index f23c8c9a9df9..2663453e9534 100644
--- a/yarn-project/sequencer-client/src/sequencer/sequencer.ts
+++ b/yarn-project/sequencer-client/src/sequencer/sequencer.ts
@@ -1,6 +1,7 @@
 import { L1ToL2MessageSource, L2Block, L2BlockSource, MerkleTreeId, Tx } from '@aztec/circuit-types';
 import { L2BlockBuiltStats } from '@aztec/circuit-types/stats';
 import { GlobalVariables } from '@aztec/circuits.js';
+import { times } from '@aztec/foundation/collection';
 import { Fr } from '@aztec/foundation/fields';
 import { createDebugLogger } from '@aztec/foundation/log';
 import { RunningPromise } from '@aztec/foundation/running-promise';
@@ -8,8 +9,6 @@ import { Timer, elapsed } from '@aztec/foundation/timer';
 import { P2P } from '@aztec/p2p';
 import { WorldStateStatus, WorldStateSynchronizer } from '@aztec/world-state';
 
-import times from 'lodash.times';
-
 import { BlockBuilder } from '../block_builder/index.js';
 import { GlobalVariableBuilder } from '../global_variable_builder/global_builder.js';
 import { L1Publisher } from '../publisher/l1-publisher.js';
diff --git a/yarn-project/types/src/interfaces/node-info.ts b/yarn-project/types/src/interfaces/node-info.ts
index 1831263c0e3f..48d77996d896 100644
--- a/yarn-project/types/src/interfaces/node-info.ts
+++ b/yarn-project/types/src/interfaces/node-info.ts
@@ -8,10 +8,6 @@ export interface NodeInfo {
    * Version as tracked in the aztec-packages repository.
    */
   nodeVersion: string;
-  /**
-   * The nargo version compatible with this node version
-   */
-  compatibleNargoVersion: string;
   /**
    * L1 chain id.
    */
diff --git a/yarn-project/world-state/package.json b/yarn-project/world-state/package.json
index f4d908eec5df..7fc61040e0e7 100644
--- a/yarn-project/world-state/package.json
+++ b/yarn-project/world-state/package.json
@@ -36,7 +36,6 @@
     "@aztec/merkle-tree": "workspace:^",
     "@aztec/types": "workspace:^",
     "levelup": "^5.1.1",
-    "lodash.times": "^4.3.2",
     "memdown": "^6.1.1",
     "tslib": "^2.4.0"
   },
@@ -44,7 +43,6 @@
     "@jest/globals": "^29.5.0",
     "@types/jest": "^29.5.0",
     "@types/levelup": "^5.1.2",
-    "@types/lodash.times": "^4.3.7",
     "@types/memdown": "^3.0.0",
     "@types/node": "^18.7.23",
     "jest": "^29.5.0",
diff --git a/yarn-project/yarn.lock b/yarn-project/yarn.lock
index b5e32659fad3..5e7bbb294741 100644
--- a/yarn-project/yarn.lock
+++ b/yarn-project/yarn.lock
@@ -115,6 +115,7 @@ __metadata:
     "@aztec/circuits.js": "workspace:^"
     "@aztec/ethereum": "workspace:^"
     "@aztec/foundation": "workspace:^"
+    "@aztec/kv-store": "workspace:^"
     "@aztec/l1-artifacts": "workspace:^"
     "@jest/globals": ^29.5.0
     "@types/debug": ^4.1.7
@@ -128,7 +129,6 @@ __metadata:
     jest-mock-extended: ^3.0.4
     lmdb: ^2.9.1
     lodash.omit: ^4.5.0
-    lodash.times: ^4.3.2
     ts-jest: ^29.1.0
     ts-node: ^10.9.1
     tsc-watch: ^6.0.0
@@ -328,12 +328,10 @@ __metadata:
     "@jest/globals": ^29.5.0
     "@types/jest": ^29.5.0
     "@types/lodash.chunk": ^4.2.7
-    "@types/lodash.times": ^4.3.7
     "@types/node": ^18.7.23
     eslint: ^8.35.0
     jest: ^29.5.0
     lodash.chunk: ^4.2.0
-    lodash.times: ^4.3.2
     prettier: ^2.8.4
     ts-jest: ^29.1.0
     ts-node: ^10.9.1
@@ -402,6 +400,7 @@ __metadata:
     "@aztec/cli": "workspace:^"
     "@aztec/ethereum": "workspace:^"
     "@aztec/foundation": "workspace:^"
+    "@aztec/kv-store": "workspace:^"
     "@aztec/l1-artifacts": "workspace:^"
     "@aztec/merkle-tree": "workspace:^"
     "@aztec/noir-contracts": "workspace:^"
@@ -418,7 +417,6 @@ __metadata:
     "@types/koa-static": ^4.0.2
     "@types/levelup": ^5.1.2
     "@types/lodash.every": ^4.6.7
-    "@types/lodash.times": ^4.3.7
     "@types/memdown": ^3.0.3
     "@types/node": ^18.7.23
     buffer: ^6.0.3
@@ -429,10 +427,8 @@ __metadata:
     koa: ^2.14.2
     koa-static: ^5.0.0
     levelup: ^5.1.1
-    lmdb: ^2.9.1
     lodash.compact: ^3.0.1
     lodash.every: ^4.6.0
-    lodash.times: ^4.3.2
     memdown: ^6.1.1
     process: ^0.11.10
     puppeteer: ^21.3.4
@@ -611,12 +607,10 @@ __metadata:
     "@aztec/types": "workspace:^"
     "@iarna/toml": ^2.2.5
     "@jest/globals": ^29.5.0
-    "@noir-lang/noir_wasm": "portal:../../noir/packages/noir_wasm"
     "@types/fs-extra": ^11.0.1
     "@types/jest": ^29.5.0
     "@types/lodash.camelcase": ^4.3.7
     "@types/lodash.capitalize": ^4.2.7
-    "@types/lodash.times": ^4.3.7
     "@types/node": ^18.7.23
     "@types/pako": ^2.0.0
     "@types/semver": ^7.5.4
@@ -626,7 +620,6 @@ __metadata:
     jest: ^29.5.0
     lodash.camelcase: ^4.3.0
     lodash.capitalize: ^4.2.1
-    lodash.times: ^4.3.2
     memfs: ^4.6.0
     pako: ^2.1.0
     semver: ^7.5.4
@@ -721,13 +714,11 @@ __metadata:
     "@libp2p/peer-id-factory": ^3.0.3
     "@libp2p/tcp": ^8.0.4
     "@types/jest": ^29.5.0
-    "@types/lodash.times": ^4.3.7
     "@types/node": ^18.14.6
     it-pipe: ^3.0.1
     jest: ^29.5.0
     jest-mock-extended: ^3.0.4
     libp2p: ^0.46.6
-    lodash.times: ^4.3.2
     sha3: ^2.1.4
     ts-jest: ^29.1.0
     ts-node: ^10.9.1
@@ -769,14 +760,12 @@ __metadata:
     "@jest/globals": ^29.5.0
     "@types/jest": ^29.5.0
     "@types/lodash.omit": ^4.5.7
-    "@types/lodash.times": ^4.3.7
     "@types/node": ^18.7.23
     jest: ^29.5.0
     jest-mock-extended: ^3.0.3
     koa: ^2.14.2
     koa-router: ^12.0.0
     lodash.omit: ^4.5.0
-    lodash.times: ^4.3.2
     sha3: ^2.1.4
     ts-jest: ^29.1.0
     ts-node: ^10.9.1
@@ -832,7 +821,6 @@ __metadata:
     "@types/levelup": ^5.1.2
     "@types/lodash.chunk": ^4.2.7
     "@types/lodash.pick": ^4.4.7
-    "@types/lodash.times": ^4.3.7
     "@types/memdown": ^3.0.0
     "@types/node": ^18.7.23
     concurrently: ^7.6.0
@@ -842,7 +830,6 @@ __metadata:
     levelup: ^5.1.1
     lodash.chunk: ^4.2.0
     lodash.pick: ^4.4.0
-    lodash.times: ^4.3.2
     memdown: ^6.1.1
     prettier: ^2.8.7
     ts-jest: ^29.1.0
@@ -893,13 +880,11 @@ __metadata:
     "@jest/globals": ^29.5.0
     "@types/jest": ^29.5.0
     "@types/levelup": ^5.1.2
-    "@types/lodash.times": ^4.3.7
     "@types/memdown": ^3.0.0
     "@types/node": ^18.7.23
     jest: ^29.5.0
     jest-mock-extended: ^3.0.5
     levelup: ^5.1.1
-    lodash.times: ^4.3.2
     memdown: ^6.1.1
     ts-jest: ^29.1.0
     ts-node: ^10.9.1
@@ -2814,14 +2799,6 @@ __metadata:
   languageName: node
   linkType: soft
 
-"@noir-lang/noir_wasm@portal:../noir/packages/noir_wasm::locator=%40aztec%2Faztec3-packages%40workspace%3A.":
-  version: 0.0.0-use.local
-  resolution: "@noir-lang/noir_wasm@portal:../noir/packages/noir_wasm::locator=%40aztec%2Faztec3-packages%40workspace%3A."
-  dependencies:
-    pako: ^2.1.0
-  languageName: node
-  linkType: soft
-
 "@noir-lang/noirc_abi@portal:../noir/packages/noirc_abi::locator=%40aztec%2Faztec3-packages%40workspace%3A.":
   version: 0.0.0-use.local
   resolution: "@noir-lang/noirc_abi@portal:../noir/packages/noirc_abi::locator=%40aztec%2Faztec3-packages%40workspace%3A."
@@ -3612,11 +3589,11 @@ __metadata:
   linkType: hard
 
 "@types/lodash.times@npm:^4.3.7":
-  version: 4.3.7
-  resolution: "@types/lodash.times@npm:4.3.7"
+  version: 4.3.9
+  resolution: "@types/lodash.times@npm:4.3.9"
   dependencies:
     "@types/lodash": "*"
-  checksum: f31e67c17124614afd392b10e26a5af38f0975edbe4e128c60affa0890a1f2fea502daa4839aee4b1f66b690f925254eff3e9dfcea5d7d3ace7315dba430335f
+  checksum: 452374b3db98bb805e77b3a53955aa76c1e78a7d48c400b08d48b6424ed9328ad826d98364b82506ea2756089320503d3a5797a1456bcdac11451763be536e62
   languageName: node
   linkType: hard
 
diff --git a/yellow-paper/docs/circuits/private-function.md b/yellow-paper/docs/circuits/private-function.md
index a5a93c29a0ca..796f190f973c 100644
--- a/yellow-paper/docs/circuits/private-function.md
+++ b/yellow-paper/docs/circuits/private-function.md
@@ -16,23 +16,24 @@ The public inputs of a private function circuit will be incorporated into the pr
 
 The following format defines the ABI that is used by the private kernel circuit when processing private function public inputs:
 
-| Field                            | Type                                                             | Description                                                           |
-| -------------------------------- | ---------------------------------------------------------------- | --------------------------------------------------------------------- |
-| _call_context_                   | _[CallContext](#callcontext)_                                    | Context of the call corresponding to this function execution.         |
-| _args_hash_                      | _field_                                                          | Hash of the function arguments.                                       |
-| _return_values_                  | [_field_; _C_]                                                   | Return values of this function call.                                  |
-| _read_requests_                  | [_[ReadRequest](#readrequest)_; _C_]                             | Requests to read notes in the note hash tree.                         |
-| _note_hashes_                    | [_[NoteHash](#notehash)_; _C_]                                   | New note hashes created in this function call.                        |
-| _nullifiers_                     | [_[Nullifier](#nullifier)_; _C_]                                 | New nullifiers created in this function call.                         |
-| _l2_to_l1_messages_              | [_field_; _C_]                                                   | New L2 to L1 messages created in this function call.                  |
-| _unencrypted_log_hashes_         | [_[UnencryptedLogHash](#unencryptedloghash)_; _C_]               | Hashes of the unencrypted logs emitted in this function call.         |
-| _encrypted_log_hashes_           | [_[EncryptedLogHash](#encryptedloghash)_; _C_]                   | Hashes of the encrypted logs emitted in this function call.           |
-| _encrypted_note_preimage_hashes_ | [_[EncryptedNotePreimageHash](#encryptednotepreimagehash)_; _C_] | Hashes of the encrypted note preimages emitted in this function call. |
-| _private_call_stack_item_hashes_ | [_field_; _C_]                                                   | Hashes of the private function calls initiated by this function.      |
-| _public_call_stack_item_hashes_  | [_field_; _C_]                                                   | Hashes of the public function calls initiated by this function.       |
-| _block_header_                   | _[BlockHeader](#blockheader)_                                    | Information about the trees used for the transaction.                 |
-| _chain_id_                       | _field_                                                          | Chain ID of the transaction.                                          |
-| _version_                        | _field_                                                          | Version of the transaction.                                           |
+| Field                               | Type                                                                     | Description                                                           |
+| ----------------------------------- | ------------------------------------------------------------------------ | --------------------------------------------------------------------- |
+| _call_context_                      | _[CallContext](#callcontext)_                                            | Context of the call corresponding to this function execution.         |
+| _args_hash_                         | _field_                                                                  | Hash of the function arguments.                                       |
+| _return_values_                     | [_field_; _C_]                                                           | Return values of this function call.                                  |
+| _read_requests_                     | [_[ReadRequest](#readrequest)_; _C_]                                     | Requests to read notes in the note hash tree.                         |
+| _nullifier_key_validation_requests_ | [_[NullifierKeyValidationRequest](#nullifierkeyvalidationrequest)_; _C_] | Requests to validate nullifier keys used in this function call.       |
+| _note_hashes_                       | [_[NoteHash](#notehash)_; _C_]                                           | New note hashes created in this function call.                        |
+| _nullifiers_                        | [_[Nullifier](#nullifier)_; _C_]                                         | New nullifiers created in this function call.                         |
+| _l2_to_l1_messages_                 | [_field_; _C_]                                                           | New L2 to L1 messages created in this function call.                  |
+| _unencrypted_log_hashes_            | [_[UnencryptedLogHash](#unencryptedloghash)_; _C_]                       | Hashes of the unencrypted logs emitted in this function call.         |
+| _encrypted_log_hashes_              | [_[EncryptedLogHash](#encryptedloghash)_; _C_]                           | Hashes of the encrypted logs emitted in this function call.           |
+| _encrypted_note_preimage_hashes_    | [_[EncryptedNotePreimageHash](#encryptednotepreimagehash)_; _C_]         | Hashes of the encrypted note preimages emitted in this function call. |
+| _private_call_stack_item_hashes_    | [_field_; _C_]                                                           | Hashes of the private function calls initiated by this function.      |
+| _public_call_stack_item_hashes_     | [_field_; _C_]                                                           | Hashes of the public function calls initiated by this function.       |
+| _block_header_                      | _[BlockHeader](#blockheader)_                                            | Information about the trees used for the transaction.                 |
+| _chain_id_                          | _field_                                                                  | Chain ID of the transaction.                                          |
+| _version_                           | _field_                                                                  | Version of the transaction.                                           |
 
 > The above **C**s represent constants defined by the protocol. Each **C** might have a different value from the others.
 
@@ -55,6 +56,13 @@ The following format defines the ABI that is used by the private kernel circuit
 | _note_hash_ | _field_ | Hash of the note to be read.           |
 | _counter_   | _field_ | Counter at which the request was made. |
 
+#### _NullifierKeyValidationRequest_
+
+| Field        | Type    | Description                                                          |
+| ------------ | ------- | -------------------------------------------------------------------- |
+| _public_key_ | _field_ | Nullifier public key of an account.                                  |
+| _secret_key_ | _field_ | Nullifier secret key of an account siloed with the contract address. |
+
 #### _NoteHash_
 
 | Field     | Type    | Description                                 |
diff --git a/yellow-paper/docs/circuits/private-kernel-initial.md b/yellow-paper/docs/circuits/private-kernel-initial.md
index 462c9fbf1cbc..ed67d927e8f5 100644
--- a/yellow-paper/docs/circuits/private-kernel-initial.md
+++ b/yellow-paper/docs/circuits/private-kernel-initial.md
@@ -173,7 +173,11 @@ This circuit verifies that the values in _[private_inputs](#private-inputs).[pri
 3. For each non-empty call request in both _private_call_requests_ and _public_call_requests_:
 
    - The _caller_contract_address_ equals the _contract_address_ in _[private_call](#privatecall).[call_stack_item](#privatecallstackitem)_.
-   - The _caller_context_ is either empty or aligns with the values in the _call_context_ within _private_function_public_inputs_.
+   - The following values in _caller_context_ are either empty or align with the values in the _call_context_ within _private_function_public_inputs_:
+     - _`(caller_context.msg_sender == 0) & (caller_context.storage_contract_address == 0)`_
+     - Or _`(caller_context.msg_sender == call_context.msg_sender) & (caller_context.storage_contract_address == call_context.storage_contract_address)`_
+   - The _is_static_call_ flag must be propagated:
+     - _`caller_context.is_static_call == call_context.is_static_call`_
 
    > The caller context in a call request may be empty for standard calls. This precaution is crucial to prevent information leakage, particularly as revealing the _msg_sender_ of this private function when calling a public function could pose security risks.
 
@@ -183,6 +187,7 @@ This circuit verifies that the values in _[private_inputs](#private-inputs).[pri
    - _nullifier_contexts_
    - _l2_to_l1_message_contexts_
    - _read_request_contexts_
+   - _nullifier_key_validation_request_contexts_
    - _unencrypted_log_hash_contexts_
    - _encrypted_log_hash_contexts_
    - _encrypted_note_preimage_hash_contexts_
@@ -249,17 +254,18 @@ Data that remains the same throughout the entire transaction.
 
 ### _TransientAccumulatedData_
 
-| Field                                   | Type                                                                    | Description                                                                 |
-| --------------------------------------- | ----------------------------------------------------------------------- | --------------------------------------------------------------------------- |
-| _note_hash_contexts_                    | [_[NoteHashContext](#notehashcontext)_; _C_]                            | Note hashes with extra data aiding verification.                            |
-| _nullifier_contexts_                    | [_[NullifierContext](#nullifiercontext)_; _C_]                          | Nullifiers with extra data aiding verification.                             |
-| _l2_to_l1_message_contexts_             | [_[L2toL1MessageContext](#l2tol1messagecontext)_; _C_]                  | L2-to-l1 messages with extra data aiding verification.                      |
-| _read_request_contexts_                 | [_[ReadRequestContext](#readrequestcontext)_; _C_]                      | Requests to read notes in the note hash tree.                               |
-| _unencrypted_log_hash_contexts_         | [_[EncryptedLogHashContext](#encryptedloghashcontext)_; _C_]            | Hashes of the unencrypted logs with extra data aiding verification.         |
-| _encrypted_log_hash_contexts_           | [_[UnencryptedLogHashContext](#unencryptedloghashcontext)_; _C_]        | Hashes of the encrypted logs with extra data aiding verification.           |
-| _encrypted_note_preimage_hash_contexts_ | [_[EncryptedNotePreimageHashContext](#encryptednotepreimagehash)_; _C_] | Hashes of the encrypted note preimages with extra data aiding verification. |
-| _private_call_requests_                 | [_[CallRequest](#callrequest)_; _C_]                                    | Requests to call private functions.                                         |
-| _public_call_requests_                  | [_[CallRequest](#callrequest)_; _C_]                                    | Requests to call publics functions.                                         |
+| Field                                       | Type                                                                                   | Description                                                                 |
+| ------------------------------------------- | -------------------------------------------------------------------------------------- | --------------------------------------------------------------------------- |
+| _note_hash_contexts_                        | [_[NoteHashContext](#notehashcontext)_; _C_]                                           | Note hashes with extra data aiding verification.                            |
+| _nullifier_contexts_                        | [_[NullifierContext](#nullifiercontext)_; _C_]                                         | Nullifiers with extra data aiding verification.                             |
+| _l2_to_l1_message_contexts_                 | [_[L2toL1MessageContext](#l2tol1messagecontext)_; _C_]                                 | L2-to-l1 messages with extra data aiding verification.                      |
+| _read_request_contexts_                     | [_[ReadRequestContext](#readrequestcontext)_; _C_]                                     | Requests to read notes in the note hash tree.                               |
+| _nullifier_key_validation_request_contexts_ | [_[NullifierKeyValidationRequestContext](#nullifierkeyvalidationrequestcontext)_; _C_] | Requests to validate nullifier keys.                                        |
+| _unencrypted_log_hash_contexts_             | [_[EncryptedLogHashContext](#encryptedloghashcontext)_; _C_]                           | Hashes of the unencrypted logs with extra data aiding verification.         |
+| _encrypted_log_hash_contexts_               | [_[UnencryptedLogHashContext](#unencryptedloghashcontext)_; _C_]                       | Hashes of the encrypted logs with extra data aiding verification.           |
+| _encrypted_note_preimage_hash_contexts_     | [_[EncryptedNotePreimageHashContext](#encryptednotepreimagehash)_; _C_]                | Hashes of the encrypted note preimages with extra data aiding verification. |
+| _private_call_requests_                     | [_[CallRequest](#callrequest)_; _C_]                                                   | Requests to call private functions.                                         |
+| _public_call_requests_                      | [_[CallRequest](#callrequest)_; _C_]                                                   | Requests to call publics functions.                                         |
 
 > The above **C**s represent constants defined by the protocol. Each **C** might have a different value from the others.
 
@@ -314,10 +320,11 @@ Data that remains the same throughout the entire transaction.
 
 #### _CallerContext_
 
-| Field              | Type           | Description                                      |
-| ------------------ | -------------- | ------------------------------------------------ |
-| _msg_sender_       | _AztecAddress_ | Address of the caller contract.                  |
-| _storage_contract_ | _AztecAddress_ | Storage contract address of the caller contract. |
+| Field              | Type           | Description                                          |
+| ------------------ | -------------- | ---------------------------------------------------- |
+| _msg_sender_       | _AztecAddress_ | Address of the caller contract.                      |
+| _storage_contract_ | _AztecAddress_ | Storage contract address of the caller contract.     |
+| _is_static_call_   | _bool_         | A flag indicating whether the call is a static call. |
 
 #### _NoteHashContext_
 
@@ -353,6 +360,14 @@ Data that remains the same throughout the entire transaction.
 | _counter_          | _field_        | Counter at which the request was made.        |
 | _contract_address_ | _AztecAddress_ | Address of the contract the request was made. |
 
+#### _NullifierKeyValidationRequestContext_
+
+| Field              | Type           | Description                                                |
+| ------------------ | -------------- | ---------------------------------------------------------- |
+| _public_key_       | _field_        | Nullifier public key of an account.                        |
+| _secret_key_       | _field_        | Secret key of an account siloed with the contract address. |
+| _contract_address_ | _AztecAddress_ | Address of the contract the request was made.              |
+
 #### _UnencryptedLogHashContext_
 
 | Field              | Type           | Description                                  |
diff --git a/yellow-paper/docs/circuits/private-kernel-inner.md b/yellow-paper/docs/circuits/private-kernel-inner.md
index da0fed574c63..80b9fc15ab36 100644
--- a/yellow-paper/docs/circuits/private-kernel-inner.md
+++ b/yellow-paper/docs/circuits/private-kernel-inner.md
@@ -52,14 +52,14 @@ This circuit will:
 
 For the _call_context_ in the [public_inputs](./private-function.md#public-inputs) of the _[private_call](#privatecall).[call_stack_item](./private-kernel-initial.md#privatecallstackitem)_ and the _call_request_ popped in the [previous step](#ensuring-the-current-call-matches-the-call-request), this circuit checks that:
 
-1. If it is a standard call (`call_context.is_delegate_call == false`):
+1. If it is a standard call: _`call_context.is_delegate_call == false`_
 
    - The _msg_sender_ of the current iteration must be the same as the caller's _contract_address_:
      - _`call_context.msg_sender == call_request.caller_contract_address`_
    - The _storage_contract_address_ of the current iteration must be the same as its _contract_address_:
      - _`call_context.storage_contract_address == call_stack_item.contract_address`_
 
-2. If it is a delegate call (`call_context.is_delegate_call == true`):
+2. If it is a delegate call: _`call_context.is_delegate_call == true`_
 
    - The _caller_context_ in the _call_request_ must not be empty. Specifically, the following values of the caller must not be zeros:
      - _msg_sender_
@@ -71,7 +71,12 @@ For the _call_context_ in the [public_inputs](./private-function.md#public-input
    - The _storage_contract_address_ of the current iteration must not equal the _contract_address_:
      - _`call_context.storage_contract_address != call_stack_item.contract_address`_
 
-3. If it is an internal call (`call_stack_item.function_data.is_internal == true`):
+3. If it is NOT a static call: _`call_context.is_static_call == false`_
+
+   - The previous iteration must not be a static call:
+     - _`caller_context.is_static_call == false`_
+
+4. If it is an internal call: _`call_stack_item.function_data.is_internal == true`_
 
    - The _msg_sender_ of the current iteration must equal the _storage_contract_address_:
      - _`call_context.msg_sender == call_context.storage_contract_address`_
diff --git a/yellow-paper/docs/circuits/private-kernel-reset.md b/yellow-paper/docs/circuits/private-kernel-reset.md
index 7d7abb75a0ef..9570bce0571a 100644
--- a/yellow-paper/docs/circuits/private-kernel-reset.md
+++ b/yellow-paper/docs/circuits/private-kernel-reset.md
@@ -7,6 +7,7 @@ A **reset** circuit is designed to abstain from processing individual private fu
 There are 2 variations of reset circuits:
 
 - [Read Request Reset Private Kernel Circuit](#read-request-reset-private-kernel-circuit).
+- [Nullifier Key Validation Request Reset Private Kernel Circuit](#nullifier-key-validation-request-reset-private-kernel-circuit).
 - [Transient Note Reset Private Kernel Circuit](#transient-note-reset-private-kernel-circuit).
 
 The incorporation of these circuits not only enhances the modularity and repeatability of the "reset" process but also diminishes the overall workload. Rather than conducting resource-intensive computations such as membership checks in each iteration, these tasks are only performed as necessary within the reset circuits.
@@ -56,6 +57,25 @@ A read request can pertain to one of two note types:
    - If _status.state == transient_, _`i == transient_read_indices[status.index]`_.
    - If _status.state == nada_, _`read_request == public_inputs.transient_accumulated_data.read_request_contexts[status.index]`_.
 
+### Nullifier Key Validation Request Reset Private Kernel Circuit.
+
+This reset circuit validates the correct derivation of nullifier secret keys used in private functions, and subsequently removes them from the _nullifier_key_validation_request_contexts_ in the _[transient_accumulated_data](./private-kernel-initial.md#transientaccumulateddata)_ within the _public_inputs_ of the [_previous_kernel_](#previouskernel).
+
+Initialize _requests_kept_ to _0_.
+
+For each _request_ at index _i_ in _nullifier_key_validation_request_contexts_, locate the _master_secret_key_ at _`master_nullifier_secret_keys[i]`_, provided as [hints](#hints-for-nullifier-key-validation-request-reset-private-kernel-circuit) through _private_inputs_.
+
+1. If _`master_secret_key == 0`_, ensure the request remain within the _public_inputs_.:
+
+   - _`public_inputs.transient_accumulated_data.nullifier_key_validation_request_contexts[requests_kept] == request`_
+   - Increase _requests_kept_ by _1_: _`requests_kept += 1`_
+
+2. Else:
+   - Verify that the public key is associated with the _master_secret_key_:
+     _`request.public_key == master_secret_key * G`_
+   - Verify that the secret key was correctly derived for the contract:
+     _`request.secret_key == hash(master_secret_key, request.contract_address)`_
+
 ### Transient Note Reset Private Kernel Circuit.
 
 In the event that a pending note is nullified within the same transaction, its note hash, nullifier, and all encrypted note preimage hashes can be removed from the public inputs. This not only avoids redundant data being broadcasted, but also frees up space for additional note hashes and nullifiers in the subsequent iterations.
@@ -199,6 +219,12 @@ The format aligns with the _[PreviousKernel](./private-kernel-inner.md#previousk
 | _state_ | persistent \| transient \| nada | State of the read request.              |
 | _index_ | _field_                         | Index of the hint for the read request. |
 
+### _Hints_ for [Nullifier Key Validation Request Reset Private Kernel Circuit](#nullifier-key-validation-request-reset-private-kernel-circuit)
+
+| Field                          | Type           | Description                                                                                                                |
+| ------------------------------ | -------------- | -------------------------------------------------------------------------------------------------------------------------- |
+| _master_nullifier_secret_keys_ | [_field_; _C_] | Master nullifier secret keys for the nullifier keys. _C_ equals the length of _nullifier_key_validation_request_contexts_. |
+
 ### _Hints_ for [Transient Note Reset Private Kernel Circuit](#transient-note-reset-private-kernel-circuit)
 
 | Field                                      | Type           | Description                                                                                                                                             |
diff --git a/yellow-paper/docs/circuits/private-kernel-tail.md b/yellow-paper/docs/circuits/private-kernel-tail.md
index d75b1a34b049..4f7b27cd6766 100644
--- a/yellow-paper/docs/circuits/private-kernel-tail.md
+++ b/yellow-paper/docs/circuits/private-kernel-tail.md
@@ -29,6 +29,7 @@ It checks the data within _[private_inputs](#private-inputs).[previous_kernel](#
 2. The following must be empty to ensure a comprehensive final reset:
 
    - _read_requests_
+   - _nullifier_key_validation_request_contexts_
    - The _nullifier_counter_ associated with each note hash in _note_hash_contexts_.
    - The _note_hash_counter_ associated with each nullifier in _nullifier_contexts_.
 
diff --git a/yellow-paper/docs/public-vm/avm.md b/yellow-paper/docs/public-vm/avm.md
index 2f06f409f1ed..b3417afcb298 100644
--- a/yellow-paper/docs/public-vm/avm.md
+++ b/yellow-paper/docs/public-vm/avm.md
@@ -22,7 +22,7 @@ A **caller** is a contract call's initiator. The caller of an initial contract c
 
 - [**Public contract bytecode**](#public-contract-bytecode) (aka AVM bytecode)
 - [**Execution context**](#execution-context), outlining the AVM's environment and state
-- [**Execution**](#execution), outlining control flow, gas tracking, halting, and reverting
+- [**Execution**](#execution), outlining control flow, gas tracking, normal halting, and exceptional halting
 - [**Initial contract calls**](#initial-contract-calls), outlining the initiation of a contract call from a public execution request
 - [**Nested contract calls**](#nested-contract-calls), outlining the initiation of a contract call from an instruction as well as the processing of nested execution results, gas refunds, and state reverts
 
@@ -69,14 +69,13 @@ ExecutionEnvironment {
     address: AztecAddress,
     storageAddress: AztecAddress,
     origin: AztecAddress,
-    l1GasPrice: field,
-    l2GasPrice: field,
-    daGasPrice: field,
     sender: AztecAddress,
     portal: AztecAddress,
-    blockHeader: BlockHeader,
-    globalVariables: PublicGlobalVariables,
+    feePerL1Gas: field,
+    feePerL2Gas: field,
+    feePerDaGas: field,
     contractCallDepth: field,
+    globals: PublicGlobalVariables,
     isStaticCall: boolean,
     isDelegateCall: boolean,
     calldata: [field; <calldata-length>],
@@ -95,7 +94,7 @@ MachineState {
     daGasLeft: field,
     pc: field = 0,
     internalCallStack: Vector<field> = [], // initialized as empty
-    memory: [field; 32768] = [0, ..., 0],  // all 32768 (2^32) entries are initialized to zero
+    memory: [field; 2^32] = [0, ..., 0],   // all 2^32 entries are initialized to zero
 }
 ```
 
@@ -121,7 +120,7 @@ WorldState {
     contracts: AztecAddress => {bytecode, portalAddress}, // read-only from within AVM
     blockHeaders: Vector<BlockHeader>,                    // read-only from within AVM
     publicStorage: (AztecAddress, field) => value,        // read/write
-    l1ToL2Messages: (AztecAddress, field) => message,     // read-only from within AVM
+    l1ToL2Messages: field => message,                     // read-only from within AVM
     l2ToL1Messages: Vector<[field; <msg-length>]>,        // append-only (no reads) from within AVM
     noteHashes: Vector<field>,                            // append-only (no reads) from within AVM
     nullifiers: Vector<field>,                            // append-only (no reads) from within AVM
@@ -217,7 +216,7 @@ machineState.daGasLeft = 0
 
 An instruction's gas cost is meant to reflect the computational cost of generating a proof of its correct execution. For some instructions, this computational cost changes based on inputs. Here are some examples and important notes:
 - [`JUMP`](./instruction-set/#isa-section-jump) is an example of an instruction with constant gas cost. Regardless of its inputs, the instruction always incurs the same `l1GasCost`, `l2GasCost`, and `daGasCost`.
-- The [`SET`](./instruction-set/#isa-section-set) instruction operates on a different sized constant (based on its `dst-type`). Therefore, this instruction's gas cost increases with the size of its input.
+- The [`SET`](./instruction-set/#isa-section-set) instruction operates on a different sized constant (based on its `dstTag`). Therefore, this instruction's gas cost increases with the size of its input.
 - Instructions that operate on a data range of a specified "size" scale in cost with that size. An example of this is the [`CALLDATACOPY`](./instruction-set/#isa-section-calldatacopy) argument which copies `copySize` words from `environment.calldata` to `machineState.memory`.
 - The [`CALL`](./instruction-set/#isa-section-call)/[`STATICCALL`](./instruction-set/#isa-section-call)/`DELEGATECALL` instruction's gas cost is determined by its `*Gas` arguments, but any gas unused by the nested contract call's execution is refunded after its completion ([more on this later](#updating-the-calling-context-after-nested-call-halts)).
 - An instruction with "offset" arguments (like [`ADD`](./instruction-set/#isa-section-add) and many others), has increased cost for each offset argument that is flagged as "indirect".
@@ -226,11 +225,11 @@ An instruction's gas cost is meant to reflect the computational cost of generati
 
 > An instruction's gas cost takes into account the costs of associated downstream computations. An instruction that triggers accesses to the public data tree (`SLOAD`/`SSTORE`) incurs a cost that accounts for state access validation in later circuits (public kernel or rollup). A contract call instruction (`CALL`/`STATICCALL`/`DELEGATECALL`) incurs a cost accounting for the nested call's complete execution as well as any work required by the public kernel circuit for this additional call.
 
-## Halting
+### Halting
 
 A context's execution can end with a **normal halt** or **exceptional halt**. A halt ends execution within the current context and returns control flow to the calling context.
 
-### Normal halting
+#### Normal halting
 
 A normal halt occurs when the VM encounters an explicit halting instruction ([`RETURN`](./instruction-set#isa-section-return) or [`REVERT`](./instruction-set#isa-section-revert)). Such instructions consume gas normally and optionally initialize some output data before finally halting the current context's execution.
 
@@ -246,7 +245,7 @@ results.output = machineState.memory[instr.args.retOffset:instr.args.retOffset+i
 
 > `results.output` is only relevant when the caller is a contract call itself. In other words, it is only relevant for [nested contract calls](#nested-contract-calls). When an [initial contract call](#initial-contract-calls) (initiated by a public execution request) halts normally, its `results.output` is ignored.
 
-### Exceptional halting
+#### Exceptional halting
 
 An exceptional halt is not explicitly triggered by an instruction but instead occurs when an exceptional condition is met.
 
@@ -352,7 +351,7 @@ context = AvmContext {
     worldState = <latest world state>,
     journal = INITIAL_JOURNAL,
     accruedSubstate = INITIAL_ACCRUED_SUBSTATE,
-    results = INITIAL_MESSAGE_CALL_RESULTS,
+    results = INITIAL_CONTRACT_CALL_RESULTS,
 }
 ```
 
@@ -365,14 +364,13 @@ INITIAL_EXECUTION_ENVIRONMENT = ExecutionEnvironment {
     address = PublicCallRequest.contractAddress,
     storageAddress = PublicCallRequest.CallContext.storageContractAddress,
     origin = TxRequest.origin,
-    l1GasPrice = TxRequest.l1GasPrice,
-    l2GasPrice = TxRequest.l2GasPrice,
-    daGasPrice = TxRequest.daGasPrice,
     sender = PublicCallRequest.CallContext.msgSender,
     portal = PublicCallRequest.CallContext.portalContractAddress,
-    blockHeader = <latest block header>,
-    globalVariables = <latest global variable values>
+    feePerL1Gas = TxRequest.feePerL1Gas,
+    feePerL2Gas = TxRequest.feePerL2Gas,
+    feePerDaGas = TxRequest.feePerDaGas,
     contractCallDepth = 0,
+    globals = <latest global variable values>
     isStaticCall = PublicCallRequest.CallContext.isStaticCall,
     isDelegateCall = PublicCallRequest.CallContext.isDelegateCall,
     calldata = PublicCallRequest.args,
@@ -385,7 +383,7 @@ INITIAL_MACHINE_STATE = MachineState {
     daGasLeft = TxRequest.daGasLimit,
     pc = 0,
     internalCallStack = [], // initialized as empty
-    memory = [0, ..., 0],   // all 32768 (2^32) entries are initialized to zero
+    memory = [0, ..., 0],   // all 2^32 entries are initialized to zero
 }
 
 INITIAL_JOURNAL = Journal {
@@ -402,7 +400,7 @@ INITIAL_ACCRUED_SUBSTATE = AccruedSubstate {
     unencryptedLogs = [], // initialized as empty
 }
 
-INITIAL_MESSAGE_CALL_RESULTS = ContractCallResults {
+INITIAL_CONTRACT_CALL_RESULTS = ContractCallResults {
     reverted = false,
     output = [], // initialized as empty
 }
@@ -423,7 +421,7 @@ nestedContext = AvmContext {
     worldState: callingContext.worldState,
     journal: callingContext.journal,
     accruedSubstate: INITIAL_ACCRUED_SUBSTATE,
-    results: INITIAL_MESSAGE_CALL_RESULTS,
+    results: INITIAL_CONTRACT_CALL_RESULTS,
 }
 ```
 
@@ -442,17 +440,16 @@ calldataStart = instr.args.argsOffset
 calldataEnd = calldataStart + instr.args.argsSize
 
 nestedExecutionEnvironment = ExecutionEnvironment {
-    address: instr.args.addr,
-    storageAddress: isDelegateCall ? callingContext.environment.storageAddress : instr.args.addr,
     origin: callingContext.origin,
-    l1GasPrice: callingContext.l1GasPrice,
-    l2GasPrice: callingContext.l2GasPrice,
-    daGasPrice: callingContext.daGasPrice,
     sender: callingContext.address,
+    address: instr.args.addr,
+    storageAddress: isDelegateCall ? callingContext.environment.storageAddress : instr.args.addr,
     portal: contract.portal,
-    blockHeader: callingContext.blockHeader,
-    globalVariables: callingContext.globalVariables,
+    feePerL1Gas: callingContext.feePerL1Gas,
+    feePerL2Gas: callingContext.feePerL2Gas,
+    feePerDaGas: callingContext.feePerDaGas,
     contractCallDepth: callingContext.contractCallDepth + 1,
+    globals: callingContext.globals,
     isStaticCall: isStaticCall,
     isDelegateCall: isDelegateCall,
     calldata: callingContext.memory[calldataStart:calldataEnd],
@@ -465,7 +462,7 @@ nestedMachineState = MachineState {
     daGasLeft: callingContext.machineState.memory[instr.args.gasOffset+2],
     pc = 0,
     internalCallStack = [], // initialized as empty
-    memory = [0, ..., 0],   // all 32768 (2^32) entries are initialized to zero
+    memory = [0, ..., 0],   // all 2^32 entries are initialized to zero
 }
 ```
 > The nested context's machine state's `*GasLeft` is initialized based on the call instruction's `gasOffset` argument. The caller allocates some amount of L1, L2, and DA gas to the nested call. It does so using the instruction's `gasOffset` argument. In particular, prior to the contract call instruction, the caller populates `M[gasOffset]` with the nested context's initial `l1GasLeft`. Likewise it populates `M[gasOffset+1]` with `l2GasLeft` and `M[gasOffset+2]` with `daGasLeft`.
diff --git a/yellow-paper/docs/public-vm/gen/_InstructionSet.mdx b/yellow-paper/docs/public-vm/gen/_InstructionSet.mdx
index c362c88b8406..4a28d65d2da1 100644
--- a/yellow-paper/docs/public-vm/gen/_InstructionSet.mdx
+++ b/yellow-paper/docs/public-vm/gen/_InstructionSet.mdx
@@ -31,7 +31,7 @@ Click on an instruction name to jump to its section.
 </tr>
 <tr>
 	<td style={{'text-align': 'center'}}>0x02</td>	<td style={{'text-align': 'center'}}><a id='isa-table-mul'/><Markdown>[`MUL`](#isa-section-mul)</Markdown></td>
-	<td><Markdown>Subtraction (a - b)</Markdown></td>
+	<td><Markdown>Multiplication (a * b)</Markdown></td>
 	<td><Markdown>128</Markdown></td>
 	<td><CodeBlock language="jsx">{
 		`M[dstOffset] = M[aOffset] * M[bOffset] mod 2^k`
@@ -122,1330 +122,1377 @@ Click on an instruction name to jump to its section.
 	<td><Markdown>Type cast</Markdown></td>
 	<td><Markdown>96</Markdown></td>
 	<td><CodeBlock language="jsx">{
-		`M[dstOffset] = cast<dst-tag>(M[aOffset])`
+		`M[dstOffset] = cast<dstTag>(M[aOffset])`
 	}</CodeBlock></td>
 </tr>
 <tr>
-	<td style={{'text-align': 'center'}}>0x0e</td>	<td style={{'text-align': 'center'}}><a id='isa-table-set'/><Markdown>[`SET`](#isa-section-set)</Markdown></td>
-	<td><Markdown>Set a memory word from a constant in the bytecode.</Markdown></td>
-	<td><Markdown>64+N</Markdown></td>
+	<td style={{'text-align': 'center'}}>0x0e</td>	<td style={{'text-align': 'center'}}><a id='isa-table-address'/><Markdown>[`ADDRESS`](#isa-section-address)</Markdown></td>
+	<td><Markdown>Get the address of the currently executing l2 contract</Markdown></td>
+	<td><Markdown>56</Markdown></td>
 	<td><CodeBlock language="jsx">{
-		`M[dstOffset] = const`
+		`M[dstOffset] = context.environment.address`
 	}</CodeBlock></td>
 </tr>
 <tr>
-	<td style={{'text-align': 'center'}}>0x0f</td>	<td style={{'text-align': 'center'}}><a id='isa-table-mov'/><Markdown>[`MOV`](#isa-section-mov)</Markdown></td>
-	<td><Markdown>Move a word from source memory location to destination`.</Markdown></td>
-	<td><Markdown>88</Markdown></td>
+	<td style={{'text-align': 'center'}}>0x0f</td>	<td style={{'text-align': 'center'}}><a id='isa-table-storageaddress'/><Markdown>[`STORAGEADDRESS`](#isa-section-storageaddress)</Markdown></td>
+	<td><Markdown>Get the _storage_ address of the currently executing context</Markdown></td>
+	<td><Markdown>56</Markdown></td>
 	<td><CodeBlock language="jsx">{
-		`M[dstOffset] = M[srcOffset]`
+		`M[dstOffset] = context.environment.storageAddress`
 	}</CodeBlock></td>
 </tr>
 <tr>
-	<td style={{'text-align': 'center'}}>0x10</td>	<td style={{'text-align': 'center'}}><a id='isa-table-cmov'/><Markdown>[`CMOV`](#isa-section-cmov)</Markdown></td>
-	<td><Markdown>Move a word (conditionally chosen) from one memory location to another (`d = cond &gt; 0 ? a : b`).</Markdown></td>
-	<td><Markdown>152</Markdown></td>
+	<td style={{'text-align': 'center'}}>0x10</td>	<td style={{'text-align': 'center'}}><a id='isa-table-origin'/><Markdown>[`ORIGIN`](#isa-section-origin)</Markdown></td>
+	<td><Markdown>Get the transaction's origination address</Markdown></td>
+	<td><Markdown>56</Markdown></td>
 	<td><CodeBlock language="jsx">{
-		`M[dstOffset] = M[condOffset] > 0 ? M[aOffset] : M[bOffset]`
+		`M[dstOffset] = context.environment.origin`
 	}</CodeBlock></td>
 </tr>
 <tr>
-	<td style={{'text-align': 'center'}}>0x11</td>	<td style={{'text-align': 'center'}}><a id='isa-table-calldatacopy'/><Markdown>[`CALLDATACOPY`](#isa-section-calldatacopy)</Markdown></td>
-	<td><Markdown>Copy calldata into memory.</Markdown></td>
-	<td><Markdown>120</Markdown></td>
+	<td style={{'text-align': 'center'}}>0x11</td>	<td style={{'text-align': 'center'}}><a id='isa-table-sender'/><Markdown>[`SENDER`](#isa-section-sender)</Markdown></td>
+	<td><Markdown>Get the address of the sender (caller of the current context)</Markdown></td>
+	<td><Markdown>56</Markdown></td>
 	<td><CodeBlock language="jsx">{
-		`M[dstOffset:dstOffset+copySize] = calldata[cdOffset:cdOffset+copySize]`
+		`M[dstOffset] = context.environment.sender`
 	}</CodeBlock></td>
 </tr>
 <tr>
-	<td style={{'text-align': 'center'}}>0x12</td>	<td style={{'text-align': 'center'}}><a id='isa-table-sload'/><Markdown>[`SLOAD`](#isa-section-sload)</Markdown></td>
-	<td><Markdown>Load a word from storage.</Markdown></td>
-	<td><Markdown>88</Markdown></td>
+	<td style={{'text-align': 'center'}}>0x12</td>	<td style={{'text-align': 'center'}}><a id='isa-table-portal'/><Markdown>[`PORTAL`](#isa-section-portal)</Markdown></td>
+	<td><Markdown>Get the address of the l1 portal contract</Markdown></td>
+	<td><Markdown>56</Markdown></td>
 	<td><CodeBlock language="jsx">{
-		`M[dstOffset] = storage[M[slotOffset]]`
+		`M[dstOffset] = context.environment.portal`
 	}</CodeBlock></td>
 </tr>
 <tr>
-	<td style={{'text-align': 'center'}}>0x13</td>	<td style={{'text-align': 'center'}}><a id='isa-table-sstore'/><Markdown>[`SSTORE`](#isa-section-sstore)</Markdown></td>
-	<td><Markdown>Write a word to storage.</Markdown></td>
-	<td><Markdown>88</Markdown></td>
+	<td style={{'text-align': 'center'}}>0x13</td>	<td style={{'text-align': 'center'}}><a id='isa-table-feeperl1gas'/><Markdown>[`FEEPERL1GAS`](#isa-section-feeperl1gas)</Markdown></td>
+	<td><Markdown>Get the fee to be paid per "L1 gas" - constant for entire transaction</Markdown></td>
+	<td><Markdown>56</Markdown></td>
 	<td><CodeBlock language="jsx">{
-		`storage[M[slotOffset]] = M[srcOffset]`
+		`M[dstOffset] = context.environment.feePerL1Gas`
 	}</CodeBlock></td>
 </tr>
 <tr>
-	<td style={{'text-align': 'center'}}>0x14</td>	<td style={{'text-align': 'center'}}><a id='isa-table-emitnotehash'/><Markdown>[`EMITNOTEHASH`](#isa-section-emitnotehash)</Markdown></td>
-	<td><Markdown>Emit a new note hash to be inserted into the notes tree</Markdown></td>
+	<td style={{'text-align': 'center'}}>0x14</td>	<td style={{'text-align': 'center'}}><a id='isa-table-feeperl2gas'/><Markdown>[`FEEPERL2GAS`](#isa-section-feeperl2gas)</Markdown></td>
+	<td><Markdown>Get the fee to be paid per "L2 gas" - constant for entire transaction</Markdown></td>
 	<td><Markdown>56</Markdown></td>
-	<td><Markdown>emitNoteHash(M[contentOffset])</Markdown></td>
+	<td><CodeBlock language="jsx">{
+		`M[dstOffset] = context.environment.feePerL2Gas`
+	}</CodeBlock></td>
 </tr>
 <tr>
-	<td style={{'text-align': 'center'}}>0x15</td>	<td style={{'text-align': 'center'}}><a id='isa-table-emitnullifier'/><Markdown>[`EMITNULLIFIER`](#isa-section-emitnullifier)</Markdown></td>
-	<td><Markdown>Emit a new nullifier to be inserted into the nullifier tree</Markdown></td>
+	<td style={{'text-align': 'center'}}>0x15</td>	<td style={{'text-align': 'center'}}><a id='isa-table-feeperdagas'/><Markdown>[`FEEPERDAGAS`](#isa-section-feeperdagas)</Markdown></td>
+	<td><Markdown>Get the fee to be paid per "DA gas" - constant for entire transaction</Markdown></td>
 	<td><Markdown>56</Markdown></td>
-	<td><Markdown>emitNullifier(M[nullifierOffset])</Markdown></td>
+	<td><CodeBlock language="jsx">{
+		`M[dstOffset] = context.environment.feePerDaGas`
+	}</CodeBlock></td>
 </tr>
 <tr>
-	<td style={{'text-align': 'center'}}>0x16</td>	<td style={{'text-align': 'center'}}><a id='isa-table-sendl2tol1msg'/><Markdown>[`SENDL2TOL1MSG`](#isa-section-sendl2tol1msg)</Markdown></td>
-	<td><Markdown>Send an L2-to-L1 message</Markdown></td>
+	<td style={{'text-align': 'center'}}>0x16</td>	<td style={{'text-align': 'center'}}><a id='isa-table-contractcalldepth'/><Markdown>[`CONTRACTCALLDEPTH`](#isa-section-contractcalldepth)</Markdown></td>
+	<td><Markdown>Get how many contract calls deep the current call context is</Markdown></td>
 	<td><Markdown>56</Markdown></td>
-	<td><Markdown>sendL2ToL1Message(M[contentOffset])</Markdown></td>
-</tr>
-<tr>
-	<td style={{'text-align': 'center'}}>0x17</td>	<td style={{'text-align': 'center'}}><a id='isa-table-jump'/><Markdown>[`JUMP`](#isa-section-jump)</Markdown></td>
-	<td><Markdown>Jump to a location in the bytecode.</Markdown></td>
-	<td><Markdown>48</Markdown></td>
 	<td><CodeBlock language="jsx">{
-		`PC = loc`
+		`M[dstOffset] = context.environment.contractCallDepth`
 	}</CodeBlock></td>
 </tr>
 <tr>
-	<td style={{'text-align': 'center'}}>0x18</td>	<td style={{'text-align': 'center'}}><a id='isa-table-jumpi'/><Markdown>[`JUMPI`](#isa-section-jumpi)</Markdown></td>
-	<td><Markdown>Conditionally jump to a location in the bytecode.</Markdown></td>
-	<td><Markdown>88</Markdown></td>
+	<td style={{'text-align': 'center'}}>0x17</td>	<td style={{'text-align': 'center'}}><a id='isa-table-chainid'/><Markdown>[`CHAINID`](#isa-section-chainid)</Markdown></td>
+	<td><Markdown>Get this rollup's L1 chain ID</Markdown></td>
+	<td><Markdown>56</Markdown></td>
 	<td><CodeBlock language="jsx">{
-		`PC = M[condOffset] > 0 ? loc : PC`
+		`M[dstOffset] = context.environment.globals.chainId`
 	}</CodeBlock></td>
 </tr>
 <tr>
-	<td style={{'text-align': 'center'}}>0x19</td>	<td style={{'text-align': 'center'}}><a id='isa-table-return'/><Markdown>[`RETURN`](#isa-section-return)</Markdown></td>
-	<td><Markdown>Halt execution with `success`, optionally returning some data.</Markdown></td>
-	<td><Markdown>88</Markdown></td>
+	<td style={{'text-align': 'center'}}>0x18</td>	<td style={{'text-align': 'center'}}><a id='isa-table-version'/><Markdown>[`VERSION`](#isa-section-version)</Markdown></td>
+	<td><Markdown>Get this rollup's L2 version ID</Markdown></td>
+	<td><Markdown>56</Markdown></td>
 	<td><CodeBlock language="jsx">{
-		`return(M[retOffset:retOffset+retSize])`
+		`M[dstOffset] = context.environment.globals.version`
 	}</CodeBlock></td>
 </tr>
 <tr>
-	<td style={{'text-align': 'center'}}>0x1a</td>	<td style={{'text-align': 'center'}}><a id='isa-table-revert'/><Markdown>[`REVERT`](#isa-section-revert)</Markdown></td>
-	<td><Markdown>Halt execution with `failure`, reverting state changes and optionally returning some data.</Markdown></td>
-	<td><Markdown>88</Markdown></td>
+	<td style={{'text-align': 'center'}}>0x19</td>	<td style={{'text-align': 'center'}}><a id='isa-table-blocknumber'/><Markdown>[`BLOCKNUMBER`](#isa-section-blocknumber)</Markdown></td>
+	<td><Markdown>Get this L2 block's number</Markdown></td>
+	<td><Markdown>56</Markdown></td>
 	<td><CodeBlock language="jsx">{
-		`revert(M[retOffset:retOffset+retSize])`
+		`M[dstOffset] = context.environment.globals.blocknumber`
 	}</CodeBlock></td>
 </tr>
 <tr>
-	<td style={{'text-align': 'center'}}>0x1b</td>	<td style={{'text-align': 'center'}}><a id='isa-table-call'/><Markdown>[`CALL`](#isa-section-call)</Markdown></td>
-	<td><Markdown>Call into another contract.</Markdown></td>
-	<td><Markdown>248</Markdown></td>
-	<td><CodeBlock language="jsx">
-{`M[successOffset] = call(
-    M[gasOffset], M[gasOffset+1], M[addrOffset],
-    M[argsOffset], M[argsSize],
-    M[retOffset], M[retSize])`}
-	</CodeBlock></td>
-</tr>
-<tr>
-	<td style={{'text-align': 'center'}}>0x1c</td>	<td style={{'text-align': 'center'}}><a id='isa-table-staticcall'/><Markdown>[`STATICCALL`](#isa-section-staticcall)</Markdown></td>
-	<td><Markdown>Call into another contract, disallowing persistent state modifications.</Markdown></td>
-	<td><Markdown>248</Markdown></td>
-	<td><CodeBlock language="jsx">
-{`M[successOffset] = staticcall(
-    M[gasOffset], M[gasOffset+1], M[addrOffset],
-    M[argsOffset], M[argsSize],
-    M[retOffset], M[retSize])`}
-	</CodeBlock></td>
+	<td style={{'text-align': 'center'}}>0x1a</td>	<td style={{'text-align': 'center'}}><a id='isa-table-timestamp'/><Markdown>[`TIMESTAMP`](#isa-section-timestamp)</Markdown></td>
+	<td><Markdown>Get this L2 block's timestamp</Markdown></td>
+	<td><Markdown>56</Markdown></td>
+	<td><CodeBlock language="jsx">{
+		`M[dstOffset] = context.environment.globals.timestamp`
+	}</CodeBlock></td>
 </tr>
 <tr>
-	<td style={{'text-align': 'center'}}>0x1d</td>	<td style={{'text-align': 'center'}}><a id='isa-table-ulog'/><Markdown>[`ULOG`](#isa-section-ulog)</Markdown></td>
-	<td><Markdown>Emit an unencrypted log with data from the `field` memory page</Markdown></td>
-	<td><Markdown>88</Markdown></td>
+	<td style={{'text-align': 'center'}}>0x1b</td>	<td style={{'text-align': 'center'}}><a id='isa-table-coinbase'/><Markdown>[`COINBASE`](#isa-section-coinbase)</Markdown></td>
+	<td><Markdown>Get the block's beneficiary address</Markdown></td>
+	<td><Markdown>56</Markdown></td>
 	<td><CodeBlock language="jsx">{
-		`ulog(M[logOffset:logOffset+logSize])`
+		`M[dstOffset] = context.environment.globals.coinbase`
 	}</CodeBlock></td>
 </tr>
 <tr>
-	<td style={{'text-align': 'center'}}>0x1e</td>	<td style={{'text-align': 'center'}}><a id='isa-table-chainid'/><Markdown>[`CHAINID`](#isa-section-chainid)</Markdown></td>
-	<td><Markdown>Get this rollup's L1 chain ID</Markdown></td>
+	<td style={{'text-align': 'center'}}>0x1c</td>	<td style={{'text-align': 'center'}}><a id='isa-table-blockl1gaslimit'/><Markdown>[`BLOCKL1GASLIMIT`](#isa-section-blockl1gaslimit)</Markdown></td>
+	<td><Markdown>Total amount of "L1 gas" that a block can consume</Markdown></td>
 	<td><Markdown>56</Markdown></td>
 	<td><CodeBlock language="jsx">{
-		`M[dstOffset] = Globals.chainId`
+		`M[dstOffset] = context.environment.globals.l1GasLimit`
 	}</CodeBlock></td>
 </tr>
 <tr>
-	<td style={{'text-align': 'center'}}>0x1f</td>	<td style={{'text-align': 'center'}}><a id='isa-table-version'/><Markdown>[`VERSION`](#isa-section-version)</Markdown></td>
-	<td><Markdown>Get this rollup's L2 version ID</Markdown></td>
+	<td style={{'text-align': 'center'}}>0x1d</td>	<td style={{'text-align': 'center'}}><a id='isa-table-blockl2gaslimit'/><Markdown>[`BLOCKL2GASLIMIT`](#isa-section-blockl2gaslimit)</Markdown></td>
+	<td><Markdown>Total amount of "L2 gas" that a block can consume</Markdown></td>
 	<td><Markdown>56</Markdown></td>
 	<td><CodeBlock language="jsx">{
-		`M[dstOffset] = Globals.version`
+		`M[dstOffset] = context.environment.globals.l2GasLimit`
 	}</CodeBlock></td>
 </tr>
 <tr>
-	<td style={{'text-align': 'center'}}>0x20</td>	<td style={{'text-align': 'center'}}><a id='isa-table-blocknumber'/><Markdown>[`BLOCKNUMBER`](#isa-section-blocknumber)</Markdown></td>
-	<td><Markdown>Get this block's number</Markdown></td>
+	<td style={{'text-align': 'center'}}>0x1e</td>	<td style={{'text-align': 'center'}}><a id='isa-table-blockdagaslimit'/><Markdown>[`BLOCKDAGASLIMIT`](#isa-section-blockdagaslimit)</Markdown></td>
+	<td><Markdown>Total amount of "DA gas" that a block can consume</Markdown></td>
 	<td><Markdown>56</Markdown></td>
 	<td><CodeBlock language="jsx">{
-		`M[dstOffset] = Globals.blocknumber`
+		`M[dstOffset] = context.environment.globals.daGasLimit`
 	}</CodeBlock></td>
 </tr>
 <tr>
-	<td style={{'text-align': 'center'}}>0x21</td>	<td style={{'text-align': 'center'}}><a id='isa-table-timestamp'/><Markdown>[`TIMESTAMP`](#isa-section-timestamp)</Markdown></td>
-	<td><Markdown>Get this L2 block's timestamp</Markdown></td>
-	<td><Markdown>56</Markdown></td>
+	<td style={{'text-align': 'center'}}>0x1f</td>	<td style={{'text-align': 'center'}}><a id='isa-table-calldatacopy'/><Markdown>[`CALLDATACOPY`](#isa-section-calldatacopy)</Markdown></td>
+	<td><Markdown>Copy calldata into memory</Markdown></td>
+	<td><Markdown>120</Markdown></td>
 	<td><CodeBlock language="jsx">{
-		`M[dstOffset] = Globals.timestamp`
+		`M[dstOffset:dstOffset+copySize] = context.environment.calldata[cdOffset:cdOffset+copySize]`
 	}</CodeBlock></td>
 </tr>
 <tr>
-	<td style={{'text-align': 'center'}}>0x22</td>	<td style={{'text-align': 'center'}}><a id='isa-table-coinbase'/><Markdown>[`COINBASE`](#isa-section-coinbase)</Markdown></td>
-	<td><Markdown>Get the block's beneficiary address</Markdown></td>
+	<td style={{'text-align': 'center'}}>0x20</td>	<td style={{'text-align': 'center'}}><a id='isa-table-l1gasleft'/><Markdown>[`L1GASLEFT`](#isa-section-l1gasleft)</Markdown></td>
+	<td><Markdown>Remaining "L1 gas" for this call (after this instruction)</Markdown></td>
 	<td><Markdown>56</Markdown></td>
 	<td><CodeBlock language="jsx">{
-		`M[dstOffset] = Globals.coinbase`
+		`M[dstOffset] = context.machineState.l1GasLeft`
 	}</CodeBlock></td>
 </tr>
 <tr>
-	<td style={{'text-align': 'center'}}>0x23</td>	<td style={{'text-align': 'center'}}><a id='isa-table-blockl1gaslimit'/><Markdown>[`BLOCKL1GASLIMIT`](#isa-section-blockl1gaslimit)</Markdown></td>
-	<td><Markdown>Total amount of "L1 gas" that a block can consume</Markdown></td>
+	<td style={{'text-align': 'center'}}>0x21</td>	<td style={{'text-align': 'center'}}><a id='isa-table-l2gasleft'/><Markdown>[`L2GASLEFT`](#isa-section-l2gasleft)</Markdown></td>
+	<td><Markdown>Remaining "L2 gas" for this call (after this instruction)</Markdown></td>
 	<td><Markdown>56</Markdown></td>
 	<td><CodeBlock language="jsx">{
-		`M[dstOffset] = Globals.l1GasLimit`
+		`M[dstOffset] = context.MachineState.l2GasLeft`
 	}</CodeBlock></td>
 </tr>
 <tr>
-	<td style={{'text-align': 'center'}}>0x24</td>	<td style={{'text-align': 'center'}}><a id='isa-table-blockl2gaslimit'/><Markdown>[`BLOCKL2GASLIMIT`](#isa-section-blockl2gaslimit)</Markdown></td>
-	<td><Markdown>Total amount of "L2 gas" that a block can consume</Markdown></td>
+	<td style={{'text-align': 'center'}}>0x22</td>	<td style={{'text-align': 'center'}}><a id='isa-table-dagasleft'/><Markdown>[`DAGASLEFT`](#isa-section-dagasleft)</Markdown></td>
+	<td><Markdown>Remaining "DA gas" for this call (after this instruction)</Markdown></td>
 	<td><Markdown>56</Markdown></td>
 	<td><CodeBlock language="jsx">{
-		`M[dstOffset] = Globals.l2GasLimit`
+		`M[dstOffset] = context.machineState.daGasLeft`
 	}</CodeBlock></td>
 </tr>
 <tr>
-	<td style={{'text-align': 'center'}}>0x25</td>	<td style={{'text-align': 'center'}}><a id='isa-table-notesroot'/><Markdown>[`NOTESROOT`](#isa-section-notesroot)</Markdown></td>
-	<td><Markdown>Get the historical note-hash tree root as of the specified block number.</Markdown></td>
-	<td><Markdown>88</Markdown></td>
+	<td style={{'text-align': 'center'}}>0x23</td>	<td style={{'text-align': 'center'}}><a id='isa-table-jump'/><Markdown>[`JUMP`](#isa-section-jump)</Markdown></td>
+	<td><Markdown>Jump to a location in the bytecode</Markdown></td>
+	<td><Markdown>48</Markdown></td>
 	<td><CodeBlock language="jsx">{
-		`M[dstOffset] = HistoricalBlockData[M[blockNumOffset]].note_hash_tree_root`
+		`context.machineState.pc = loc`
 	}</CodeBlock></td>
 </tr>
 <tr>
-	<td style={{'text-align': 'center'}}>0x26</td>	<td style={{'text-align': 'center'}}><a id='isa-table-nullroot'/><Markdown>[`NULLIFIERSROOT`](#isa-section-nullroot)</Markdown></td>
-	<td><Markdown>Get the historical nullifier tree root as of the specified block number.</Markdown></td>
+	<td style={{'text-align': 'center'}}>0x24</td>	<td style={{'text-align': 'center'}}><a id='isa-table-jumpi'/><Markdown>[`JUMPI`](#isa-section-jumpi)</Markdown></td>
+	<td><Markdown>Conditionally jump to a location in the bytecode</Markdown></td>
 	<td><Markdown>88</Markdown></td>
 	<td><CodeBlock language="jsx">{
-		`M[dstOffset] = HistoricalBlockData[M[blockNumOffset]].nullifier_tree_root`
+		`context.machineState.pc = M[condOffset] > 0 ? loc : context.machineState.pc`
 	}</CodeBlock></td>
 </tr>
 <tr>
-	<td style={{'text-align': 'center'}}>0x27</td>	<td style={{'text-align': 'center'}}><a id='isa-table-contractsroot'/><Markdown>[`CONTRACTSROOT`](#isa-section-contractsroot)</Markdown></td>
-	<td><Markdown>Get the historical contracts tree root as of the specified block number.</Markdown></td>
-	<td><Markdown>88</Markdown></td>
+	<td style={{'text-align': 'center'}}>0x25</td>	<td style={{'text-align': 'center'}}><a id='isa-table-internalcall'/><Markdown>[`INTERNALCALL`](#isa-section-internalcall)</Markdown></td>
+	<td><Markdown>Make an internal call. Push the current PC to the internal call stack and jump to the target location.</Markdown></td>
+	<td><Markdown>48</Markdown></td>
+	<td><CodeBlock language="jsx">
+{`context.machineState.internalCallStack.push(context.machineState.pc)
+context.machineState.pc = loc`}
+	</CodeBlock></td>
+</tr>
+<tr>
+	<td style={{'text-align': 'center'}}>0x26</td>	<td style={{'text-align': 'center'}}><a id='isa-table-internalreturn'/><Markdown>[`INTERNALRETURN`](#isa-section-internalreturn)</Markdown></td>
+	<td><Markdown>Return from an internal call. Pop from the internal call stack and jump to the popped location.</Markdown></td>
+	<td><Markdown>16</Markdown></td>
 	<td><CodeBlock language="jsx">{
-		`M[dstOffset] = HistoricalBlockData[M[blockNumOffset]].contracts_tree_root`
+		`context.machineState.pc = context.machineState.internalCallStack.pop()`
 	}</CodeBlock></td>
 </tr>
 <tr>
-	<td style={{'text-align': 'center'}}>0x28</td>	<td style={{'text-align': 'center'}}><a id='isa-table-msgsroot'/><Markdown>[`MSGSROOT`](#isa-section-msgsroot)</Markdown></td>
-	<td><Markdown>Get the historical l1-to-l2 message tree root as of the specified block number.</Markdown></td>
-	<td><Markdown>88</Markdown></td>
+	<td style={{'text-align': 'center'}}>0x27</td>	<td style={{'text-align': 'center'}}><a id='isa-table-set'/><Markdown>[`SET`](#isa-section-set)</Markdown></td>
+	<td><Markdown>Set a memory word from a constant in the bytecode</Markdown></td>
+	<td><Markdown>64+N</Markdown></td>
 	<td><CodeBlock language="jsx">{
-		`M[dstOffset] = HistoricalBlockData[M[blockNumOffset]].l1_to_l2_message_tree_root`
+		`M[dstOffset] = const`
 	}</CodeBlock></td>
 </tr>
 <tr>
-	<td style={{'text-align': 'center'}}>0x29</td>	<td style={{'text-align': 'center'}}><a id='isa-table-publicdataroot'/><Markdown>[`PUBLICDATAROOT`](#isa-section-publicdataroot)</Markdown></td>
-	<td><Markdown>Get the historical public data tree root as of the specified block number.</Markdown></td>
+	<td style={{'text-align': 'center'}}>0x28</td>	<td style={{'text-align': 'center'}}><a id='isa-table-mov'/><Markdown>[`MOV`](#isa-section-mov)</Markdown></td>
+	<td><Markdown>Move a word from source memory location to destination</Markdown></td>
 	<td><Markdown>88</Markdown></td>
 	<td><CodeBlock language="jsx">{
-		`M[dstOffset] = HistoricalBlockData[M[blockNumOffset]].public_data_tree_root`
+		`M[dstOffset] = M[srcOffset]`
 	}</CodeBlock></td>
 </tr>
 <tr>
-	<td style={{'text-align': 'center'}}>0x2a</td>	<td style={{'text-align': 'center'}}><a id='isa-table-globalshash'/><Markdown>[`GLOBALSHASH`](#isa-section-globalshash)</Markdown></td>
-	<td><Markdown>Get the historical global variables hash as of the specified block number.</Markdown></td>
-	<td><Markdown>88</Markdown></td>
+	<td style={{'text-align': 'center'}}>0x29</td>	<td style={{'text-align': 'center'}}><a id='isa-table-cmov'/><Markdown>[`CMOV`](#isa-section-cmov)</Markdown></td>
+	<td><Markdown>Move a word (conditionally chosen) from one memory location to another (`d = cond &gt; 0 ? a : b`)</Markdown></td>
+	<td><Markdown>152</Markdown></td>
 	<td><CodeBlock language="jsx">{
-		`M[dstOffset] = HistoricalBlockData[M[blockNumOffset]].global_variables_hash`
+		`M[dstOffset] = M[condOffset] > 0 ? M[aOffset] : M[bOffset]`
 	}</CodeBlock></td>
 </tr>
 <tr>
-	<td style={{'text-align': 'center'}}>0x2b</td>	<td style={{'text-align': 'center'}}><a id='isa-table-blocksroot'/><Markdown>[`BLOCKSROOT`](#isa-section-blocksroot)</Markdown></td>
-	<td><Markdown>Get the historical blocks tree root as of the specified block number.</Markdown></td>
+	<td style={{'text-align': 'center'}}>0x2a</td>	<td style={{'text-align': 'center'}}><a id='isa-table-blockheaderbynum'/><Markdown>[`BLOCKHEADERBYNUM`](#isa-section-blockheaderbynum)</Markdown></td>
+	<td><Markdown>Get the block header as of the specified block number</Markdown></td>
 	<td><Markdown>88</Markdown></td>
 	<td><CodeBlock language="jsx">{
-		`M[dstOffset] = HistoricalBlockData[M[blockNumOffset]].archive_root`
+		`M[dstOffset:dstOffset+BLOCK_HEADER_LENGTH] = context.worldState.blockHeader[M[blockNumOffset]]`
 	}</CodeBlock></td>
 </tr>
 <tr>
-	<td style={{'text-align': 'center'}}>0x2c</td>	<td style={{'text-align': 'center'}}><a id='isa-table-grandroot'/><Markdown>[`GRANDROOT`](#isa-section-grandroot)</Markdown></td>
-	<td><Markdown>Get the historical grandfather tree root as of the specified block number.</Markdown></td>
+	<td style={{'text-align': 'center'}}>0x2b</td>	<td style={{'text-align': 'center'}}><a id='isa-table-sload'/><Markdown>[`SLOAD`](#isa-section-sload)</Markdown></td>
+	<td><Markdown>Load a word from storage</Markdown></td>
 	<td><Markdown>88</Markdown></td>
 	<td><CodeBlock language="jsx">{
-		`M[dstOffset] = HistoricalBlockData[M[blockNumOffset]].grandfather_tree_root`
+		`M[dstOffset] = context.worldState.publicStorage[context.environment.storageAddress, M[slotOffset]]`
 	}</CodeBlock></td>
 </tr>
 <tr>
-	<td style={{'text-align': 'center'}}>0x2d</td>	<td style={{'text-align': 'center'}}><a id='isa-table-origin'/><Markdown>[`ORIGIN`](#isa-section-origin)</Markdown></td>
-	<td><Markdown>Get the transaction's origination address</Markdown></td>
-	<td><Markdown>56</Markdown></td>
+	<td style={{'text-align': 'center'}}>0x2c</td>	<td style={{'text-align': 'center'}}><a id='isa-table-sstore'/><Markdown>[`SSTORE`](#isa-section-sstore)</Markdown></td>
+	<td><Markdown>Write a word to storage</Markdown></td>
+	<td><Markdown>88</Markdown></td>
 	<td><CodeBlock language="jsx">{
-		`M[dstOffset] = TxContext.origin`
+		`context.worldState.publicStorage[context.environment.storageAddress, M[slotOffset]] = M[srcOffset]`
 	}</CodeBlock></td>
 </tr>
 <tr>
-	<td style={{'text-align': 'center'}}>0x2e</td>	<td style={{'text-align': 'center'}}><a id='isa-table-refundee'/><Markdown>[`REFUNDEE`](#isa-section-refundee)</Markdown></td>
-	<td><Markdown>The recipient of fee refunds for this transaction</Markdown></td>
-	<td><Markdown>56</Markdown></td>
+	<td style={{'text-align': 'center'}}>0x2d</td>	<td style={{'text-align': 'center'}}><a id='isa-table-readl1tol2msg'/><Markdown>[`READL1TOL2MSG`](#isa-section-readl1tol2msg)</Markdown></td>
+	<td><Markdown>Reads an L1-to-L2 message</Markdown></td>
+	<td><Markdown>120</Markdown></td>
 	<td><CodeBlock language="jsx">{
-		`M[dstOffset] = TxContext.refundee`
+		`M[dstOffset:dstOffset+msgSize] = context.worldState.l1ToL2Messages(M[msgKeyOffset])`
 	}</CodeBlock></td>
 </tr>
 <tr>
-	<td style={{'text-align': 'center'}}>0x2f</td>	<td style={{'text-align': 'center'}}><a id='isa-table-feeperl1gas'/><Markdown>[`FEEPERL1GAS`](#isa-section-feeperl1gas)</Markdown></td>
-	<td><Markdown>The fee to be paid per "L1 gas" - set by the transaction's original caller</Markdown></td>
-	<td><Markdown>56</Markdown></td>
+	<td style={{'text-align': 'center'}}>0x2e</td>	<td style={{'text-align': 'center'}}><a id='isa-table-sendl2tol1msg'/><Markdown>[`SENDL2TOL1MSG`](#isa-section-sendl2tol1msg)</Markdown></td>
+	<td><Markdown>Send an L2-to-L1 message</Markdown></td>
+	<td><Markdown>88</Markdown></td>
 	<td><CodeBlock language="jsx">{
-		`M[dstOffset] = TxContext.feePerL1Gas`
+		`context.worldState.l2ToL1Messages.append(M[msgOffset:msgOffset+msgSize])`
 	}</CodeBlock></td>
 </tr>
 <tr>
-	<td style={{'text-align': 'center'}}>0x30</td>	<td style={{'text-align': 'center'}}><a id='isa-table-feeperl2gas'/><Markdown>[`FEEPERL2GAS`](#isa-section-feeperl2gas)</Markdown></td>
-	<td><Markdown>The fee to be paid per "L2 gas" - set by the transaction's original caller</Markdown></td>
+	<td style={{'text-align': 'center'}}>0x2f</td>	<td style={{'text-align': 'center'}}><a id='isa-table-emitnotehash'/><Markdown>[`EMITNOTEHASH`](#isa-section-emitnotehash)</Markdown></td>
+	<td><Markdown>Emit a new note hash to be inserted into the notes tree</Markdown></td>
 	<td><Markdown>56</Markdown></td>
 	<td><CodeBlock language="jsx">{
-		`M[dstOffset] = TxContext.feePerL2Gas`
+		`context.worldState.newHashes.append(M[noteHashOffset])`
 	}</CodeBlock></td>
 </tr>
 <tr>
-	<td style={{'text-align': 'center'}}>0x31</td>	<td style={{'text-align': 'center'}}><a id='isa-table-caller'/><Markdown>[`CALLER`](#isa-section-caller)</Markdown></td>
-	<td><Markdown>Get the address of the sender (the caller's context)</Markdown></td>
+	<td style={{'text-align': 'center'}}>0x30</td>	<td style={{'text-align': 'center'}}><a id='isa-table-emitnullifier'/><Markdown>[`EMITNULLIFIER`](#isa-section-emitnullifier)</Markdown></td>
+	<td><Markdown>Emit a new nullifier to be inserted into the nullifier tree</Markdown></td>
 	<td><Markdown>56</Markdown></td>
 	<td><CodeBlock language="jsx">{
-		`M[dstOffset] = CallContext.sender`
+		`context.worldState.nullifiers.append(M[nullifierOffset])`
 	}</CodeBlock></td>
 </tr>
 <tr>
-	<td style={{'text-align': 'center'}}>0x32</td>	<td style={{'text-align': 'center'}}><a id='isa-table-address'/><Markdown>[`ADDRESS`](#isa-section-address)</Markdown></td>
-	<td><Markdown>Get the address of the currently executing l2 contract</Markdown></td>
-	<td><Markdown>56</Markdown></td>
+	<td style={{'text-align': 'center'}}>0x31</td>	<td style={{'text-align': 'center'}}><a id='isa-table-emitunencryptedlog'/><Markdown>[`EMITUNENCRYPTEDLOG`](#isa-section-emitunencryptedlog)</Markdown></td>
+	<td><Markdown>Emit an unencrypted log</Markdown></td>
+	<td><Markdown>88</Markdown></td>
 	<td><CodeBlock language="jsx">{
-		`M[dstOffset] = CallContext.storageContractAddress`
+		`context.accruedSubstate.unencryptedLogs.append(M[logOffset:logOffset+logSize])`
 	}</CodeBlock></td>
 </tr>
 <tr>
-	<td style={{'text-align': 'center'}}>0x33</td>	<td style={{'text-align': 'center'}}><a id='isa-table-portal'/><Markdown>[`PORTAL`](#isa-section-portal)</Markdown></td>
-	<td><Markdown>Get the address of the l1 portal contract</Markdown></td>
-	<td><Markdown>56</Markdown></td>
-	<td><CodeBlock language="jsx">{
-		`M[dstOffset] = CallContext.portalAddress`
-	}</CodeBlock></td>
+	<td style={{'text-align': 'center'}}>0x32</td>	<td style={{'text-align': 'center'}}><a id='isa-table-call'/><Markdown>[`CALL`](#isa-section-call)</Markdown></td>
+	<td><Markdown>Call into another contract</Markdown></td>
+	<td><Markdown>248</Markdown></td>
+	<td><CodeBlock language="jsx">
+{`M[successOffset] = call(
+    M[gasOffset], M[gasOffset+1], M[gasOffset+2],
+    M[addrOffset],
+    M[argsOffset], M[argsSize],
+    M[retOffset], M[retSize])`}
+	</CodeBlock></td>
 </tr>
 <tr>
-	<td style={{'text-align': 'center'}}>0x34</td>	<td style={{'text-align': 'center'}}><a id='isa-table-calldepth'/><Markdown>[`CALLDEPTH`](#isa-section-calldepth)</Markdown></td>
-	<td><Markdown>Get how many calls deep the current call context is</Markdown></td>
-	<td><Markdown>56</Markdown></td>
-	<td><CodeBlock language="jsx">{
-		`M[dstOffset] = CallContext.calldepth`
-	}</CodeBlock></td>
+	<td style={{'text-align': 'center'}}>0x33</td>	<td style={{'text-align': 'center'}}><a id='isa-table-staticcall'/><Markdown>[`STATICCALL`](#isa-section-staticcall)</Markdown></td>
+	<td><Markdown>Call into another contract, disallowing World State and Accrued Substate modifications</Markdown></td>
+	<td><Markdown>248</Markdown></td>
+	<td><CodeBlock language="jsx">
+{`M[successOffset] = staticcall(
+    M[gasOffset], M[gasOffset+1], M[gasOffset+2],
+    M[addrOffset],
+    M[argsOffset], M[argsSize],
+    M[retOffset], M[retSize])`}
+	</CodeBlock></td>
 </tr>
 <tr>
-	<td style={{'text-align': 'center'}}>0x35</td>	<td style={{'text-align': 'center'}}><a id='isa-table-l1gas'/><Markdown>[`L1GAS`](#isa-section-l1gas)</Markdown></td>
-	<td><Markdown>Remaining "L1 gas" for this call (after this instruction).</Markdown></td>
-	<td><Markdown>56</Markdown></td>
-	<td><CodeBlock language="jsx">{
-		`M[dstOffset] = LatestContext.l1Gas`
-	}</CodeBlock></td>
+	<td style={{'text-align': 'center'}}>0x34</td>	<td style={{'text-align': 'center'}}><a id='isa-table-return'/><Markdown>[`RETURN`](#isa-section-return)</Markdown></td>
+	<td><Markdown>Halt execution within this context (without revert), optionally returning some data</Markdown></td>
+	<td><Markdown>88</Markdown></td>
+	<td><CodeBlock language="jsx">
+{`context.contractCallResults.output = M[retOffset:retOffset+retSize]
+halt`}
+	</CodeBlock></td>
 </tr>
 <tr>
-	<td style={{'text-align': 'center'}}>0x36</td>	<td style={{'text-align': 'center'}}><a id='isa-table-l2gas'/><Markdown>[`L2GAS`](#isa-section-l2gas)</Markdown></td>
-	<td><Markdown>Remaining "L2 gas" for this call (after this instruction).</Markdown></td>
-	<td><Markdown>56</Markdown></td>
-	<td><CodeBlock language="jsx">{
-		`M[dstOffset] = LatestContext.l2Gas`
-	}</CodeBlock></td>
+	<td style={{'text-align': 'center'}}>0x35</td>	<td style={{'text-align': 'center'}}><a id='isa-table-revert'/><Markdown>[`REVERT`](#isa-section-revert)</Markdown></td>
+	<td><Markdown>Halt execution within this context as `reverted`, optionally returning some data</Markdown></td>
+	<td><Markdown>88</Markdown></td>
+	<td><CodeBlock language="jsx">
+{`context.contractCallResults.output = M[retOffset:retOffset+retSize]
+context.contractCallResults.reverted = true
+halt`}
+	</CodeBlock></td>
 </tr>
 </table>
 
 
 ## Instructions
 
-### <a id='isa-section-add'/>`ADD` (0x00)
+### <a id='isa-section-add'/>`ADD`
 Addition (a + b)
 
 [See in table.](#isa-table-add)
 
-- **Category**: arithmetic
+- **Opcode**: 0x00
+- **Category**: Compute - Arithmetic
 - **Flags**: 
 	- **indirect**: Toggles whether each memory-offset argument is an indirect offset. 0th bit corresponds to 0th offset arg, etc. Indirect offsets result in memory accesses like `M[M[offset]]` instead of the more standard `M[offset]`.
-	- **in-tag**: The [tag/size](./state-model#tags-and-tagged-memory) to check inputs against and tag the destination with.
+	- **inTag**: The [tag/size](./state-model#tags-and-tagged-memory) to check inputs against and tag the destination with.
 - **Args**: 
 	- **aOffset**: memory offset of the operation's left input
 	- **bOffset**: memory offset of the operation's right input
 	- **dstOffset**: memory offset specifying where to store operation's result
 - **Expression**: `M[dstOffset] = M[aOffset] + M[bOffset] mod 2^k`
-- **Tag checks**: `T[aOffset] == T[bOffset] == in-tag`
-- **Tag updates**: `T[dstOffset] = in-tag`
+- **Tag checks**: `T[aOffset] == T[bOffset] == inTag`
+- **Tag updates**: `T[dstOffset] = inTag`
 - **Bit-size**: 128
 
 [![](./images/bit-formats/ADD.png)](./images/bit-formats/ADD.png)
 
-### <a id='isa-section-sub'/>`SUB` (0x01)
+### <a id='isa-section-sub'/>`SUB`
 Subtraction (a - b)
 
 [See in table.](#isa-table-sub)
 
-- **Category**: arithmetic
+- **Opcode**: 0x01
+- **Category**: Compute - Arithmetic
 - **Flags**: 
 	- **indirect**: Toggles whether each memory-offset argument is an indirect offset. 0th bit corresponds to 0th offset arg, etc. Indirect offsets result in memory accesses like `M[M[offset]]` instead of the more standard `M[offset]`.
-	- **in-tag**: The [tag/size](./state-model#tags-and-tagged-memory) to check inputs against and tag the destination with.
+	- **inTag**: The [tag/size](./state-model#tags-and-tagged-memory) to check inputs against and tag the destination with.
 - **Args**: 
 	- **aOffset**: memory offset of the operation's left input
 	- **bOffset**: memory offset of the operation's right input
 	- **dstOffset**: memory offset specifying where to store operation's result
 - **Expression**: `M[dstOffset] = M[aOffset] - M[bOffset] mod 2^k`
-- **Tag checks**: `T[aOffset] == T[bOffset] == in-tag`
-- **Tag updates**: `T[dstOffset] = in-tag`
+- **Tag checks**: `T[aOffset] == T[bOffset] == inTag`
+- **Tag updates**: `T[dstOffset] = inTag`
 - **Bit-size**: 128
 
 [![](./images/bit-formats/SUB.png)](./images/bit-formats/SUB.png)
 
-### <a id='isa-section-mul'/>`MUL` (0x02)
-Subtraction (a - b)
+### <a id='isa-section-mul'/>`MUL`
+Multiplication (a * b)
 
 [See in table.](#isa-table-mul)
 
-- **Category**: arithmetic
+- **Opcode**: 0x02
+- **Category**: Compute - Arithmetic
 - **Flags**: 
 	- **indirect**: Toggles whether each memory-offset argument is an indirect offset. 0th bit corresponds to 0th offset arg, etc. Indirect offsets result in memory accesses like `M[M[offset]]` instead of the more standard `M[offset]`.
-	- **in-tag**: The [tag/size](./state-model#tags-and-tagged-memory) to check inputs against and tag the destination with.
+	- **inTag**: The [tag/size](./state-model#tags-and-tagged-memory) to check inputs against and tag the destination with.
 - **Args**: 
 	- **aOffset**: memory offset of the operation's left input
 	- **bOffset**: memory offset of the operation's right input
 	- **dstOffset**: memory offset specifying where to store operation's result
 - **Expression**: `M[dstOffset] = M[aOffset] * M[bOffset] mod 2^k`
-- **Tag checks**: `T[aOffset] == T[bOffset] == in-tag`
-- **Tag updates**: `T[dstOffset] = in-tag`
+- **Tag checks**: `T[aOffset] == T[bOffset] == inTag`
+- **Tag updates**: `T[dstOffset] = inTag`
 - **Bit-size**: 128
 
+[![](./images/bit-formats/MUL.png)](./images/bit-formats/MUL.png)
 
-### <a id='isa-section-div'/>`DIV` (0x03)
+### <a id='isa-section-div'/>`DIV`
 Unsigned division (a / b)
 
 [See in table.](#isa-table-div)
 
-- **Category**: arithmetic
+- **Opcode**: 0x03
+- **Category**: Compute - Arithmetic
 - **Flags**: 
 	- **indirect**: Toggles whether each memory-offset argument is an indirect offset. 0th bit corresponds to 0th offset arg, etc. Indirect offsets result in memory accesses like `M[M[offset]]` instead of the more standard `M[offset]`.
-	- **in-tag**: The [tag/size](./state-model#tags-and-tagged-memory) to check inputs against and tag the destination with.
+	- **inTag**: The [tag/size](./state-model#tags-and-tagged-memory) to check inputs against and tag the destination with.
 - **Args**: 
 	- **aOffset**: memory offset of the operation's left input
 	- **bOffset**: memory offset of the operation's right input
 	- **dstOffset**: memory offset specifying where to store operation's result
 - **Expression**: `M[dstOffset] = M[aOffset] / M[bOffset]`
-- **Tag checks**: `T[aOffset] == T[bOffset] == in-tag`
-- **Tag updates**: `T[dstOffset] = in-tag`
+- **Tag checks**: `T[aOffset] == T[bOffset] == inTag`
+- **Tag updates**: `T[dstOffset] = inTag`
 - **Bit-size**: 128
 
 [![](./images/bit-formats/DIV.png)](./images/bit-formats/DIV.png)
 
-### <a id='isa-section-eq'/>`EQ` (0x04)
+### <a id='isa-section-eq'/>`EQ`
 Equality check (a == b)
 
 [See in table.](#isa-table-eq)
 
-- **Category**: conditional
+- **Opcode**: 0x04
+- **Category**: Compute - Comparators
 - **Flags**: 
 	- **indirect**: Toggles whether each memory-offset argument is an indirect offset. 0th bit corresponds to 0th offset arg, etc. Indirect offsets result in memory accesses like `M[M[offset]]` instead of the more standard `M[offset]`.
-	- **in-tag**: The [tag/size](./state-model#tags-and-tagged-memory) to check inputs against and tag the destination with.
+	- **inTag**: The [tag/size](./state-model#tags-and-tagged-memory) to check inputs against and tag the destination with.
 - **Args**: 
 	- **aOffset**: memory offset of the operation's left input
 	- **bOffset**: memory offset of the operation's right input
 	- **dstOffset**: memory offset specifying where to store operation's result
 - **Expression**: `M[dstOffset] = M[aOffset] == M[bOffset] ? 1 : 0`
-- **Tag checks**: `T[aOffset] == T[bOffset] == in-tag`
-- **Tag updates**: `T[dstOffset] = in-tag`
+- **Tag checks**: `T[aOffset] == T[bOffset] == inTag`
+- **Tag updates**: `T[dstOffset] = inTag`
 - **Bit-size**: 128
 
 [![](./images/bit-formats/EQ.png)](./images/bit-formats/EQ.png)
 
-### <a id='isa-section-lt'/>`LT` (0x05)
+### <a id='isa-section-lt'/>`LT`
 Less-than check (a < b)
 
 [See in table.](#isa-table-lt)
 
-- **Category**: conditional
+- **Opcode**: 0x05
+- **Category**: Compute - Comparators
 - **Flags**: 
 	- **indirect**: Toggles whether each memory-offset argument is an indirect offset. 0th bit corresponds to 0th offset arg, etc. Indirect offsets result in memory accesses like `M[M[offset]]` instead of the more standard `M[offset]`.
-	- **in-tag**: The [tag/size](./state-model#tags-and-tagged-memory) to check inputs against and tag the destination with.
+	- **inTag**: The [tag/size](./state-model#tags-and-tagged-memory) to check inputs against and tag the destination with.
 - **Args**: 
 	- **aOffset**: memory offset of the operation's left input
 	- **bOffset**: memory offset of the operation's right input
 	- **dstOffset**: memory offset specifying where to store operation's result
 - **Expression**: `M[dstOffset] = M[aOffset] < M[bOffset] ? 1 : 0`
-- **Tag checks**: `T[aOffset] == T[bOffset] == in-tag`
-- **Tag updates**: `T[dstOffset] = in-tag`
+- **Tag checks**: `T[aOffset] == T[bOffset] == inTag`
+- **Tag updates**: `T[dstOffset] = inTag`
 - **Bit-size**: 128
 
 [![](./images/bit-formats/LT.png)](./images/bit-formats/LT.png)
 
-### <a id='isa-section-lte'/>`LTE` (0x06)
+### <a id='isa-section-lte'/>`LTE`
 Less-than-or-equals check (a <= b)
 
 [See in table.](#isa-table-lte)
 
-- **Category**: conditional
+- **Opcode**: 0x06
+- **Category**: Compute - Comparators
 - **Flags**: 
 	- **indirect**: Toggles whether each memory-offset argument is an indirect offset. 0th bit corresponds to 0th offset arg, etc. Indirect offsets result in memory accesses like `M[M[offset]]` instead of the more standard `M[offset]`.
-	- **in-tag**: The [tag/size](./state-model#tags-and-tagged-memory) to check inputs against and tag the destination with.
+	- **inTag**: The [tag/size](./state-model#tags-and-tagged-memory) to check inputs against and tag the destination with.
 - **Args**: 
 	- **aOffset**: memory offset of the operation's left input
 	- **bOffset**: memory offset of the operation's right input
 	- **dstOffset**: memory offset specifying where to store operation's result
 - **Expression**: `M[dstOffset] = M[aOffset] <= M[bOffset] ? 1 : 0`
-- **Tag checks**: `T[aOffset] == T[bOffset] == in-tag`
-- **Tag updates**: `T[dstOffset] = in-tag`
+- **Tag checks**: `T[aOffset] == T[bOffset] == inTag`
+- **Tag updates**: `T[dstOffset] = inTag`
 - **Bit-size**: 128
 
 [![](./images/bit-formats/LTE.png)](./images/bit-formats/LTE.png)
 
-### <a id='isa-section-and'/>`AND` (0x07)
+### <a id='isa-section-and'/>`AND`
 Bitwise AND (a & b)
 
 [See in table.](#isa-table-and)
 
-- **Category**: bitwise
+- **Opcode**: 0x07
+- **Category**: Compute - Bitwise
 - **Flags**: 
 	- **indirect**: Toggles whether each memory-offset argument is an indirect offset. 0th bit corresponds to 0th offset arg, etc. Indirect offsets result in memory accesses like `M[M[offset]]` instead of the more standard `M[offset]`.
-	- **in-tag**: The [tag/size](./state-model#tags-and-tagged-memory) to check inputs against and tag the destination with.
+	- **inTag**: The [tag/size](./state-model#tags-and-tagged-memory) to check inputs against and tag the destination with.
 - **Args**: 
 	- **aOffset**: memory offset of the operation's left input
 	- **bOffset**: memory offset of the operation's right input
 	- **dstOffset**: memory offset specifying where to store operation's result
 - **Expression**: `M[dstOffset] = M[aOffset] AND M[bOffset]`
-- **Tag checks**: `T[aOffset] == T[bOffset] == in-tag`
-- **Tag updates**: `T[dstOffset] = in-tag`
+- **Tag checks**: `T[aOffset] == T[bOffset] == inTag`
+- **Tag updates**: `T[dstOffset] = inTag`
 - **Bit-size**: 128
 
 [![](./images/bit-formats/AND.png)](./images/bit-formats/AND.png)
 
-### <a id='isa-section-or'/>`OR` (0x08)
+### <a id='isa-section-or'/>`OR`
 Bitwise OR (a | b)
 
 [See in table.](#isa-table-or)
 
-- **Category**: bitwise
+- **Opcode**: 0x08
+- **Category**: Compute - Bitwise
 - **Flags**: 
 	- **indirect**: Toggles whether each memory-offset argument is an indirect offset. 0th bit corresponds to 0th offset arg, etc. Indirect offsets result in memory accesses like `M[M[offset]]` instead of the more standard `M[offset]`.
-	- **in-tag**: The [tag/size](./state-model#tags-and-tagged-memory) to check inputs against and tag the destination with.
+	- **inTag**: The [tag/size](./state-model#tags-and-tagged-memory) to check inputs against and tag the destination with.
 - **Args**: 
 	- **aOffset**: memory offset of the operation's left input
 	- **bOffset**: memory offset of the operation's right input
 	- **dstOffset**: memory offset specifying where to store operation's result
 - **Expression**: `M[dstOffset] = M[aOffset] OR M[bOffset]`
-- **Tag checks**: `T[aOffset] == T[bOffset] == in-tag`
-- **Tag updates**: `T[dstOffset] = in-tag`
+- **Tag checks**: `T[aOffset] == T[bOffset] == inTag`
+- **Tag updates**: `T[dstOffset] = inTag`
 - **Bit-size**: 128
 
 [![](./images/bit-formats/OR.png)](./images/bit-formats/OR.png)
 
-### <a id='isa-section-xor'/>`XOR` (0x09)
+### <a id='isa-section-xor'/>`XOR`
 Bitwise XOR (a ^ b)
 
 [See in table.](#isa-table-xor)
 
-- **Category**: bitwise
+- **Opcode**: 0x09
+- **Category**: Compute - Bitwise
 - **Flags**: 
 	- **indirect**: Toggles whether each memory-offset argument is an indirect offset. 0th bit corresponds to 0th offset arg, etc. Indirect offsets result in memory accesses like `M[M[offset]]` instead of the more standard `M[offset]`.
-	- **in-tag**: The [tag/size](./state-model#tags-and-tagged-memory) to check inputs against and tag the destination with.
+	- **inTag**: The [tag/size](./state-model#tags-and-tagged-memory) to check inputs against and tag the destination with.
 - **Args**: 
 	- **aOffset**: memory offset of the operation's left input
 	- **bOffset**: memory offset of the operation's right input
 	- **dstOffset**: memory offset specifying where to store operation's result
 - **Expression**: `M[dstOffset] = M[aOffset] XOR M[bOffset]`
-- **Tag checks**: `T[aOffset] == T[bOffset] == in-tag`
-- **Tag updates**: `T[dstOffset] = in-tag`
+- **Tag checks**: `T[aOffset] == T[bOffset] == inTag`
+- **Tag updates**: `T[dstOffset] = inTag`
 - **Bit-size**: 128
 
 [![](./images/bit-formats/XOR.png)](./images/bit-formats/XOR.png)
 
-### <a id='isa-section-not'/>`NOT` (0x0a)
+### <a id='isa-section-not'/>`NOT`
 Bitwise NOT (inversion)
 
 [See in table.](#isa-table-not)
 
-- **Category**: bitwise
+- **Opcode**: 0x0a
+- **Category**: Compute - Bitwise
 - **Flags**: 
 	- **indirect**: Toggles whether each memory-offset argument is an indirect offset. 0th bit corresponds to 0th offset arg, etc. Indirect offsets result in memory accesses like `M[M[offset]]` instead of the more standard `M[offset]`.
-	- **in-tag**: The [tag/size](./state-model#tags-and-tagged-memory) to check inputs against and tag the destination with.
+	- **inTag**: The [tag/size](./state-model#tags-and-tagged-memory) to check inputs against and tag the destination with.
 - **Args**: 
 	- **aOffset**: memory offset of the operation's input
 	- **dstOffset**: memory offset specifying where to store operation's result
 - **Expression**: `M[dstOffset] = NOT M[aOffset]`
-- **Tag checks**: `T[aOffset] == in-tag`
-- **Tag updates**: `T[dstOffset] = in-tag`
+- **Tag checks**: `T[aOffset] == inTag`
+- **Tag updates**: `T[dstOffset] = inTag`
 - **Bit-size**: 96
 
 [![](./images/bit-formats/NOT.png)](./images/bit-formats/NOT.png)
 
-### <a id='isa-section-shl'/>`SHL` (0x0b)
+### <a id='isa-section-shl'/>`SHL`
 Bitwise leftward shift (a << b)
 
 [See in table.](#isa-table-shl)
 
-- **Category**: bitwise
+- **Opcode**: 0x0b
+- **Category**: Compute - Bitwise
 - **Flags**: 
 	- **indirect**: Toggles whether each memory-offset argument is an indirect offset. 0th bit corresponds to 0th offset arg, etc. Indirect offsets result in memory accesses like `M[M[offset]]` instead of the more standard `M[offset]`.
-	- **in-tag**: The [tag/size](./state-model#tags-and-tagged-memory) to check inputs against and tag the destination with.
+	- **inTag**: The [tag/size](./state-model#tags-and-tagged-memory) to check inputs against and tag the destination with.
 - **Args**: 
 	- **aOffset**: memory offset of the operation's left input
 	- **bOffset**: memory offset of the operation's right input
 	- **dstOffset**: memory offset specifying where to store operation's result
 - **Expression**: `M[dstOffset] = M[aOffset] << M[bOffset]`
-- **Tag checks**: `T[aOffset] == T[bOffset] == in-tag`
-- **Tag updates**: `T[dstOffset] = in-tag`
+- **Tag checks**: `T[aOffset] == T[bOffset] == inTag`
+- **Tag updates**: `T[dstOffset] = inTag`
 - **Bit-size**: 128
 
 [![](./images/bit-formats/SHL.png)](./images/bit-formats/SHL.png)
 
-### <a id='isa-section-shr'/>`SHR` (0x0c)
+### <a id='isa-section-shr'/>`SHR`
 Bitwise rightward shift (a >> b)
 
 [See in table.](#isa-table-shr)
 
-- **Category**: bitwise
+- **Opcode**: 0x0c
+- **Category**: Compute - Bitwise
 - **Flags**: 
 	- **indirect**: Toggles whether each memory-offset argument is an indirect offset. 0th bit corresponds to 0th offset arg, etc. Indirect offsets result in memory accesses like `M[M[offset]]` instead of the more standard `M[offset]`.
-	- **in-tag**: The [tag/size](./state-model#tags-and-tagged-memory) to check inputs against and tag the destination with.
+	- **inTag**: The [tag/size](./state-model#tags-and-tagged-memory) to check inputs against and tag the destination with.
 - **Args**: 
 	- **aOffset**: memory offset of the operation's left input
 	- **bOffset**: memory offset of the operation's right input
 	- **dstOffset**: memory offset specifying where to store operation's result
 - **Expression**: `M[dstOffset] = M[aOffset] >> M[bOffset]`
-- **Tag checks**: `T[aOffset] == T[bOffset] == in-tag`
-- **Tag updates**: `T[dstOffset] = in-tag`
+- **Tag checks**: `T[aOffset] == T[bOffset] == inTag`
+- **Tag updates**: `T[dstOffset] = inTag`
 - **Bit-size**: 128
 
 [![](./images/bit-formats/SHR.png)](./images/bit-formats/SHR.png)
 
-### <a id='isa-section-cast'/>`CAST` (0x0d)
+### <a id='isa-section-cast'/>`CAST`
 Type cast
 
 [See in table.](#isa-table-cast)
 
-- **Category**: types
+- **Opcode**: 0x0d
+- **Category**: Type Conversions
 - **Flags**: 
 	- **indirect**: Toggles whether each memory-offset argument is an indirect offset. 0th bit corresponds to 0th offset arg, etc. Indirect offsets result in memory accesses like `M[M[offset]]` instead of the more standard `M[offset]`.
-	- **dst-tag**: The [tag/size](./state-model#tags-and-tagged-memory) to tag the destination with but not to check inputs against.
+	- **dstTag**: The [tag/size](./state-model#tags-and-tagged-memory) to tag the destination with but not to check inputs against.
 - **Args**: 
 	- **aOffset**: memory offset of word to cast
 	- **dstOffset**: memory offset specifying where to store operation's result
-- **Expression**: `M[dstOffset] = cast<dst-tag>(M[aOffset])`
-- **Details**: Cast a word in memory based on the `dst-tag` specified in the bytecode. Truncates (`M[dstOffset] = M[aOffset] mod 2^dstsize`) when casting to a smaller type, left-zero-pads when casting to a larger type. See [here](./state-model#cast-and-tag-conversions) for more details.
-- **Tag updates**: `T[dstOffset] = dst-tag`
+- **Expression**: `M[dstOffset] = cast<dstTag>(M[aOffset])`
+- **Details**: Cast a word in memory based on the `dstTag` specified in the bytecode. Truncates (`M[dstOffset] = M[aOffset] mod 2^dstsize`) when casting to a smaller type, left-zero-pads when casting to a larger type. See [here](./state-model#cast-and-tag-conversions) for more details.
+- **Tag updates**: `T[dstOffset] = dstTag`
 - **Bit-size**: 96
 
 [![](./images/bit-formats/CAST.png)](./images/bit-formats/CAST.png)
 
-### <a id='isa-section-set'/>`SET` (0x0e)
-Set a memory word from a constant in the bytecode.
+### <a id='isa-section-address'/>`ADDRESS`
+Get the address of the currently executing l2 contract
 
-[See in table.](#isa-table-set)
+[See in table.](#isa-table-address)
 
-- **Category**: memory
+- **Opcode**: 0x0e
+- **Category**: Execution Environment
 - **Flags**: 
 	- **indirect**: Toggles whether each memory-offset argument is an indirect offset. 0th bit corresponds to 0th offset arg, etc. Indirect offsets result in memory accesses like `M[M[offset]]` instead of the more standard `M[offset]`.
-	- **in-tag**: The [type/size](./state-model#tags-and-tagged-memory) to check inputs against and tag the destination with. `field` type is NOT supported for SET.
 - **Args**: 
-	- **const**: an N-bit constant value from the bytecode to store in memory (any type except `field`)
-	- **dstOffset**: memory offset specifying where to store the constant
-- **Expression**: `M[dstOffset] = const`
-- **Details**: Set memory word at `dstOffset` to `const`'s immediate value. `const`'s bit-size (N) can be 8, 16, 32, 64, or 128 based on `in-tag`. It _cannot be 254 (`field` type)_!
-- **Tag updates**: `T[dstOffset] = in-tag`
-- **Bit-size**: 64+N
+	- **dstOffset**: memory offset specifying where to store operation's result
+- **Expression**: `M[dstOffset] = context.environment.address`
+- **Tag updates**: `T[dstOffset] = u32`
+- **Bit-size**: 56
 
-[![](./images/bit-formats/SET.png)](./images/bit-formats/SET.png)
+[![](./images/bit-formats/ADDRESS.png)](./images/bit-formats/ADDRESS.png)
 
-### <a id='isa-section-mov'/>`MOV` (0x0f)
-Move a word from source memory location to destination`.
+### <a id='isa-section-storageaddress'/>`STORAGEADDRESS`
+Get the _storage_ address of the currently executing context
 
-[See in table.](#isa-table-mov)
+[See in table.](#isa-table-storageaddress)
 
-- **Category**: memory
+- **Opcode**: 0x0f
+- **Category**: Execution Environment
 - **Flags**: 
 	- **indirect**: Toggles whether each memory-offset argument is an indirect offset. 0th bit corresponds to 0th offset arg, etc. Indirect offsets result in memory accesses like `M[M[offset]]` instead of the more standard `M[offset]`.
 - **Args**: 
-	- **srcOffset**: memory offset of word to move
-	- **dstOffset**: memory offset specifying where to store that word
-- **Expression**: `M[dstOffset] = M[srcOffset]`
-- **Tag updates**: `T[dstOffset] = T[srcOffset]`
-- **Bit-size**: 88
+	- **dstOffset**: memory offset specifying where to store operation's result
+- **Expression**: `M[dstOffset] = context.environment.storageAddress`
+- **Details**: The storage address is used for public storage accesses.
+- **Tag updates**: `T[dstOffset] = u32`
+- **Bit-size**: 56
 
-[![](./images/bit-formats/MOV.png)](./images/bit-formats/MOV.png)
+[![](./images/bit-formats/STORAGEADDRESS.png)](./images/bit-formats/STORAGEADDRESS.png)
 
-### <a id='isa-section-cmov'/>`CMOV` (0x10)
-Move a word (conditionally chosen) from one memory location to another (`d = cond > 0 ? a : b`).
+### <a id='isa-section-origin'/>`ORIGIN`
+Get the transaction's origination address
 
-[See in table.](#isa-table-cmov)
+[See in table.](#isa-table-origin)
 
-- **Category**: memory
+- **Opcode**: 0x10
+- **Category**: Execution Environment
 - **Flags**: 
 	- **indirect**: Toggles whether each memory-offset argument is an indirect offset. 0th bit corresponds to 0th offset arg, etc. Indirect offsets result in memory accesses like `M[M[offset]]` instead of the more standard `M[offset]`.
 - **Args**: 
-	- **aOffset**: memory offset of word 'a' to conditionally move
-	- **bOffset**: memory offset of word 'b' to conditionally move
-	- **condOffset**: memory offset of the operations 'conditional' input
 	- **dstOffset**: memory offset specifying where to store operation's result
-- **Expression**: `M[dstOffset] = M[condOffset] > 0 ? M[aOffset] : M[bOffset]`
-- **Details**: One of two source memory locations is chosen based on the condition. `T[condOffset]` is not checked because the greater-than-zero suboperation is the same regardless of type.
-- **Tag updates**: `T[dstOffset] = M[condOffset] > 0 ? T[aOffset] : T[bOffset]`
-- **Bit-size**: 152
+- **Expression**: `M[dstOffset] = context.environment.origin`
+- **Tag updates**: `T[dstOffset] = u32`
+- **Bit-size**: 56
 
-[![](./images/bit-formats/CMOV.png)](./images/bit-formats/CMOV.png)
+[![](./images/bit-formats/ORIGIN.png)](./images/bit-formats/ORIGIN.png)
 
-### <a id='isa-section-calldatacopy'/>`CALLDATACOPY` (0x11)
-Copy calldata into memory.
+### <a id='isa-section-sender'/>`SENDER`
+Get the address of the sender (caller of the current context)
 
-[See in table.](#isa-table-calldatacopy)
+[See in table.](#isa-table-sender)
 
-- **Category**: contract calls
+- **Opcode**: 0x11
+- **Category**: Execution Environment
 - **Flags**: 
 	- **indirect**: Toggles whether each memory-offset argument is an indirect offset. 0th bit corresponds to 0th offset arg, etc. Indirect offsets result in memory accesses like `M[M[offset]]` instead of the more standard `M[offset]`.
 - **Args**: 
-	- **cdOffset**: offset into calldata to copy from
-	- **copySize**: number of words to copy
-	- **dstOffset**: memory offset specifying where to copy the first word to
-- **Expression**: `M[dstOffset:dstOffset+copySize] = calldata[cdOffset:cdOffset+copySize]`
-- **Details**: Calldata is read-only and cannot be directly operated on by other instructions. This instruction moves words from calldata into memory so they can be operated on normally.
-- **Tag updates**: `T[dstOffset:dstOffset+copySize] = field`
-- **Bit-size**: 120
+	- **dstOffset**: memory offset specifying where to store operation's result
+- **Expression**: `M[dstOffset] = context.environment.sender`
+- **Tag updates**: `T[dstOffset] = u32`
+- **Bit-size**: 56
 
-[![](./images/bit-formats/CALLDATACOPY.png)](./images/bit-formats/CALLDATACOPY.png)
+[![](./images/bit-formats/SENDER.png)](./images/bit-formats/SENDER.png)
 
-### <a id='isa-section-sload'/>`SLOAD` (0x12)
-Load a word from storage.
+### <a id='isa-section-portal'/>`PORTAL`
+Get the address of the l1 portal contract
 
-[See in table.](#isa-table-sload)
+[See in table.](#isa-table-portal)
 
-- **Category**: storage & messaging
+- **Opcode**: 0x12
+- **Category**: Execution Environment
 - **Flags**: 
 	- **indirect**: Toggles whether each memory-offset argument is an indirect offset. 0th bit corresponds to 0th offset arg, etc. Indirect offsets result in memory accesses like `M[M[offset]]` instead of the more standard `M[offset]`.
 - **Args**: 
-	- **slotOffset**: memory offset of the storage slot to load from
 	- **dstOffset**: memory offset specifying where to store operation's result
-- **Expression**: `M[dstOffset] = storage[M[slotOffset]]`
-- **Details**: Load a word from this contract's persistent public storage into memory.
-- **Tag updates**: `T[dstOffset] = field`
-- **Bit-size**: 88
+- **Expression**: `M[dstOffset] = context.environment.portal`
+- **Tag updates**: `T[dstOffset] = u32`
+- **Bit-size**: 56
 
-[![](./images/bit-formats/SLOAD.png)](./images/bit-formats/SLOAD.png)
+[![](./images/bit-formats/PORTAL.png)](./images/bit-formats/PORTAL.png)
 
-### <a id='isa-section-sstore'/>`SSTORE` (0x13)
-Write a word to storage.
+### <a id='isa-section-feeperl1gas'/>`FEEPERL1GAS`
+Get the fee to be paid per "L1 gas" - constant for entire transaction
 
-[See in table.](#isa-table-sstore)
+[See in table.](#isa-table-feeperl1gas)
 
-- **Category**: storage & messaging
+- **Opcode**: 0x13
+- **Category**: Execution Environment
 - **Flags**: 
 	- **indirect**: Toggles whether each memory-offset argument is an indirect offset. 0th bit corresponds to 0th offset arg, etc. Indirect offsets result in memory accesses like `M[M[offset]]` instead of the more standard `M[offset]`.
 - **Args**: 
-	- **srcOffset**: memory offset of the word to store
-	- **slotOffset**: memory offset containing the storage slot to store to
-- **Expression**: `storage[M[slotOffset]] = M[srcOffset]`
-- **Details**: Store a word from memory into this contract's persistent public storage.
-- **Bit-size**: 88
+	- **dstOffset**: memory offset specifying where to store operation's result
+- **Expression**: `M[dstOffset] = context.environment.feePerL1Gas`
+- **Tag updates**: `T[dstOffset] = u32`
+- **Bit-size**: 56
 
-[![](./images/bit-formats/SSTORE.png)](./images/bit-formats/SSTORE.png)
+[![](./images/bit-formats/FEEPERL1GAS.png)](./images/bit-formats/FEEPERL1GAS.png)
 
-### <a id='isa-section-emitnotehash'/>`EMITNOTEHASH` (0x14)
-Emit a new note hash to be inserted into the notes tree
+### <a id='isa-section-feeperl2gas'/>`FEEPERL2GAS`
+Get the fee to be paid per "L2 gas" - constant for entire transaction
 
-[See in table.](#isa-table-emitnotehash)
+[See in table.](#isa-table-feeperl2gas)
 
-- **Category**: storage & messaging
+- **Opcode**: 0x14
+- **Category**: Execution Environment
 - **Flags**: 
 	- **indirect**: Toggles whether each memory-offset argument is an indirect offset. 0th bit corresponds to 0th offset arg, etc. Indirect offsets result in memory accesses like `M[M[offset]]` instead of the more standard `M[offset]`.
 - **Args**: 
-	- **noteHashOffset**: memory offset of the note hash
-- **Expression**: emitNoteHash(M[contentOffset])
+	- **dstOffset**: memory offset specifying where to store operation's result
+- **Expression**: `M[dstOffset] = context.environment.feePerL2Gas`
+- **Tag updates**: `T[dstOffset] = u32`
 - **Bit-size**: 56
 
-[![](./images/bit-formats/EMITNOTEHASH.png)](./images/bit-formats/EMITNOTEHASH.png)
+[![](./images/bit-formats/FEEPERL2GAS.png)](./images/bit-formats/FEEPERL2GAS.png)
 
-### <a id='isa-section-emitnullifier'/>`EMITNULLIFIER` (0x15)
-Emit a new nullifier to be inserted into the nullifier tree
+### <a id='isa-section-feeperdagas'/>`FEEPERDAGAS`
+Get the fee to be paid per "DA gas" - constant for entire transaction
 
-[See in table.](#isa-table-emitnullifier)
+[See in table.](#isa-table-feeperdagas)
 
-- **Category**: storage & messaging
+- **Opcode**: 0x15
+- **Category**: Execution Environment
 - **Flags**: 
 	- **indirect**: Toggles whether each memory-offset argument is an indirect offset. 0th bit corresponds to 0th offset arg, etc. Indirect offsets result in memory accesses like `M[M[offset]]` instead of the more standard `M[offset]`.
 - **Args**: 
-	- **nullifierOffset**: memory offset of nullifier
-- **Expression**: emitNullifier(M[nullifierOffset])
+	- **dstOffset**: memory offset specifying where to store operation's result
+- **Expression**: `M[dstOffset] = context.environment.feePerDaGas`
+- **Tag updates**: `T[dstOffset] = u32`
 - **Bit-size**: 56
 
-[![](./images/bit-formats/EMITNULLIFIER.png)](./images/bit-formats/EMITNULLIFIER.png)
+[![](./images/bit-formats/FEEPERDAGAS.png)](./images/bit-formats/FEEPERDAGAS.png)
 
-### <a id='isa-section-sendl2tol1msg'/>`SENDL2TOL1MSG` (0x16)
-Send an L2-to-L1 message
+### <a id='isa-section-contractcalldepth'/>`CONTRACTCALLDEPTH`
+Get how many contract calls deep the current call context is
 
-[See in table.](#isa-table-sendl2tol1msg)
+[See in table.](#isa-table-contractcalldepth)
 
-- **Category**: storage & messaging
+- **Opcode**: 0x16
+- **Category**: Execution Environment
 - **Flags**: 
 	- **indirect**: Toggles whether each memory-offset argument is an indirect offset. 0th bit corresponds to 0th offset arg, etc. Indirect offsets result in memory accesses like `M[M[offset]]` instead of the more standard `M[offset]`.
 - **Args**: 
-	- **contentOffset**: memory offset of the message content
-- **Expression**: sendL2ToL1Message(M[contentOffset])
+	- **dstOffset**: memory offset specifying where to store operation's result
+- **Expression**: `M[dstOffset] = context.environment.contractCallDepth`
+- **Details**: Note: security issues with EVM's tx.origin can be resolved by asserting `calldepth == 0`.
+- **Tag updates**: `T[dstOffset] = u8`
 - **Bit-size**: 56
 
-[![](./images/bit-formats/SENDL2TOL1MSG.png)](./images/bit-formats/SENDL2TOL1MSG.png)
+[![](./images/bit-formats/CONTRACTCALLDEPTH.png)](./images/bit-formats/CONTRACTCALLDEPTH.png)
 
-### <a id='isa-section-jump'/>`JUMP` (0x17)
-Jump to a location in the bytecode.
+### <a id='isa-section-chainid'/>`CHAINID`
+Get this rollup's L1 chain ID
 
-[See in table.](#isa-table-jump)
+[See in table.](#isa-table-chainid)
 
-- **Category**: control
+- **Opcode**: 0x17
+- **Category**: Execution Environment - Globals
+- **Flags**: 
+	- **indirect**: Toggles whether each memory-offset argument is an indirect offset. 0th bit corresponds to 0th offset arg, etc. Indirect offsets result in memory accesses like `M[M[offset]]` instead of the more standard `M[offset]`.
 - **Args**: 
-	- **loc**: target location to jump to
-- **Expression**: `PC = loc`
-- **Details**: Target location is an immediate value (a constant in the bytecode).
-- **Bit-size**: 48
+	- **dstOffset**: memory offset specifying where to store operation's result
+- **Expression**: `M[dstOffset] = context.environment.globals.chainId`
+- **Tag updates**: `T[dstOffset] = u32`
+- **Bit-size**: 56
 
-[![](./images/bit-formats/JUMP.png)](./images/bit-formats/JUMP.png)
+[![](./images/bit-formats/CHAINID.png)](./images/bit-formats/CHAINID.png)
 
-### <a id='isa-section-jumpi'/>`JUMPI` (0x18)
-Conditionally jump to a location in the bytecode.
+### <a id='isa-section-version'/>`VERSION`
+Get this rollup's L2 version ID
 
-[See in table.](#isa-table-jumpi)
+[See in table.](#isa-table-version)
 
-- **Category**: control
+- **Opcode**: 0x18
+- **Category**: Execution Environment - Globals
 - **Flags**: 
 	- **indirect**: Toggles whether each memory-offset argument is an indirect offset. 0th bit corresponds to 0th offset arg, etc. Indirect offsets result in memory accesses like `M[M[offset]]` instead of the more standard `M[offset]`.
 - **Args**: 
-	- **loc**: target location conditionally jump to
-	- **condOffset**: memory offset of the operations 'conditional' input
-- **Expression**: `PC = M[condOffset] > 0 ? loc : PC`
-- **Details**: Target location is an immediate value (a constant in the bytecode). `T[condOffset]` is not checked because the greater-than-zero suboperation is the same regardless of type.
-- **Bit-size**: 88
+	- **dstOffset**: memory offset specifying where to store operation's result
+- **Expression**: `M[dstOffset] = context.environment.globals.version`
+- **Tag updates**: `T[dstOffset] = u32`
+- **Bit-size**: 56
 
-[![](./images/bit-formats/JUMPI.png)](./images/bit-formats/JUMPI.png)
+[![](./images/bit-formats/VERSION.png)](./images/bit-formats/VERSION.png)
 
-### <a id='isa-section-return'/>`RETURN` (0x19)
-Halt execution with `success`, optionally returning some data.
+### <a id='isa-section-blocknumber'/>`BLOCKNUMBER`
+Get this L2 block's number
 
-[See in table.](#isa-table-return)
+[See in table.](#isa-table-blocknumber)
 
-- **Category**: contract calls
+- **Opcode**: 0x19
+- **Category**: Execution Environment - Globals
 - **Flags**: 
 	- **indirect**: Toggles whether each memory-offset argument is an indirect offset. 0th bit corresponds to 0th offset arg, etc. Indirect offsets result in memory accesses like `M[M[offset]]` instead of the more standard `M[offset]`.
 - **Args**: 
-	- **retOffset**: memory offset of first word to return
-	- **retSize**: number of words to return
-- **Expression**: `return(M[retOffset:retOffset+retSize])`
-- **Details**: Return control flow to the calling context/contract.
-- **Bit-size**: 88
+	- **dstOffset**: memory offset specifying where to store operation's result
+- **Expression**: `M[dstOffset] = context.environment.globals.blocknumber`
+- **Tag updates**: `T[dstOffset] = u32`
+- **Bit-size**: 56
 
-[![](./images/bit-formats/RETURN.png)](./images/bit-formats/RETURN.png)
+[![](./images/bit-formats/BLOCKNUMBER.png)](./images/bit-formats/BLOCKNUMBER.png)
 
-### <a id='isa-section-revert'/>`REVERT` (0x1a)
-Halt execution with `failure`, reverting state changes and optionally returning some data.
+### <a id='isa-section-timestamp'/>`TIMESTAMP`
+Get this L2 block's timestamp
 
-[See in table.](#isa-table-revert)
+[See in table.](#isa-table-timestamp)
 
-- **Category**: contract calls
+- **Opcode**: 0x1a
+- **Category**: Execution Environment - Globals
 - **Flags**: 
 	- **indirect**: Toggles whether each memory-offset argument is an indirect offset. 0th bit corresponds to 0th offset arg, etc. Indirect offsets result in memory accesses like `M[M[offset]]` instead of the more standard `M[offset]`.
 - **Args**: 
-	- **retOffset**: memory offset of first word to return
-	- **retSize**: number of words to return
-- **Expression**: `revert(M[retOffset:retOffset+retSize])`
-- **Details**: Return control flow to the calling context/contract.
-- **Bit-size**: 88
-
-[![](./images/bit-formats/REVERT.png)](./images/bit-formats/REVERT.png)
-
-### <a id='isa-section-call'/>`CALL` (0x1b)
-Call into another contract.
-
-[See in table.](#isa-table-call)
-
-- **Category**: contract calls
-- **Flags**: 
-	- **indirect**: Toggles whether each memory-offset argument is an indirect offset. 0th bit corresponds to 0th offset arg, etc. Indirect offsets result in memory accesses like `M[M[offset]]` instead of the more standard `M[offset]`.
-- **Args**: 
-	- **gasOffset**: offset to two words containing `{l1Gas, l2Gas}`: amount of L1 and L2 gas to provide to the callee
-	- **addrOffset**: address of the contract to call
-	- **argsOffset**: memory offset to args (will become the callee's calldata)
-	- **argsSize**: number of words to pass via callee's calldata
-	- **retOffset**: destination memory offset specifying where to store the data returned from the callee
-	- **retSize**: number of words to copy from data returned by callee
-	- **successOffset**: destination memory offset specifying where to store the call's success (0: failure, 1: success)
-- **Expression**: 
-<CodeBlock language="jsx">
-{`M[successOffset] = call(
-    M[gasOffset], M[gasOffset+1], M[addrOffset],
-    M[argsOffset], M[argsSize],
-    M[retOffset], M[retSize])`}
-</CodeBlock>
-- **Details**: Creates a new CallContext, triggers execution of the corresponding contract code,
-                    and then resumes execution in the current CallContext. A non-existent contract or one
-                    with no code will return success. Nested call has an incremented `CallContext.calldepth`.
-- **Tag checks**: `T[gasOffset] == T[gasOffset+1] == u32`
-- **Tag updates**: 
-<CodeBlock language="jsx">
-{`T[successOffset] = u8
-T[retOffset:retOffset+retSize] = field`}
-</CodeBlock>
-- **Bit-size**: 248
-
-[![](./images/bit-formats/CALL.png)](./images/bit-formats/CALL.png)
-
-### <a id='isa-section-staticcall'/>`STATICCALL` (0x1c)
-Call into another contract, disallowing persistent state modifications.
-
-[See in table.](#isa-table-staticcall)
-
-- **Category**: contract calls
-- **Flags**: 
-	- **indirect**: Toggles whether each memory-offset argument is an indirect offset. 0th bit corresponds to 0th offset arg, etc. Indirect offsets result in memory accesses like `M[M[offset]]` instead of the more standard `M[offset]`.
-- **Args**: 
-	- **gasOffset**: offset to two words containing `{l1Gas, l2Gas}`: amount of L1 and L2 gas to provide to the callee
-	- **addrOffset**: address of the contract to call
-	- **argsOffset**: memory offset to args (will become the callee's calldata)
-	- **argsSize**: number of words to pass via callee's calldata
-	- **retOffset**: destination memory offset specifying where to store the data returned from the callee
-	- **retSize**: number of words to copy from data returned by callee
-	- **successOffset**: destination memory offset specifying where to store the call's success (0: failure, 1: success)
-- **Expression**: 
-<CodeBlock language="jsx">
-{`M[successOffset] = staticcall(
-    M[gasOffset], M[gasOffset+1], M[addrOffset],
-    M[argsOffset], M[argsSize],
-    M[retOffset], M[retSize])`}
-</CodeBlock>
-- **Details**: Same as `CALL`, but the callee is cannot modify persistent state. Disallowed instructions are `SSTORE`, `ULOG`, `CALL`.
-- **Tag checks**: `T[gasOffset] == T[gasOffset+1] == u32`
-- **Tag updates**: 
-<CodeBlock language="jsx">
-{`T[successOffset] = u8
-T[retOffset:retOffset+retSize] = field`}
-</CodeBlock>
-- **Bit-size**: 248
+	- **dstOffset**: memory offset specifying where to store operation's result
+- **Expression**: `M[dstOffset] = context.environment.globals.timestamp`
+- **Tag updates**: `T[dstOffset] = u64`
+- **Bit-size**: 56
 
-[![](./images/bit-formats/STATICCALL.png)](./images/bit-formats/STATICCALL.png)
+[![](./images/bit-formats/TIMESTAMP.png)](./images/bit-formats/TIMESTAMP.png)
 
-### <a id='isa-section-ulog'/>`ULOG` (0x1d)
-Emit an unencrypted log with data from the `field` memory page
+### <a id='isa-section-coinbase'/>`COINBASE`
+Get the block's beneficiary address
 
-[See in table.](#isa-table-ulog)
+[See in table.](#isa-table-coinbase)
 
-- **Category**: logging
+- **Opcode**: 0x1b
+- **Category**: Execution Environment - Globals
 - **Flags**: 
 	- **indirect**: Toggles whether each memory-offset argument is an indirect offset. 0th bit corresponds to 0th offset arg, etc. Indirect offsets result in memory accesses like `M[M[offset]]` instead of the more standard `M[offset]`.
 - **Args**: 
-	- **logOffset**: memory offset of the data to log
-	- **logSize**: number of words to log
-- **Expression**: `ulog(M[logOffset:logOffset+logSize])`
-- **Bit-size**: 88
+	- **dstOffset**: memory offset specifying where to store operation's result
+- **Expression**: `M[dstOffset] = context.environment.globals.coinbase`
+- **Tag updates**: `T[dstOffset] = u32`
+- **Bit-size**: 56
 
-[![](./images/bit-formats/ULOG.png)](./images/bit-formats/ULOG.png)
+[![](./images/bit-formats/COINBASE.png)](./images/bit-formats/COINBASE.png)
 
-### <a id='isa-section-chainid'/>`CHAINID` (0x1e)
-Get this rollup's L1 chain ID
+### <a id='isa-section-blockl1gaslimit'/>`BLOCKL1GASLIMIT`
+Total amount of "L1 gas" that a block can consume
 
-[See in table.](#isa-table-chainid)
+[See in table.](#isa-table-blockl1gaslimit)
 
-- **Category**: block info
+- **Opcode**: 0x1c
+- **Category**: Execution Environment - Globals
 - **Flags**: 
 	- **indirect**: Toggles whether each memory-offset argument is an indirect offset. 0th bit corresponds to 0th offset arg, etc. Indirect offsets result in memory accesses like `M[M[offset]]` instead of the more standard `M[offset]`.
 - **Args**: 
 	- **dstOffset**: memory offset specifying where to store operation's result
-- **Expression**: `M[dstOffset] = Globals.chainId`
+- **Expression**: `M[dstOffset] = context.environment.globals.l1GasLimit`
 - **Tag updates**: `T[dstOffset] = u32`
 - **Bit-size**: 56
 
-[![](./images/bit-formats/CHAINID.png)](./images/bit-formats/CHAINID.png)
+[![](./images/bit-formats/BLOCKL1GASLIMIT.png)](./images/bit-formats/BLOCKL1GASLIMIT.png)
 
-### <a id='isa-section-version'/>`VERSION` (0x1f)
-Get this rollup's L2 version ID
+### <a id='isa-section-blockl2gaslimit'/>`BLOCKL2GASLIMIT`
+Total amount of "L2 gas" that a block can consume
 
-[See in table.](#isa-table-version)
+[See in table.](#isa-table-blockl2gaslimit)
 
-- **Category**: block info
+- **Opcode**: 0x1d
+- **Category**: Execution Environment - Globals
 - **Flags**: 
 	- **indirect**: Toggles whether each memory-offset argument is an indirect offset. 0th bit corresponds to 0th offset arg, etc. Indirect offsets result in memory accesses like `M[M[offset]]` instead of the more standard `M[offset]`.
 - **Args**: 
 	- **dstOffset**: memory offset specifying where to store operation's result
-- **Expression**: `M[dstOffset] = Globals.version`
+- **Expression**: `M[dstOffset] = context.environment.globals.l2GasLimit`
 - **Tag updates**: `T[dstOffset] = u32`
 - **Bit-size**: 56
 
-[![](./images/bit-formats/VERSION.png)](./images/bit-formats/VERSION.png)
+[![](./images/bit-formats/BLOCKL2GASLIMIT.png)](./images/bit-formats/BLOCKL2GASLIMIT.png)
 
-### <a id='isa-section-blocknumber'/>`BLOCKNUMBER` (0x20)
-Get this block's number
+### <a id='isa-section-blockdagaslimit'/>`BLOCKDAGASLIMIT`
+Total amount of "DA gas" that a block can consume
 
-[See in table.](#isa-table-blocknumber)
+[See in table.](#isa-table-blockdagaslimit)
 
-- **Category**: block info
+- **Opcode**: 0x1e
+- **Category**: Execution Environment - Globals
 - **Flags**: 
 	- **indirect**: Toggles whether each memory-offset argument is an indirect offset. 0th bit corresponds to 0th offset arg, etc. Indirect offsets result in memory accesses like `M[M[offset]]` instead of the more standard `M[offset]`.
 - **Args**: 
 	- **dstOffset**: memory offset specifying where to store operation's result
-- **Expression**: `M[dstOffset] = Globals.blocknumber`
+- **Expression**: `M[dstOffset] = context.environment.globals.daGasLimit`
 - **Tag updates**: `T[dstOffset] = u32`
 - **Bit-size**: 56
 
-[![](./images/bit-formats/BLOCKNUMBER.png)](./images/bit-formats/BLOCKNUMBER.png)
+[![](./images/bit-formats/BLOCKDAGASLIMIT.png)](./images/bit-formats/BLOCKDAGASLIMIT.png)
 
-### <a id='isa-section-timestamp'/>`TIMESTAMP` (0x21)
-Get this L2 block's timestamp
+### <a id='isa-section-calldatacopy'/>`CALLDATACOPY`
+Copy calldata into memory
 
-[See in table.](#isa-table-timestamp)
+[See in table.](#isa-table-calldatacopy)
 
-- **Category**: block info
+- **Opcode**: 0x1f
+- **Category**: Execution Environment - Calldata
 - **Flags**: 
 	- **indirect**: Toggles whether each memory-offset argument is an indirect offset. 0th bit corresponds to 0th offset arg, etc. Indirect offsets result in memory accesses like `M[M[offset]]` instead of the more standard `M[offset]`.
 - **Args**: 
-	- **dstOffset**: memory offset specifying where to store operation's result
-- **Expression**: `M[dstOffset] = Globals.timestamp`
-- **Tag updates**: `T[dstOffset] = u64`
-- **Bit-size**: 56
+	- **cdOffset**: offset into calldata to copy from
+	- **copySize**: number of words to copy
+	- **dstOffset**: memory offset specifying where to copy the first word to
+- **Expression**: `M[dstOffset:dstOffset+copySize] = context.environment.calldata[cdOffset:cdOffset+copySize]`
+- **Details**: Calldata is read-only and cannot be directly operated on by other instructions. This instruction moves words from calldata into memory so they can be operated on normally.
+- **Tag updates**: `T[dstOffset:dstOffset+copySize] = field`
+- **Bit-size**: 120
 
-[![](./images/bit-formats/TIMESTAMP.png)](./images/bit-formats/TIMESTAMP.png)
+[![](./images/bit-formats/CALLDATACOPY.png)](./images/bit-formats/CALLDATACOPY.png)
 
-### <a id='isa-section-coinbase'/>`COINBASE` (0x22)
-Get the block's beneficiary address
+### <a id='isa-section-l1gasleft'/>`L1GASLEFT`
+Remaining "L1 gas" for this call (after this instruction)
 
-[See in table.](#isa-table-coinbase)
+[See in table.](#isa-table-l1gasleft)
 
-- **Category**: block info
+- **Opcode**: 0x20
+- **Category**: Machine State - Gas
 - **Flags**: 
 	- **indirect**: Toggles whether each memory-offset argument is an indirect offset. 0th bit corresponds to 0th offset arg, etc. Indirect offsets result in memory accesses like `M[M[offset]]` instead of the more standard `M[offset]`.
 - **Args**: 
 	- **dstOffset**: memory offset specifying where to store operation's result
-- **Expression**: `M[dstOffset] = Globals.coinbase`
+- **Expression**: `M[dstOffset] = context.machineState.l1GasLeft`
 - **Tag updates**: `T[dstOffset] = u32`
 - **Bit-size**: 56
 
-[![](./images/bit-formats/COINBASE.png)](./images/bit-formats/COINBASE.png)
+[![](./images/bit-formats/L1GASLEFT.png)](./images/bit-formats/L1GASLEFT.png)
 
-### <a id='isa-section-blockl1gaslimit'/>`BLOCKL1GASLIMIT` (0x23)
-Total amount of "L1 gas" that a block can consume
+### <a id='isa-section-l2gasleft'/>`L2GASLEFT`
+Remaining "L2 gas" for this call (after this instruction)
 
-[See in table.](#isa-table-blockl1gaslimit)
+[See in table.](#isa-table-l2gasleft)
 
-- **Category**: block info
+- **Opcode**: 0x21
+- **Category**: Machine State - Gas
 - **Flags**: 
 	- **indirect**: Toggles whether each memory-offset argument is an indirect offset. 0th bit corresponds to 0th offset arg, etc. Indirect offsets result in memory accesses like `M[M[offset]]` instead of the more standard `M[offset]`.
 - **Args**: 
 	- **dstOffset**: memory offset specifying where to store operation's result
-- **Expression**: `M[dstOffset] = Globals.l1GasLimit`
+- **Expression**: `M[dstOffset] = context.MachineState.l2GasLeft`
 - **Tag updates**: `T[dstOffset] = u32`
 - **Bit-size**: 56
 
-[![](./images/bit-formats/BLOCKL1GASLIMIT.png)](./images/bit-formats/BLOCKL1GASLIMIT.png)
+[![](./images/bit-formats/L2GASLEFT.png)](./images/bit-formats/L2GASLEFT.png)
 
-### <a id='isa-section-blockl2gaslimit'/>`BLOCKL2GASLIMIT` (0x24)
-Total amount of "L2 gas" that a block can consume
+### <a id='isa-section-dagasleft'/>`DAGASLEFT`
+Remaining "DA gas" for this call (after this instruction)
 
-[See in table.](#isa-table-blockl2gaslimit)
+[See in table.](#isa-table-dagasleft)
 
-- **Category**: block info
+- **Opcode**: 0x22
+- **Category**: Machine State - Gas
 - **Flags**: 
 	- **indirect**: Toggles whether each memory-offset argument is an indirect offset. 0th bit corresponds to 0th offset arg, etc. Indirect offsets result in memory accesses like `M[M[offset]]` instead of the more standard `M[offset]`.
 - **Args**: 
 	- **dstOffset**: memory offset specifying where to store operation's result
-- **Expression**: `M[dstOffset] = Globals.l2GasLimit`
+- **Expression**: `M[dstOffset] = context.machineState.daGasLeft`
 - **Tag updates**: `T[dstOffset] = u32`
 - **Bit-size**: 56
 
-[![](./images/bit-formats/BLOCKL2GASLIMIT.png)](./images/bit-formats/BLOCKL2GASLIMIT.png)
+[![](./images/bit-formats/DAGASLEFT.png)](./images/bit-formats/DAGASLEFT.png)
 
-### <a id='isa-section-notesroot'/>`NOTESROOT` (0x25)
-Get the historical note-hash tree root as of the specified block number.
+### <a id='isa-section-jump'/>`JUMP`
+Jump to a location in the bytecode
 
-[See in table.](#isa-table-notesroot)
+[See in table.](#isa-table-jump)
 
-- **Category**: historical access
-- **Flags**: 
-	- **indirect**: Toggles whether each memory-offset argument is an indirect offset. 0th bit corresponds to 0th offset arg, etc. Indirect offsets result in memory accesses like `M[M[offset]]` instead of the more standard `M[offset]`.
+- **Opcode**: 0x23
+- **Category**: Machine State - Control Flow
 - **Args**: 
-	- **blockNumOffset**: memory offset of the block number input
-	- **dstOffset**: memory offset specifying where to store operation's result
-- **Expression**: `M[dstOffset] = HistoricalBlockData[M[blockNumOffset]].note_hash_tree_root`
-- **Tag updates**: `T[dstOffset] = field`
-- **Bit-size**: 88
+	- **loc**: target location to jump to
+- **Expression**: `context.machineState.pc = loc`
+- **Details**: Target location is an immediate value (a constant in the bytecode).
+- **Bit-size**: 48
 
-[![](./images/bit-formats/NOTESROOT.png)](./images/bit-formats/NOTESROOT.png)
+[![](./images/bit-formats/JUMP.png)](./images/bit-formats/JUMP.png)
 
-### <a id='isa-section-nullroot'/>`NULLIFIERSROOT` (0x26)
-Get the historical nullifier tree root as of the specified block number.
+### <a id='isa-section-jumpi'/>`JUMPI`
+Conditionally jump to a location in the bytecode
 
-[See in table.](#isa-table-nullroot)
+[See in table.](#isa-table-jumpi)
 
-- **Category**: historical access
+- **Opcode**: 0x24
+- **Category**: Machine State - Control Flow
 - **Flags**: 
 	- **indirect**: Toggles whether each memory-offset argument is an indirect offset. 0th bit corresponds to 0th offset arg, etc. Indirect offsets result in memory accesses like `M[M[offset]]` instead of the more standard `M[offset]`.
 - **Args**: 
-	- **blockNumOffset**: memory offset of the block number input
-	- **dstOffset**: memory offset specifying where to store operation's result
-- **Expression**: `M[dstOffset] = HistoricalBlockData[M[blockNumOffset]].nullifier_tree_root`
-- **Tag updates**: `T[dstOffset] = field`
+	- **loc**: target location conditionally jump to
+	- **condOffset**: memory offset of the operations 'conditional' input
+- **Expression**: `context.machineState.pc = M[condOffset] > 0 ? loc : context.machineState.pc`
+- **Details**: Target location is an immediate value (a constant in the bytecode). `T[condOffset]` is not checked because the greater-than-zero suboperation is the same regardless of type.
 - **Bit-size**: 88
 
-[![](./images/bit-formats/NULLIFIERSROOT.png)](./images/bit-formats/NULLIFIERSROOT.png)
+[![](./images/bit-formats/JUMPI.png)](./images/bit-formats/JUMPI.png)
 
-### <a id='isa-section-contractsroot'/>`CONTRACTSROOT` (0x27)
-Get the historical contracts tree root as of the specified block number.
+### <a id='isa-section-internalcall'/>`INTERNALCALL`
+Make an internal call. Push the current PC to the internal call stack and jump to the target location.
 
-[See in table.](#isa-table-contractsroot)
+[See in table.](#isa-table-internalcall)
 
-- **Category**: historical access
-- **Flags**: 
-	- **indirect**: Toggles whether each memory-offset argument is an indirect offset. 0th bit corresponds to 0th offset arg, etc. Indirect offsets result in memory accesses like `M[M[offset]]` instead of the more standard `M[offset]`.
+- **Opcode**: 0x25
+- **Category**: Machine State - Control Flow
 - **Args**: 
-	- **blockNumOffset**: memory offset of the block number input
-	- **dstOffset**: memory offset specifying where to store operation's result
-- **Expression**: `M[dstOffset] = HistoricalBlockData[M[blockNumOffset]].contracts_tree_root`
-- **Tag updates**: `T[dstOffset] = field`
-- **Bit-size**: 88
+	- **loc**: target location to jump/call to
+- **Expression**: 
+<CodeBlock language="jsx">
+{`context.machineState.internalCallStack.push(context.machineState.pc)
+context.machineState.pc = loc`}
+</CodeBlock>
+- **Details**: Target location is an immediate value (a constant in the bytecode).
+- **Bit-size**: 48
+
+
+### <a id='isa-section-internalreturn'/>`INTERNALRETURN`
+Return from an internal call. Pop from the internal call stack and jump to the popped location.
+
+[See in table.](#isa-table-internalreturn)
+
+- **Opcode**: 0x26
+- **Category**: Machine State - Control Flow
+- **Expression**: `context.machineState.pc = context.machineState.internalCallStack.pop()`
+- **Bit-size**: 16
 
-[![](./images/bit-formats/CONTRACTSROOT.png)](./images/bit-formats/CONTRACTSROOT.png)
+[![](./images/bit-formats/INTERNALRETURN.png)](./images/bit-formats/INTERNALRETURN.png)
 
-### <a id='isa-section-msgsroot'/>`MSGSROOT` (0x28)
-Get the historical l1-to-l2 message tree root as of the specified block number.
+### <a id='isa-section-set'/>`SET`
+Set a memory word from a constant in the bytecode
 
-[See in table.](#isa-table-msgsroot)
+[See in table.](#isa-table-set)
 
-- **Category**: historical access
+- **Opcode**: 0x27
+- **Category**: Machine State - Memory
 - **Flags**: 
 	- **indirect**: Toggles whether each memory-offset argument is an indirect offset. 0th bit corresponds to 0th offset arg, etc. Indirect offsets result in memory accesses like `M[M[offset]]` instead of the more standard `M[offset]`.
+	- **inTag**: The [type/size](./state-model#tags-and-tagged-memory) to check inputs against and tag the destination with. `field` type is NOT supported for SET.
 - **Args**: 
-	- **blockNumOffset**: memory offset of the block number input
-	- **dstOffset**: memory offset specifying where to store operation's result
-- **Expression**: `M[dstOffset] = HistoricalBlockData[M[blockNumOffset]].l1_to_l2_message_tree_root`
-- **Tag updates**: `T[dstOffset] = field`
-- **Bit-size**: 88
+	- **const**: an N-bit constant value from the bytecode to store in memory (any type except `field`)
+	- **dstOffset**: memory offset specifying where to store the constant
+- **Expression**: `M[dstOffset] = const`
+- **Details**: Set memory word at `dstOffset` to `const`'s immediate value. `const`'s bit-size (N) can be 8, 16, 32, 64, or 128 based on `inTag`. It _cannot be 254 (`field` type)_!
+- **Tag updates**: `T[dstOffset] = inTag`
+- **Bit-size**: 64+N
 
-[![](./images/bit-formats/MSGSROOT.png)](./images/bit-formats/MSGSROOT.png)
+[![](./images/bit-formats/SET.png)](./images/bit-formats/SET.png)
 
-### <a id='isa-section-publicdataroot'/>`PUBLICDATAROOT` (0x29)
-Get the historical public data tree root as of the specified block number.
+### <a id='isa-section-mov'/>`MOV`
+Move a word from source memory location to destination
 
-[See in table.](#isa-table-publicdataroot)
+[See in table.](#isa-table-mov)
 
-- **Category**: historical access
+- **Opcode**: 0x28
+- **Category**: Machine State - Memory
 - **Flags**: 
 	- **indirect**: Toggles whether each memory-offset argument is an indirect offset. 0th bit corresponds to 0th offset arg, etc. Indirect offsets result in memory accesses like `M[M[offset]]` instead of the more standard `M[offset]`.
 - **Args**: 
-	- **blockNumOffset**: memory offset of the block number input
-	- **dstOffset**: memory offset specifying where to store operation's result
-- **Expression**: `M[dstOffset] = HistoricalBlockData[M[blockNumOffset]].public_data_tree_root`
-- **Tag updates**: `T[dstOffset] = field`
+	- **srcOffset**: memory offset of word to move
+	- **dstOffset**: memory offset specifying where to store that word
+- **Expression**: `M[dstOffset] = M[srcOffset]`
+- **Tag updates**: `T[dstOffset] = T[srcOffset]`
 - **Bit-size**: 88
 
-[![](./images/bit-formats/PUBLICDATAROOT.png)](./images/bit-formats/PUBLICDATAROOT.png)
+[![](./images/bit-formats/MOV.png)](./images/bit-formats/MOV.png)
 
-### <a id='isa-section-globalshash'/>`GLOBALSHASH` (0x2a)
-Get the historical global variables hash as of the specified block number.
+### <a id='isa-section-cmov'/>`CMOV`
+Move a word (conditionally chosen) from one memory location to another (`d = cond > 0 ? a : b`)
 
-[See in table.](#isa-table-globalshash)
+[See in table.](#isa-table-cmov)
 
-- **Category**: historical access
+- **Opcode**: 0x29
+- **Category**: Machine State - Memory
 - **Flags**: 
 	- **indirect**: Toggles whether each memory-offset argument is an indirect offset. 0th bit corresponds to 0th offset arg, etc. Indirect offsets result in memory accesses like `M[M[offset]]` instead of the more standard `M[offset]`.
 - **Args**: 
-	- **blockNumOffset**: memory offset of the block number input
+	- **aOffset**: memory offset of word 'a' to conditionally move
+	- **bOffset**: memory offset of word 'b' to conditionally move
+	- **condOffset**: memory offset of the operations 'conditional' input
 	- **dstOffset**: memory offset specifying where to store operation's result
-- **Expression**: `M[dstOffset] = HistoricalBlockData[M[blockNumOffset]].global_variables_hash`
-- **Tag updates**: `T[dstOffset] = field`
-- **Bit-size**: 88
+- **Expression**: `M[dstOffset] = M[condOffset] > 0 ? M[aOffset] : M[bOffset]`
+- **Details**: One of two source memory locations is chosen based on the condition. `T[condOffset]` is not checked because the greater-than-zero suboperation is the same regardless of type.
+- **Tag updates**: `T[dstOffset] = M[condOffset] > 0 ? T[aOffset] : T[bOffset]`
+- **Bit-size**: 152
 
-[![](./images/bit-formats/GLOBALSHASH.png)](./images/bit-formats/GLOBALSHASH.png)
+[![](./images/bit-formats/CMOV.png)](./images/bit-formats/CMOV.png)
 
-### <a id='isa-section-blocksroot'/>`BLOCKSROOT` (0x2b)
-Get the historical blocks tree root as of the specified block number.
+### <a id='isa-section-blockheaderbynum'/>`BLOCKHEADERBYNUM`
+Get the block header as of the specified block number
 
-[See in table.](#isa-table-blocksroot)
+[See in table.](#isa-table-blockheaderbynum)
 
-- **Category**: historical access
+- **Opcode**: 0x2a
+- **Category**: World State
 - **Flags**: 
 	- **indirect**: Toggles whether each memory-offset argument is an indirect offset. 0th bit corresponds to 0th offset arg, etc. Indirect offsets result in memory accesses like `M[M[offset]]` instead of the more standard `M[offset]`.
 - **Args**: 
 	- **blockNumOffset**: memory offset of the block number input
-	- **dstOffset**: memory offset specifying where to store operation's result
-- **Expression**: `M[dstOffset] = HistoricalBlockData[M[blockNumOffset]].archive_root`
-- **Tag updates**: `T[dstOffset] = field`
+	- **dstOffset**: memory offset specifying where to store operation's result's 0th word
+- **Expression**: `M[dstOffset:dstOffset+BLOCK_HEADER_LENGTH] = context.worldState.blockHeader[M[blockNumOffset]]`
+- **Tag updates**: `T[dstOffset:dstOffset+BLOCK_HEADER_LENGTh] = field`
 - **Bit-size**: 88
 
-[![](./images/bit-formats/BLOCKSROOT.png)](./images/bit-formats/BLOCKSROOT.png)
+[![](./images/bit-formats/BLOCKHEADERBYNUM.png)](./images/bit-formats/BLOCKHEADERBYNUM.png)
 
-### <a id='isa-section-grandroot'/>`GRANDROOT` (0x2c)
-Get the historical grandfather tree root as of the specified block number.
+### <a id='isa-section-sload'/>`SLOAD`
+Load a word from storage
 
-[See in table.](#isa-table-grandroot)
+[See in table.](#isa-table-sload)
 
-- **Category**: historical access
+- **Opcode**: 0x2b
+- **Category**: World State - Public Storage
 - **Flags**: 
 	- **indirect**: Toggles whether each memory-offset argument is an indirect offset. 0th bit corresponds to 0th offset arg, etc. Indirect offsets result in memory accesses like `M[M[offset]]` instead of the more standard `M[offset]`.
 - **Args**: 
-	- **blockNumOffset**: memory offset of the block number input
+	- **slotOffset**: memory offset of the storage slot to load from
 	- **dstOffset**: memory offset specifying where to store operation's result
-- **Expression**: `M[dstOffset] = HistoricalBlockData[M[blockNumOffset]].grandfather_tree_root`
+- **Expression**: `M[dstOffset] = context.worldState.publicStorage[context.environment.storageAddress, M[slotOffset]]`
+- **Details**: Load a word from this contract's persistent public storage into memory.
 - **Tag updates**: `T[dstOffset] = field`
 - **Bit-size**: 88
 
-[![](./images/bit-formats/GRANDROOT.png)](./images/bit-formats/GRANDROOT.png)
+[![](./images/bit-formats/SLOAD.png)](./images/bit-formats/SLOAD.png)
 
-### <a id='isa-section-origin'/>`ORIGIN` (0x2d)
-Get the transaction's origination address
+### <a id='isa-section-sstore'/>`SSTORE`
+Write a word to storage
 
-[See in table.](#isa-table-origin)
+[See in table.](#isa-table-sstore)
 
-- **Category**: tx context
+- **Opcode**: 0x2c
+- **Category**: World State - Public Storage
 - **Flags**: 
 	- **indirect**: Toggles whether each memory-offset argument is an indirect offset. 0th bit corresponds to 0th offset arg, etc. Indirect offsets result in memory accesses like `M[M[offset]]` instead of the more standard `M[offset]`.
 - **Args**: 
-	- **dstOffset**: memory offset specifying where to store operation's result
-- **Expression**: `M[dstOffset] = TxContext.origin`
-- **Tag updates**: `T[dstOffset] = u32`
-- **Bit-size**: 56
+	- **srcOffset**: memory offset of the word to store
+	- **slotOffset**: memory offset containing the storage slot to store to
+- **Expression**: `context.worldState.publicStorage[context.environment.storageAddress, M[slotOffset]] = M[srcOffset]`
+- **Details**: Store a word from memory into this contract's persistent public storage.
+- **Bit-size**: 88
 
-[![](./images/bit-formats/ORIGIN.png)](./images/bit-formats/ORIGIN.png)
+[![](./images/bit-formats/SSTORE.png)](./images/bit-formats/SSTORE.png)
 
-### <a id='isa-section-refundee'/>`REFUNDEE` (0x2e)
-The recipient of fee refunds for this transaction
+### <a id='isa-section-readl1tol2msg'/>`READL1TOL2MSG`
+Reads an L1-to-L2 message
 
-[See in table.](#isa-table-refundee)
+[See in table.](#isa-table-readl1tol2msg)
 
-- **Category**: tx context
+- **Opcode**: 0x2d
+- **Category**: World State - Messaging
 - **Flags**: 
 	- **indirect**: Toggles whether each memory-offset argument is an indirect offset. 0th bit corresponds to 0th offset arg, etc. Indirect offsets result in memory accesses like `M[M[offset]]` instead of the more standard `M[offset]`.
 - **Args**: 
-	- **dstOffset**: memory offset specifying where to store operation's result
-- **Expression**: `M[dstOffset] = TxContext.refundee`
-- **Tag updates**: `T[dstOffset] = u32`
-- **Bit-size**: 56
+	- **msgKeyOffset**: memory offset of the message's key
+	- **dstOffset**: memory offset to place the 0th word of the message content
+	- **msgSize**: number of words in the message
+- **Expression**: `M[dstOffset:dstOffset+msgSize] = context.worldState.l1ToL2Messages(M[msgKeyOffset])`
+- **Tag updates**: `T[dstOffset:dstOffset+msgSize] = field`
+- **Bit-size**: 120
 
-[![](./images/bit-formats/REFUNDEE.png)](./images/bit-formats/REFUNDEE.png)
+[![](./images/bit-formats/READL1TOL2MSG.png)](./images/bit-formats/READL1TOL2MSG.png)
 
-### <a id='isa-section-feeperl1gas'/>`FEEPERL1GAS` (0x2f)
-The fee to be paid per "L1 gas" - set by the transaction's original caller
+### <a id='isa-section-sendl2tol1msg'/>`SENDL2TOL1MSG`
+Send an L2-to-L1 message
 
-[See in table.](#isa-table-feeperl1gas)
+[See in table.](#isa-table-sendl2tol1msg)
 
-- **Category**: tx context
+- **Opcode**: 0x2e
+- **Category**: World State - Messaging
 - **Flags**: 
 	- **indirect**: Toggles whether each memory-offset argument is an indirect offset. 0th bit corresponds to 0th offset arg, etc. Indirect offsets result in memory accesses like `M[M[offset]]` instead of the more standard `M[offset]`.
 - **Args**: 
-	- **dstOffset**: memory offset specifying where to store operation's result
-- **Expression**: `M[dstOffset] = TxContext.feePerL1Gas`
-- **Tag updates**: `T[dstOffset] = u32`
-- **Bit-size**: 56
+	- **msgOffset**: memory offset of the message content
+	- **msgSize**: number of words in the message
+- **Expression**: `context.worldState.l2ToL1Messages.append(M[msgOffset:msgOffset+msgSize])`
+- **Bit-size**: 88
 
-[![](./images/bit-formats/FEEPERL1GAS.png)](./images/bit-formats/FEEPERL1GAS.png)
+[![](./images/bit-formats/SENDL2TOL1MSG.png)](./images/bit-formats/SENDL2TOL1MSG.png)
 
-### <a id='isa-section-feeperl2gas'/>`FEEPERL2GAS` (0x30)
-The fee to be paid per "L2 gas" - set by the transaction's original caller
+### <a id='isa-section-emitnotehash'/>`EMITNOTEHASH`
+Emit a new note hash to be inserted into the notes tree
 
-[See in table.](#isa-table-feeperl2gas)
+[See in table.](#isa-table-emitnotehash)
 
-- **Category**: tx context
+- **Opcode**: 0x2f
+- **Category**: World State - Notes & Nullifiers
 - **Flags**: 
 	- **indirect**: Toggles whether each memory-offset argument is an indirect offset. 0th bit corresponds to 0th offset arg, etc. Indirect offsets result in memory accesses like `M[M[offset]]` instead of the more standard `M[offset]`.
 - **Args**: 
-	- **dstOffset**: memory offset specifying where to store operation's result
-- **Expression**: `M[dstOffset] = TxContext.feePerL2Gas`
-- **Tag updates**: `T[dstOffset] = u32`
+	- **noteHashOffset**: memory offset of the note hash
+- **Expression**: `context.worldState.newHashes.append(M[noteHashOffset])`
 - **Bit-size**: 56
 
-[![](./images/bit-formats/FEEPERL2GAS.png)](./images/bit-formats/FEEPERL2GAS.png)
+[![](./images/bit-formats/EMITNOTEHASH.png)](./images/bit-formats/EMITNOTEHASH.png)
 
-### <a id='isa-section-caller'/>`CALLER` (0x31)
-Get the address of the sender (the caller's context)
+### <a id='isa-section-emitnullifier'/>`EMITNULLIFIER`
+Emit a new nullifier to be inserted into the nullifier tree
 
-[See in table.](#isa-table-caller)
+[See in table.](#isa-table-emitnullifier)
 
-- **Category**: call context
+- **Opcode**: 0x30
+- **Category**: World State - Notes & Nullifiers
 - **Flags**: 
 	- **indirect**: Toggles whether each memory-offset argument is an indirect offset. 0th bit corresponds to 0th offset arg, etc. Indirect offsets result in memory accesses like `M[M[offset]]` instead of the more standard `M[offset]`.
 - **Args**: 
-	- **dstOffset**: memory offset specifying where to store operation's result
-- **Expression**: `M[dstOffset] = CallContext.sender`
-- **Tag updates**: `T[dstOffset] = u32`
+	- **nullifierOffset**: memory offset of nullifier
+- **Expression**: `context.worldState.nullifiers.append(M[nullifierOffset])`
 - **Bit-size**: 56
 
-[![](./images/bit-formats/CALLER.png)](./images/bit-formats/CALLER.png)
+[![](./images/bit-formats/EMITNULLIFIER.png)](./images/bit-formats/EMITNULLIFIER.png)
 
-### <a id='isa-section-address'/>`ADDRESS` (0x32)
-Get the address of the currently executing l2 contract
+### <a id='isa-section-emitunencryptedlog'/>`EMITUNENCRYPTEDLOG`
+Emit an unencrypted log
 
-[See in table.](#isa-table-address)
+[See in table.](#isa-table-emitunencryptedlog)
 
-- **Category**: call context
+- **Opcode**: 0x31
+- **Category**: Accrued Substate - Logging
 - **Flags**: 
 	- **indirect**: Toggles whether each memory-offset argument is an indirect offset. 0th bit corresponds to 0th offset arg, etc. Indirect offsets result in memory accesses like `M[M[offset]]` instead of the more standard `M[offset]`.
 - **Args**: 
-	- **dstOffset**: memory offset specifying where to store operation's result
-- **Expression**: `M[dstOffset] = CallContext.storageContractAddress`
-- **Tag updates**: `T[dstOffset] = u32`
-- **Bit-size**: 56
+	- **logOffset**: memory offset of the data to log
+	- **logSize**: number of words to log
+- **Expression**: `context.accruedSubstate.unencryptedLogs.append(M[logOffset:logOffset+logSize])`
+- **Bit-size**: 88
 
-[![](./images/bit-formats/ADDRESS.png)](./images/bit-formats/ADDRESS.png)
+[![](./images/bit-formats/EMITUNENCRYPTEDLOG.png)](./images/bit-formats/EMITUNENCRYPTEDLOG.png)
 
-### <a id='isa-section-portal'/>`PORTAL` (0x33)
-Get the address of the l1 portal contract
+### <a id='isa-section-call'/>`CALL`
+Call into another contract
 
-[See in table.](#isa-table-portal)
+[See in table.](#isa-table-call)
 
-- **Category**: call context
+- **Opcode**: 0x32
+- **Category**: Control Flow - Contract Calls
 - **Flags**: 
 	- **indirect**: Toggles whether each memory-offset argument is an indirect offset. 0th bit corresponds to 0th offset arg, etc. Indirect offsets result in memory accesses like `M[M[offset]]` instead of the more standard `M[offset]`.
 - **Args**: 
-	- **dstOffset**: memory offset specifying where to store operation's result
-- **Expression**: `M[dstOffset] = CallContext.portalAddress`
-- **Tag updates**: `T[dstOffset] = u32`
-- **Bit-size**: 56
+	- **gasOffset**: offset to three words containing `{l1GasLeft, l2GasLeft, daGasLeft}`: amount of gas to provide to the callee
+	- **addrOffset**: address of the contract to call
+	- **argsOffset**: memory offset to args (will become the callee's calldata)
+	- **argsSize**: number of words to pass via callee's calldata
+	- **retOffset**: destination memory offset specifying where to store the data returned from the callee
+	- **retSize**: number of words to copy from data returned by callee
+	- **successOffset**: destination memory offset specifying where to store the call's success (0: failure, 1: success)
+- **Expression**: 
+<CodeBlock language="jsx">
+{`M[successOffset] = call(
+    M[gasOffset], M[gasOffset+1], M[gasOffset+2],
+    M[addrOffset],
+    M[argsOffset], M[argsSize],
+    M[retOffset], M[retSize])`}
+</CodeBlock>
+- **Details**: Creates a new (nested) execution context and triggers execution within it until the nested context halts.
+                    Then resumes execution in the current/calling context. A non-existent contract or one with no code will return success.
+                    See ["Nested contract calls"](./avm#nested-contract-calls) to see how the caller updates its context after the nested call halts.
+- **Tag checks**: `T[gasOffset] == T[gasOffset+1] == T[gasOffset+2] == u32`
+- **Tag updates**: 
+<CodeBlock language="jsx">
+{`T[successOffset] = u8
+T[retOffset:retOffset+retSize] = field`}
+</CodeBlock>
+- **Bit-size**: 248
 
-[![](./images/bit-formats/PORTAL.png)](./images/bit-formats/PORTAL.png)
+[![](./images/bit-formats/CALL.png)](./images/bit-formats/CALL.png)
 
-### <a id='isa-section-calldepth'/>`CALLDEPTH` (0x34)
-Get how many calls deep the current call context is
+### <a id='isa-section-staticcall'/>`STATICCALL`
+Call into another contract, disallowing World State and Accrued Substate modifications
 
-[See in table.](#isa-table-calldepth)
+[See in table.](#isa-table-staticcall)
 
-- **Category**: call context
+- **Opcode**: 0x33
+- **Category**: Control Flow - Contract Calls
 - **Flags**: 
 	- **indirect**: Toggles whether each memory-offset argument is an indirect offset. 0th bit corresponds to 0th offset arg, etc. Indirect offsets result in memory accesses like `M[M[offset]]` instead of the more standard `M[offset]`.
 - **Args**: 
-	- **dstOffset**: memory offset specifying where to store operation's result
-- **Expression**: `M[dstOffset] = CallContext.calldepth`
-- **Details**: Note: security issues with EVM's tx.origin can be resolved by asserting the `calldepth == 0`.
-- **Tag updates**: `T[dstOffset] = u8`
-- **Bit-size**: 56
+	- **gasOffset**: offset to three words containing `{l1GasLeft, l2GasLeft, daGasLeft}`: amount of gas to provide to the callee
+	- **addrOffset**: address of the contract to call
+	- **argsOffset**: memory offset to args (will become the callee's calldata)
+	- **argsSize**: number of words to pass via callee's calldata
+	- **retOffset**: destination memory offset specifying where to store the data returned from the callee
+	- **retSize**: number of words to copy from data returned by callee
+	- **successOffset**: destination memory offset specifying where to store the call's success (0: failure, 1: success)
+- **Expression**: 
+<CodeBlock language="jsx">
+{`M[successOffset] = staticcall(
+    M[gasOffset], M[gasOffset+1], M[gasOffset+2],
+    M[addrOffset],
+    M[argsOffset], M[argsSize],
+    M[retOffset], M[retSize])`}
+</CodeBlock>
+- **Details**: Same as `CALL`, but disallows World State and Accrued Substate modifications. See ["Nested contract calls"](./avm#nested-contract-calls) to see how the caller updates its context after the nested call halts.
+- **Tag checks**: `T[gasOffset] == T[gasOffset+1] == T[gasOffset+2] == u32`
+- **Tag updates**: 
+<CodeBlock language="jsx">
+{`T[successOffset] = u8
+T[retOffset:retOffset+retSize] = field`}
+</CodeBlock>
+- **Bit-size**: 248
 
-[![](./images/bit-formats/CALLDEPTH.png)](./images/bit-formats/CALLDEPTH.png)
+[![](./images/bit-formats/STATICCALL.png)](./images/bit-formats/STATICCALL.png)
 
-### <a id='isa-section-l1gas'/>`L1GAS` (0x35)
-Remaining "L1 gas" for this call (after this instruction).
+### <a id='isa-section-return'/>`RETURN`
+Halt execution within this context (without revert), optionally returning some data
 
-[See in table.](#isa-table-l1gas)
+[See in table.](#isa-table-return)
 
-- **Category**: latest context
+- **Opcode**: 0x34
+- **Category**: Control Flow - Contract Calls
 - **Flags**: 
 	- **indirect**: Toggles whether each memory-offset argument is an indirect offset. 0th bit corresponds to 0th offset arg, etc. Indirect offsets result in memory accesses like `M[M[offset]]` instead of the more standard `M[offset]`.
 - **Args**: 
-	- **dstOffset**: memory offset specifying where to store operation's result
-- **Expression**: `M[dstOffset] = LatestContext.l1Gas`
-- **Tag updates**: `T[dstOffset] = u32`
-- **Bit-size**: 56
+	- **retOffset**: memory offset of first word to return
+	- **retSize**: number of words to return
+- **Expression**: 
+<CodeBlock language="jsx">
+{`context.contractCallResults.output = M[retOffset:retOffset+retSize]
+halt`}
+</CodeBlock>
+- **Details**: Return control flow to the calling context/contract. Caller will accept World State and Accrued Substate modifications. See ["Halting"](./avm#halting) to learn more. See ["Nested contract calls"](./avm#nested-contract-calls) to see how the caller updates its context after the nested call halts.
+- **Bit-size**: 88
 
-[![](./images/bit-formats/L1GAS.png)](./images/bit-formats/L1GAS.png)
+[![](./images/bit-formats/RETURN.png)](./images/bit-formats/RETURN.png)
 
-### <a id='isa-section-l2gas'/>`L2GAS` (0x36)
-Remaining "L2 gas" for this call (after this instruction).
+### <a id='isa-section-revert'/>`REVERT`
+Halt execution within this context as `reverted`, optionally returning some data
 
-[See in table.](#isa-table-l2gas)
+[See in table.](#isa-table-revert)
 
-- **Category**: latest context
+- **Opcode**: 0x35
+- **Category**: Control Flow - Contract Calls
 - **Flags**: 
 	- **indirect**: Toggles whether each memory-offset argument is an indirect offset. 0th bit corresponds to 0th offset arg, etc. Indirect offsets result in memory accesses like `M[M[offset]]` instead of the more standard `M[offset]`.
 - **Args**: 
-	- **dstOffset**: memory offset specifying where to store operation's result
-- **Expression**: `M[dstOffset] = LatestContext.l2Gas`
-- **Tag updates**: `T[dstOffset] = u32`
-- **Bit-size**: 56
+	- **retOffset**: memory offset of first word to return
+	- **retSize**: number of words to return
+- **Expression**: 
+<CodeBlock language="jsx">
+{`context.contractCallResults.output = M[retOffset:retOffset+retSize]
+context.contractCallResults.reverted = true
+halt`}
+</CodeBlock>
+- **Details**: Return control flow to the calling context/contract. Caller will reject World State and Accrued Substate modifications. See ["Halting"](./avm#halting) to learn more. See ["Nested contract calls"](./avm#nested-contract-calls) to see how the caller updates its context after the nested call halts.
+- **Bit-size**: 88
 
-[![](./images/bit-formats/L2GAS.png)](./images/bit-formats/L2GAS.png)
+[![](./images/bit-formats/REVERT.png)](./images/bit-formats/REVERT.png)
diff --git a/yellow-paper/docs/public-vm/gen/images/bit-formats/ADD.png b/yellow-paper/docs/public-vm/gen/images/bit-formats/ADD.png
index ee1a32d95b71..696324a4c452 100644
Binary files a/yellow-paper/docs/public-vm/gen/images/bit-formats/ADD.png and b/yellow-paper/docs/public-vm/gen/images/bit-formats/ADD.png differ
diff --git a/yellow-paper/docs/public-vm/gen/images/bit-formats/ADDRESS.png b/yellow-paper/docs/public-vm/gen/images/bit-formats/ADDRESS.png
index 4314acef2a15..75a307347f35 100644
Binary files a/yellow-paper/docs/public-vm/gen/images/bit-formats/ADDRESS.png and b/yellow-paper/docs/public-vm/gen/images/bit-formats/ADDRESS.png differ
diff --git a/yellow-paper/docs/public-vm/gen/images/bit-formats/AND.png b/yellow-paper/docs/public-vm/gen/images/bit-formats/AND.png
index 9bfc38479f18..fe56f671f423 100644
Binary files a/yellow-paper/docs/public-vm/gen/images/bit-formats/AND.png and b/yellow-paper/docs/public-vm/gen/images/bit-formats/AND.png differ
diff --git a/yellow-paper/docs/public-vm/gen/images/bit-formats/BLOCKDAGASLIMIT.png b/yellow-paper/docs/public-vm/gen/images/bit-formats/BLOCKDAGASLIMIT.png
new file mode 100644
index 000000000000..d95eac60812d
Binary files /dev/null and b/yellow-paper/docs/public-vm/gen/images/bit-formats/BLOCKDAGASLIMIT.png differ
diff --git a/yellow-paper/docs/public-vm/gen/images/bit-formats/BLOCKHEADERBYNUM.png b/yellow-paper/docs/public-vm/gen/images/bit-formats/BLOCKHEADERBYNUM.png
new file mode 100644
index 000000000000..1a83a1d8dc54
Binary files /dev/null and b/yellow-paper/docs/public-vm/gen/images/bit-formats/BLOCKHEADERBYNUM.png differ
diff --git a/yellow-paper/docs/public-vm/gen/images/bit-formats/BLOCKL1GASLIMIT.png b/yellow-paper/docs/public-vm/gen/images/bit-formats/BLOCKL1GASLIMIT.png
index 20f5ded93909..ba869fff1ec5 100644
Binary files a/yellow-paper/docs/public-vm/gen/images/bit-formats/BLOCKL1GASLIMIT.png and b/yellow-paper/docs/public-vm/gen/images/bit-formats/BLOCKL1GASLIMIT.png differ
diff --git a/yellow-paper/docs/public-vm/gen/images/bit-formats/BLOCKL2GASLIMIT.png b/yellow-paper/docs/public-vm/gen/images/bit-formats/BLOCKL2GASLIMIT.png
index f952f689f040..2eb40c349490 100644
Binary files a/yellow-paper/docs/public-vm/gen/images/bit-formats/BLOCKL2GASLIMIT.png and b/yellow-paper/docs/public-vm/gen/images/bit-formats/BLOCKL2GASLIMIT.png differ
diff --git a/yellow-paper/docs/public-vm/gen/images/bit-formats/BLOCKNUMBER.png b/yellow-paper/docs/public-vm/gen/images/bit-formats/BLOCKNUMBER.png
index c7217f8452a3..59ea492d9d30 100644
Binary files a/yellow-paper/docs/public-vm/gen/images/bit-formats/BLOCKNUMBER.png and b/yellow-paper/docs/public-vm/gen/images/bit-formats/BLOCKNUMBER.png differ
diff --git a/yellow-paper/docs/public-vm/gen/images/bit-formats/BLOCKSROOT.png b/yellow-paper/docs/public-vm/gen/images/bit-formats/BLOCKSROOT.png
deleted file mode 100644
index d844d63bb4fd..000000000000
Binary files a/yellow-paper/docs/public-vm/gen/images/bit-formats/BLOCKSROOT.png and /dev/null differ
diff --git a/yellow-paper/docs/public-vm/gen/images/bit-formats/CALL.png b/yellow-paper/docs/public-vm/gen/images/bit-formats/CALL.png
index a01703516660..ac57e52b5bbe 100644
Binary files a/yellow-paper/docs/public-vm/gen/images/bit-formats/CALL.png and b/yellow-paper/docs/public-vm/gen/images/bit-formats/CALL.png differ
diff --git a/yellow-paper/docs/public-vm/gen/images/bit-formats/CALLDATACOPY.png b/yellow-paper/docs/public-vm/gen/images/bit-formats/CALLDATACOPY.png
index 133d86a37d99..00a763cb06d4 100644
Binary files a/yellow-paper/docs/public-vm/gen/images/bit-formats/CALLDATACOPY.png and b/yellow-paper/docs/public-vm/gen/images/bit-formats/CALLDATACOPY.png differ
diff --git a/yellow-paper/docs/public-vm/gen/images/bit-formats/CALLDEPTH.png b/yellow-paper/docs/public-vm/gen/images/bit-formats/CALLDEPTH.png
deleted file mode 100644
index 1cca7c9e725c..000000000000
Binary files a/yellow-paper/docs/public-vm/gen/images/bit-formats/CALLDEPTH.png and /dev/null differ
diff --git a/yellow-paper/docs/public-vm/gen/images/bit-formats/CALLER.png b/yellow-paper/docs/public-vm/gen/images/bit-formats/CALLER.png
deleted file mode 100644
index dfb24671c96d..000000000000
Binary files a/yellow-paper/docs/public-vm/gen/images/bit-formats/CALLER.png and /dev/null differ
diff --git a/yellow-paper/docs/public-vm/gen/images/bit-formats/CAST.png b/yellow-paper/docs/public-vm/gen/images/bit-formats/CAST.png
index d663c342ae7c..8ee381fba7f0 100644
Binary files a/yellow-paper/docs/public-vm/gen/images/bit-formats/CAST.png and b/yellow-paper/docs/public-vm/gen/images/bit-formats/CAST.png differ
diff --git a/yellow-paper/docs/public-vm/gen/images/bit-formats/CHAINID.png b/yellow-paper/docs/public-vm/gen/images/bit-formats/CHAINID.png
index d197552c9dc4..e7fa8d7b431a 100644
Binary files a/yellow-paper/docs/public-vm/gen/images/bit-formats/CHAINID.png and b/yellow-paper/docs/public-vm/gen/images/bit-formats/CHAINID.png differ
diff --git a/yellow-paper/docs/public-vm/gen/images/bit-formats/CMOV.png b/yellow-paper/docs/public-vm/gen/images/bit-formats/CMOV.png
index a46692edd84c..f90abd3b274b 100644
Binary files a/yellow-paper/docs/public-vm/gen/images/bit-formats/CMOV.png and b/yellow-paper/docs/public-vm/gen/images/bit-formats/CMOV.png differ
diff --git a/yellow-paper/docs/public-vm/gen/images/bit-formats/COINBASE.png b/yellow-paper/docs/public-vm/gen/images/bit-formats/COINBASE.png
index 72e2f88758dc..19dd8c4c5a27 100644
Binary files a/yellow-paper/docs/public-vm/gen/images/bit-formats/COINBASE.png and b/yellow-paper/docs/public-vm/gen/images/bit-formats/COINBASE.png differ
diff --git a/yellow-paper/docs/public-vm/gen/images/bit-formats/CONTRACTCALLDEPTH.png b/yellow-paper/docs/public-vm/gen/images/bit-formats/CONTRACTCALLDEPTH.png
new file mode 100644
index 000000000000..6222fe480455
Binary files /dev/null and b/yellow-paper/docs/public-vm/gen/images/bit-formats/CONTRACTCALLDEPTH.png differ
diff --git a/yellow-paper/docs/public-vm/gen/images/bit-formats/CONTRACTSROOT.png b/yellow-paper/docs/public-vm/gen/images/bit-formats/CONTRACTSROOT.png
deleted file mode 100644
index 47c6cb0f93c8..000000000000
Binary files a/yellow-paper/docs/public-vm/gen/images/bit-formats/CONTRACTSROOT.png and /dev/null differ
diff --git a/yellow-paper/docs/public-vm/gen/images/bit-formats/DAGASLEFT.png b/yellow-paper/docs/public-vm/gen/images/bit-formats/DAGASLEFT.png
new file mode 100644
index 000000000000..96f93a3418ec
Binary files /dev/null and b/yellow-paper/docs/public-vm/gen/images/bit-formats/DAGASLEFT.png differ
diff --git a/yellow-paper/docs/public-vm/gen/images/bit-formats/DIV.png b/yellow-paper/docs/public-vm/gen/images/bit-formats/DIV.png
index 58fee0f68533..a87e44962f32 100644
Binary files a/yellow-paper/docs/public-vm/gen/images/bit-formats/DIV.png and b/yellow-paper/docs/public-vm/gen/images/bit-formats/DIV.png differ
diff --git a/yellow-paper/docs/public-vm/gen/images/bit-formats/EMITNOTEHASH.png b/yellow-paper/docs/public-vm/gen/images/bit-formats/EMITNOTEHASH.png
index fd31987d317d..036785120e89 100644
Binary files a/yellow-paper/docs/public-vm/gen/images/bit-formats/EMITNOTEHASH.png and b/yellow-paper/docs/public-vm/gen/images/bit-formats/EMITNOTEHASH.png differ
diff --git a/yellow-paper/docs/public-vm/gen/images/bit-formats/EMITNULLIFIER.png b/yellow-paper/docs/public-vm/gen/images/bit-formats/EMITNULLIFIER.png
index 50c4328012c1..23ba0e857e35 100644
Binary files a/yellow-paper/docs/public-vm/gen/images/bit-formats/EMITNULLIFIER.png and b/yellow-paper/docs/public-vm/gen/images/bit-formats/EMITNULLIFIER.png differ
diff --git a/yellow-paper/docs/public-vm/gen/images/bit-formats/EMITUNENCRYPTEDLOG.png b/yellow-paper/docs/public-vm/gen/images/bit-formats/EMITUNENCRYPTEDLOG.png
new file mode 100644
index 000000000000..43ed04808e8c
Binary files /dev/null and b/yellow-paper/docs/public-vm/gen/images/bit-formats/EMITUNENCRYPTEDLOG.png differ
diff --git a/yellow-paper/docs/public-vm/gen/images/bit-formats/EQ.png b/yellow-paper/docs/public-vm/gen/images/bit-formats/EQ.png
index 426d47621b06..4ee5f60980f3 100644
Binary files a/yellow-paper/docs/public-vm/gen/images/bit-formats/EQ.png and b/yellow-paper/docs/public-vm/gen/images/bit-formats/EQ.png differ
diff --git a/yellow-paper/docs/public-vm/gen/images/bit-formats/FEEPERDAGAS.png b/yellow-paper/docs/public-vm/gen/images/bit-formats/FEEPERDAGAS.png
new file mode 100644
index 000000000000..2c1cf3f6e04f
Binary files /dev/null and b/yellow-paper/docs/public-vm/gen/images/bit-formats/FEEPERDAGAS.png differ
diff --git a/yellow-paper/docs/public-vm/gen/images/bit-formats/FEEPERL1GAS.png b/yellow-paper/docs/public-vm/gen/images/bit-formats/FEEPERL1GAS.png
index 428bb22433d9..3b31baa617d0 100644
Binary files a/yellow-paper/docs/public-vm/gen/images/bit-formats/FEEPERL1GAS.png and b/yellow-paper/docs/public-vm/gen/images/bit-formats/FEEPERL1GAS.png differ
diff --git a/yellow-paper/docs/public-vm/gen/images/bit-formats/FEEPERL2GAS.png b/yellow-paper/docs/public-vm/gen/images/bit-formats/FEEPERL2GAS.png
index db94bc190a3f..441f9782688c 100644
Binary files a/yellow-paper/docs/public-vm/gen/images/bit-formats/FEEPERL2GAS.png and b/yellow-paper/docs/public-vm/gen/images/bit-formats/FEEPERL2GAS.png differ
diff --git a/yellow-paper/docs/public-vm/gen/images/bit-formats/GLOBALSHASH.png b/yellow-paper/docs/public-vm/gen/images/bit-formats/GLOBALSHASH.png
deleted file mode 100644
index 0cea4cc32d02..000000000000
Binary files a/yellow-paper/docs/public-vm/gen/images/bit-formats/GLOBALSHASH.png and /dev/null differ
diff --git a/yellow-paper/docs/public-vm/gen/images/bit-formats/GRANDROOT.png b/yellow-paper/docs/public-vm/gen/images/bit-formats/GRANDROOT.png
deleted file mode 100644
index 34d66c5a3314..000000000000
Binary files a/yellow-paper/docs/public-vm/gen/images/bit-formats/GRANDROOT.png and /dev/null differ
diff --git a/yellow-paper/docs/public-vm/gen/images/bit-formats/INTERNALCALLDEPTH.png b/yellow-paper/docs/public-vm/gen/images/bit-formats/INTERNALCALLDEPTH.png
new file mode 100644
index 000000000000..45f5b1502c35
Binary files /dev/null and b/yellow-paper/docs/public-vm/gen/images/bit-formats/INTERNALCALLDEPTH.png differ
diff --git a/yellow-paper/docs/public-vm/gen/images/bit-formats/INTERNALRETURN.png b/yellow-paper/docs/public-vm/gen/images/bit-formats/INTERNALRETURN.png
new file mode 100644
index 000000000000..56c484afde15
Binary files /dev/null and b/yellow-paper/docs/public-vm/gen/images/bit-formats/INTERNALRETURN.png differ
diff --git a/yellow-paper/docs/public-vm/gen/images/bit-formats/JUMP.png b/yellow-paper/docs/public-vm/gen/images/bit-formats/JUMP.png
index 9d9fd47b38b0..e8e6f02c6925 100644
Binary files a/yellow-paper/docs/public-vm/gen/images/bit-formats/JUMP.png and b/yellow-paper/docs/public-vm/gen/images/bit-formats/JUMP.png differ
diff --git a/yellow-paper/docs/public-vm/gen/images/bit-formats/JUMPI.png b/yellow-paper/docs/public-vm/gen/images/bit-formats/JUMPI.png
index 326a7971d4a5..8c79533a7d5f 100644
Binary files a/yellow-paper/docs/public-vm/gen/images/bit-formats/JUMPI.png and b/yellow-paper/docs/public-vm/gen/images/bit-formats/JUMPI.png differ
diff --git a/yellow-paper/docs/public-vm/gen/images/bit-formats/L1GAS.png b/yellow-paper/docs/public-vm/gen/images/bit-formats/L1GAS.png
deleted file mode 100644
index 7ec775889c51..000000000000
Binary files a/yellow-paper/docs/public-vm/gen/images/bit-formats/L1GAS.png and /dev/null differ
diff --git a/yellow-paper/docs/public-vm/gen/images/bit-formats/L1GASLEFT.png b/yellow-paper/docs/public-vm/gen/images/bit-formats/L1GASLEFT.png
new file mode 100644
index 000000000000..796c3bb25db4
Binary files /dev/null and b/yellow-paper/docs/public-vm/gen/images/bit-formats/L1GASLEFT.png differ
diff --git a/yellow-paper/docs/public-vm/gen/images/bit-formats/L2GAS.png b/yellow-paper/docs/public-vm/gen/images/bit-formats/L2GAS.png
deleted file mode 100644
index fcf79de2f78a..000000000000
Binary files a/yellow-paper/docs/public-vm/gen/images/bit-formats/L2GAS.png and /dev/null differ
diff --git a/yellow-paper/docs/public-vm/gen/images/bit-formats/L2GASLEFT.png b/yellow-paper/docs/public-vm/gen/images/bit-formats/L2GASLEFT.png
new file mode 100644
index 000000000000..0cb4674b10b4
Binary files /dev/null and b/yellow-paper/docs/public-vm/gen/images/bit-formats/L2GASLEFT.png differ
diff --git a/yellow-paper/docs/public-vm/gen/images/bit-formats/LT.png b/yellow-paper/docs/public-vm/gen/images/bit-formats/LT.png
index 59927272c47f..442a7021a2ba 100644
Binary files a/yellow-paper/docs/public-vm/gen/images/bit-formats/LT.png and b/yellow-paper/docs/public-vm/gen/images/bit-formats/LT.png differ
diff --git a/yellow-paper/docs/public-vm/gen/images/bit-formats/LTE.png b/yellow-paper/docs/public-vm/gen/images/bit-formats/LTE.png
index 1b0e35cf2908..7f2383fdb4d3 100644
Binary files a/yellow-paper/docs/public-vm/gen/images/bit-formats/LTE.png and b/yellow-paper/docs/public-vm/gen/images/bit-formats/LTE.png differ
diff --git a/yellow-paper/docs/public-vm/gen/images/bit-formats/MOV.png b/yellow-paper/docs/public-vm/gen/images/bit-formats/MOV.png
index 4d79281a5e34..f1e83baa411b 100644
Binary files a/yellow-paper/docs/public-vm/gen/images/bit-formats/MOV.png and b/yellow-paper/docs/public-vm/gen/images/bit-formats/MOV.png differ
diff --git a/yellow-paper/docs/public-vm/gen/images/bit-formats/MSGSROOT.png b/yellow-paper/docs/public-vm/gen/images/bit-formats/MSGSROOT.png
deleted file mode 100644
index d39c81f45647..000000000000
Binary files a/yellow-paper/docs/public-vm/gen/images/bit-formats/MSGSROOT.png and /dev/null differ
diff --git a/yellow-paper/docs/public-vm/gen/images/bit-formats/MUL.png b/yellow-paper/docs/public-vm/gen/images/bit-formats/MUL.png
new file mode 100644
index 000000000000..28095b7457b7
Binary files /dev/null and b/yellow-paper/docs/public-vm/gen/images/bit-formats/MUL.png differ
diff --git a/yellow-paper/docs/public-vm/gen/images/bit-formats/NOT.png b/yellow-paper/docs/public-vm/gen/images/bit-formats/NOT.png
index 34907da432a4..6af81369d5a0 100644
Binary files a/yellow-paper/docs/public-vm/gen/images/bit-formats/NOT.png and b/yellow-paper/docs/public-vm/gen/images/bit-formats/NOT.png differ
diff --git a/yellow-paper/docs/public-vm/gen/images/bit-formats/NOTESROOT.png b/yellow-paper/docs/public-vm/gen/images/bit-formats/NOTESROOT.png
deleted file mode 100644
index 4a8d6b3d9fd5..000000000000
Binary files a/yellow-paper/docs/public-vm/gen/images/bit-formats/NOTESROOT.png and /dev/null differ
diff --git a/yellow-paper/docs/public-vm/gen/images/bit-formats/NULLIFIERSROOT.png b/yellow-paper/docs/public-vm/gen/images/bit-formats/NULLIFIERSROOT.png
deleted file mode 100644
index fc8d2cd10509..000000000000
Binary files a/yellow-paper/docs/public-vm/gen/images/bit-formats/NULLIFIERSROOT.png and /dev/null differ
diff --git a/yellow-paper/docs/public-vm/gen/images/bit-formats/OR.png b/yellow-paper/docs/public-vm/gen/images/bit-formats/OR.png
index d796c0b5488e..c1e6256214d8 100644
Binary files a/yellow-paper/docs/public-vm/gen/images/bit-formats/OR.png and b/yellow-paper/docs/public-vm/gen/images/bit-formats/OR.png differ
diff --git a/yellow-paper/docs/public-vm/gen/images/bit-formats/ORIGIN.png b/yellow-paper/docs/public-vm/gen/images/bit-formats/ORIGIN.png
index f712ff960843..5b8754356b92 100644
Binary files a/yellow-paper/docs/public-vm/gen/images/bit-formats/ORIGIN.png and b/yellow-paper/docs/public-vm/gen/images/bit-formats/ORIGIN.png differ
diff --git a/yellow-paper/docs/public-vm/gen/images/bit-formats/PORTAL.png b/yellow-paper/docs/public-vm/gen/images/bit-formats/PORTAL.png
index 2aa7a82f2033..ff516d75519d 100644
Binary files a/yellow-paper/docs/public-vm/gen/images/bit-formats/PORTAL.png and b/yellow-paper/docs/public-vm/gen/images/bit-formats/PORTAL.png differ
diff --git a/yellow-paper/docs/public-vm/gen/images/bit-formats/PUBLICDATAROOT.png b/yellow-paper/docs/public-vm/gen/images/bit-formats/PUBLICDATAROOT.png
deleted file mode 100644
index 44ddaf86bc26..000000000000
Binary files a/yellow-paper/docs/public-vm/gen/images/bit-formats/PUBLICDATAROOT.png and /dev/null differ
diff --git a/yellow-paper/docs/public-vm/gen/images/bit-formats/READL1TOL2MSG.png b/yellow-paper/docs/public-vm/gen/images/bit-formats/READL1TOL2MSG.png
new file mode 100644
index 000000000000..aa2a43c54e18
Binary files /dev/null and b/yellow-paper/docs/public-vm/gen/images/bit-formats/READL1TOL2MSG.png differ
diff --git a/yellow-paper/docs/public-vm/gen/images/bit-formats/REFUNDEE.png b/yellow-paper/docs/public-vm/gen/images/bit-formats/REFUNDEE.png
deleted file mode 100644
index 70ccb4c1f5a9..000000000000
Binary files a/yellow-paper/docs/public-vm/gen/images/bit-formats/REFUNDEE.png and /dev/null differ
diff --git a/yellow-paper/docs/public-vm/gen/images/bit-formats/RETURN.png b/yellow-paper/docs/public-vm/gen/images/bit-formats/RETURN.png
index e1bf7d6a19d5..90d42f5ad0f0 100644
Binary files a/yellow-paper/docs/public-vm/gen/images/bit-formats/RETURN.png and b/yellow-paper/docs/public-vm/gen/images/bit-formats/RETURN.png differ
diff --git a/yellow-paper/docs/public-vm/gen/images/bit-formats/REVERT.png b/yellow-paper/docs/public-vm/gen/images/bit-formats/REVERT.png
index 67c12bd2d06e..01aa918429fd 100644
Binary files a/yellow-paper/docs/public-vm/gen/images/bit-formats/REVERT.png and b/yellow-paper/docs/public-vm/gen/images/bit-formats/REVERT.png differ
diff --git a/yellow-paper/docs/public-vm/gen/images/bit-formats/SENDER.png b/yellow-paper/docs/public-vm/gen/images/bit-formats/SENDER.png
new file mode 100644
index 000000000000..0001e1614206
Binary files /dev/null and b/yellow-paper/docs/public-vm/gen/images/bit-formats/SENDER.png differ
diff --git a/yellow-paper/docs/public-vm/gen/images/bit-formats/SENDL2TOL1MSG.png b/yellow-paper/docs/public-vm/gen/images/bit-formats/SENDL2TOL1MSG.png
index 04611cd6a436..253882ebc650 100644
Binary files a/yellow-paper/docs/public-vm/gen/images/bit-formats/SENDL2TOL1MSG.png and b/yellow-paper/docs/public-vm/gen/images/bit-formats/SENDL2TOL1MSG.png differ
diff --git a/yellow-paper/docs/public-vm/gen/images/bit-formats/SET.png b/yellow-paper/docs/public-vm/gen/images/bit-formats/SET.png
index 9d68daa851d0..418e88185cdd 100644
Binary files a/yellow-paper/docs/public-vm/gen/images/bit-formats/SET.png and b/yellow-paper/docs/public-vm/gen/images/bit-formats/SET.png differ
diff --git a/yellow-paper/docs/public-vm/gen/images/bit-formats/SHL.png b/yellow-paper/docs/public-vm/gen/images/bit-formats/SHL.png
index 0c082bc62a6d..26064fe61bf4 100644
Binary files a/yellow-paper/docs/public-vm/gen/images/bit-formats/SHL.png and b/yellow-paper/docs/public-vm/gen/images/bit-formats/SHL.png differ
diff --git a/yellow-paper/docs/public-vm/gen/images/bit-formats/SHR.png b/yellow-paper/docs/public-vm/gen/images/bit-formats/SHR.png
index ed85ae15c1f5..d6e76948abe8 100644
Binary files a/yellow-paper/docs/public-vm/gen/images/bit-formats/SHR.png and b/yellow-paper/docs/public-vm/gen/images/bit-formats/SHR.png differ
diff --git a/yellow-paper/docs/public-vm/gen/images/bit-formats/SLOAD.png b/yellow-paper/docs/public-vm/gen/images/bit-formats/SLOAD.png
index f9c6540667d4..05fd89e17ca6 100644
Binary files a/yellow-paper/docs/public-vm/gen/images/bit-formats/SLOAD.png and b/yellow-paper/docs/public-vm/gen/images/bit-formats/SLOAD.png differ
diff --git a/yellow-paper/docs/public-vm/gen/images/bit-formats/SSTORE.png b/yellow-paper/docs/public-vm/gen/images/bit-formats/SSTORE.png
index 5580d4237a77..14742f8d60e0 100644
Binary files a/yellow-paper/docs/public-vm/gen/images/bit-formats/SSTORE.png and b/yellow-paper/docs/public-vm/gen/images/bit-formats/SSTORE.png differ
diff --git a/yellow-paper/docs/public-vm/gen/images/bit-formats/STATICCALL.png b/yellow-paper/docs/public-vm/gen/images/bit-formats/STATICCALL.png
index e433c5063c35..61ba39ba7fbc 100644
Binary files a/yellow-paper/docs/public-vm/gen/images/bit-formats/STATICCALL.png and b/yellow-paper/docs/public-vm/gen/images/bit-formats/STATICCALL.png differ
diff --git a/yellow-paper/docs/public-vm/gen/images/bit-formats/STORAGEADDRESS.png b/yellow-paper/docs/public-vm/gen/images/bit-formats/STORAGEADDRESS.png
new file mode 100644
index 000000000000..d0455038b2e6
Binary files /dev/null and b/yellow-paper/docs/public-vm/gen/images/bit-formats/STORAGEADDRESS.png differ
diff --git a/yellow-paper/docs/public-vm/gen/images/bit-formats/SUB.png b/yellow-paper/docs/public-vm/gen/images/bit-formats/SUB.png
index e6157763289d..647af157ba7a 100644
Binary files a/yellow-paper/docs/public-vm/gen/images/bit-formats/SUB.png and b/yellow-paper/docs/public-vm/gen/images/bit-formats/SUB.png differ
diff --git a/yellow-paper/docs/public-vm/gen/images/bit-formats/TIMESTAMP.png b/yellow-paper/docs/public-vm/gen/images/bit-formats/TIMESTAMP.png
index 8ac215faa811..e505abdd0329 100644
Binary files a/yellow-paper/docs/public-vm/gen/images/bit-formats/TIMESTAMP.png and b/yellow-paper/docs/public-vm/gen/images/bit-formats/TIMESTAMP.png differ
diff --git a/yellow-paper/docs/public-vm/gen/images/bit-formats/ULOG.png b/yellow-paper/docs/public-vm/gen/images/bit-formats/ULOG.png
deleted file mode 100644
index 1c414f29b536..000000000000
Binary files a/yellow-paper/docs/public-vm/gen/images/bit-formats/ULOG.png and /dev/null differ
diff --git a/yellow-paper/docs/public-vm/gen/images/bit-formats/VERSION.png b/yellow-paper/docs/public-vm/gen/images/bit-formats/VERSION.png
index dc95ff9b5caa..c7cb9e18eefe 100644
Binary files a/yellow-paper/docs/public-vm/gen/images/bit-formats/VERSION.png and b/yellow-paper/docs/public-vm/gen/images/bit-formats/VERSION.png differ
diff --git a/yellow-paper/docs/public-vm/gen/images/bit-formats/XOR.png b/yellow-paper/docs/public-vm/gen/images/bit-formats/XOR.png
index 83610f677e96..668629f573f3 100644
Binary files a/yellow-paper/docs/public-vm/gen/images/bit-formats/XOR.png and b/yellow-paper/docs/public-vm/gen/images/bit-formats/XOR.png differ
diff --git a/yellow-paper/docs/public-vm/gen/images/bit-formats/internalcall.png b/yellow-paper/docs/public-vm/gen/images/bit-formats/internalcall.png
new file mode 100644
index 000000000000..8a2930a7fe26
Binary files /dev/null and b/yellow-paper/docs/public-vm/gen/images/bit-formats/internalcall.png differ
diff --git a/yellow-paper/docs/public-vm/instruction-set.mdx b/yellow-paper/docs/public-vm/instruction-set.mdx
index ce5eb82ffc91..1693295d2de1 100644
--- a/yellow-paper/docs/public-vm/instruction-set.mdx
+++ b/yellow-paper/docs/public-vm/instruction-set.mdx
@@ -1,5 +1,13 @@
 # Instruction Set
 
+This page lists all of the instructions supported by the Aztec Virtual Machine (AVM).
+
+The following notes are relevant to the table and sections below:
+- `M[offset]` notation is shorthand for `context.machineState.memory[offset]`
+- Any instruction whose description does not mention a program counter change simply increments it: `context.machineState.pc++`
+- All instructions update `context.machineState.*GasLeft` as detailed in ["Gas limits and tracking"](./avm#gas-limits-and-tracking)
+- Any instruction can lead to an exceptional halt as specified in ["Exceptional halting"](./avm#exceptional-halting)
+
 import GeneratedInstructionSet from "./gen/_InstructionSet.mdx";
 
 <GeneratedInstructionSet />
diff --git a/yellow-paper/docs/public-vm/state-model.md b/yellow-paper/docs/public-vm/state-model.md
index a52bbbe7504f..d6087cba3e8e 100644
--- a/yellow-paper/docs/public-vm/state-model.md
+++ b/yellow-paper/docs/public-vm/state-model.md
@@ -52,11 +52,11 @@ Memory addresses must be tagged to be a `u32` type.
 - `M[X]`: main memory cell at offset `X`
 - `tag`: a value referring to a memory cell's type (its maximum potential value)
 - `T[X]`: the tag associated with memory cell at offset `X`
-- `in-tag`: an instruction's tag to check input operands against. Present for many but not all instructions.
-- `dst-tag`: the target type of a `CAST` instruction, also used to tag the destination memory cell
-- `ADD<X>`: shorthand for an `ADD` instruction with `in-tag = X`
-- `ADD<X> aOffset bOffset dstOffset`: an full `ADD` instruction with `in-tag = X`. See [here](./instruction-set#isa-section-add) for more details.
-- `CAST<X>`: a `CAST` instruction with `dst-tag`: `X`. `CAST` is the only instruction with a `dst-tag`. See [here](./instruction-set#isa-section-cast) for more details.
+- `inTag`: an instruction's tag to check input operands against. Present for many but not all instructions.
+- `dstTag`: the target type of a `CAST` instruction, also used to tag the destination memory cell
+- `ADD<X>`: shorthand for an `ADD` instruction with `inTag = X`
+- `ADD<X> aOffset bOffset dstOffset`: an full `ADD` instruction with `inTag = X`. See [here](./instruction-set#isa-section-add) for more details.
+- `CAST<X>`: a `CAST` instruction with `dstTag`: `X`. `CAST` is the only instruction with a `dstTag`. See [here](./instruction-set#isa-section-cast) for more details.
 
 ### Tags and tagged memory
 
@@ -80,7 +80,7 @@ The purpose of a tag is to inform the VM of the maximum possible length of an op
 
 #### Checking input operand tags
 
-Many AVM instructions explicitly operate over range-constrained input parameters (e.g. `ADD<in-tag>`). The maximum allowable value for an instruction's input parameters is defined via an `in-tag` (instruction/input tag). Two potential scenarios result:
+Many AVM instructions explicitly operate over range-constrained input parameters (e.g. `ADD<inTag>`). The maximum allowable value for an instruction's input parameters is defined via an `inTag` (instruction/input tag). Two potential scenarios result:
 
 1. A VM instruction's tag value matches the input parameter tag values
 2. A VM instruction's tag value does _not_ match the input parameter tag values
@@ -95,8 +95,8 @@ It is required that all VM instructions that write into main memory explicitly d
 
 ```
 # ADD<u32> aOffset bOffset dstOffset
-assert T[aOffset] == T[bOffset] == u32 // check inputs against in-tag, revert on mismatch
-T[dstOffset] = u32                     // tag destination with in-tag
+assert T[aOffset] == T[bOffset] == u32 // check inputs against inTag, revert on mismatch
+T[dstOffset] = u32                     // tag destination with inTag
 M[dstOffset] = M[aOffset] + M[bOffset] // perform the addition
 ```
 
@@ -110,7 +110,7 @@ T[dstOffset] = T[srcOffset] // preserve tag
 M[dstOffset] = M[srcOffset] // perform the move
 ```
 
-Note that `MOV` does not have an `in-tag` and therefore does not need to make any assertions regarding the source memory cell's type.
+Note that `MOV` does not have an `inTag` and therefore does not need to make any assertions regarding the source memory cell's type.
 
 #### `CAST` and tag conversions
 
@@ -125,7 +125,7 @@ Case 2 is trivial as no additional consistency checks must be performed between
 
 ```
 # CAST<u64> srcOffset dstOffset
-T[dstOffset] = u64                         // tag destination with dst-tag
+T[dstOffset] = u64                         // tag destination with dstTag
 M[dstOffset] = cast<to: u64>(M[srcOffset]) // perform cast
 ```
 
diff --git a/yellow-paper/src/preprocess/InstructionSet/InstructionSet.js b/yellow-paper/src/preprocess/InstructionSet/InstructionSet.js
index ff3fd87fb47e..776890efff94 100644
--- a/yellow-paper/src/preprocess/InstructionSet/InstructionSet.js
+++ b/yellow-paper/src/preprocess/InstructionSet/InstructionSet.js
@@ -15,13 +15,11 @@ const INSTRUCTION_SET_RAW = [
     {
         "id": "add",
         "Name": "`ADD`",
-        "Category": "arithmetic",
+        "Category": "Compute - Arithmetic",
         "Flags": [
             {"name": "indirect", "description": INDIRECT_FLAG_DESCRIPTION},
-            {"name": "in-tag", "description": IN_TAG_DESCRIPTION},
+            {"name": "inTag", "description": IN_TAG_DESCRIPTION},
         ],
-        "#memreads": "2",
-        "#memwrites": "1",
         "Args": [
             {"name": "aOffset", "description": "memory offset of the operation's left input"},
             {"name": "bOffset", "description": "memory offset of the operation's right input"},
@@ -30,19 +28,17 @@ const INSTRUCTION_SET_RAW = [
         "Expression": "`M[dstOffset] = M[aOffset] + M[bOffset] mod 2^k`",
         "Summary": "Addition (a + b)",
         "Details": "",
-        "Tag checks": "`T[aOffset] == T[bOffset] == in-tag`",
-        "Tag updates": "`T[dstOffset] = in-tag`",
+        "Tag checks": "`T[aOffset] == T[bOffset] == inTag`",
+        "Tag updates": "`T[dstOffset] = inTag`",
     },
     {
         "id": "sub",
         "Name": "`SUB`",
-        "Category": "arithmetic",
+        "Category": "Compute - Arithmetic",
         "Flags": [
             {"name": "indirect", "description": INDIRECT_FLAG_DESCRIPTION},
-            {"name": "in-tag", "description": IN_TAG_DESCRIPTION},
+            {"name": "inTag", "description": IN_TAG_DESCRIPTION},
         ],
-        "#memreads": "2",
-        "#memwrites": "1",
         "Args": [
             {"name": "aOffset", "description": "memory offset of the operation's left input"},
             {"name": "bOffset", "description": "memory offset of the operation's right input"},
@@ -51,19 +47,17 @@ const INSTRUCTION_SET_RAW = [
         "Expression": "`M[dstOffset] = M[aOffset] - M[bOffset] mod 2^k`",
         "Summary": "Subtraction (a - b)",
         "Details": "",
-        "Tag checks": "`T[aOffset] == T[bOffset] == in-tag`",
-        "Tag updates": "`T[dstOffset] = in-tag`",
+        "Tag checks": "`T[aOffset] == T[bOffset] == inTag`",
+        "Tag updates": "`T[dstOffset] = inTag`",
     },
     {
         "id": "mul",
         "Name": "`MUL`",
-        "Category": "arithmetic",
+        "Category": "Compute - Arithmetic",
         "Flags": [
             {"name": "indirect", "description": INDIRECT_FLAG_DESCRIPTION},
-            {"name": "in-tag", "description": IN_TAG_DESCRIPTION},
+            {"name": "inTag", "description": IN_TAG_DESCRIPTION},
         ],
-        "#memreads": "2",
-        "#memwrites": "1",
         "Args": [
             {"name": "aOffset", "description": "memory offset of the operation's left input"},
             {"name": "bOffset", "description": "memory offset of the operation's right input"},
@@ -72,19 +66,17 @@ const INSTRUCTION_SET_RAW = [
         "Expression": "`M[dstOffset] = M[aOffset] * M[bOffset] mod 2^k`",
         "Summary": "Multiplication (a * b)",
         "Details": "",
-        "Tag checks": "`T[aOffset] == T[bOffset] == in-tag`",
-        "Tag updates": "`T[dstOffset] = in-tag`",
+        "Tag checks": "`T[aOffset] == T[bOffset] == inTag`",
+        "Tag updates": "`T[dstOffset] = inTag`",
     },
     {
         "id": "div",
         "Name": "`DIV`",
-        "Category": "arithmetic",
+        "Category": "Compute - Arithmetic",
         "Flags": [
             {"name": "indirect", "description": INDIRECT_FLAG_DESCRIPTION},
-            {"name": "in-tag", "description": IN_TAG_DESCRIPTION},
+            {"name": "inTag", "description": IN_TAG_DESCRIPTION},
         ],
-        "#memreads": "2",
-        "#memwrites": "1",
         "Args": [
             {"name": "aOffset", "description": "memory offset of the operation's left input"},
             {"name": "bOffset", "description": "memory offset of the operation's right input"},
@@ -93,19 +85,17 @@ const INSTRUCTION_SET_RAW = [
         "Expression": "`M[dstOffset] = M[aOffset] / M[bOffset]`",
         "Summary": "Unsigned division (a / b)",
         "Details": "",
-        "Tag checks": "`T[aOffset] == T[bOffset] == in-tag`",
-        "Tag updates": "`T[dstOffset] = in-tag`",
+        "Tag checks": "`T[aOffset] == T[bOffset] == inTag`",
+        "Tag updates": "`T[dstOffset] = inTag`",
     },
     {
         "id": "eq",
         "Name": "`EQ`",
-        "Category": "conditional",
+        "Category": "Compute - Comparators",
         "Flags": [
             {"name": "indirect", "description": INDIRECT_FLAG_DESCRIPTION},
-            {"name": "in-tag", "description": IN_TAG_DESCRIPTION},
+            {"name": "inTag", "description": IN_TAG_DESCRIPTION},
         ],
-        "#memreads": "2",
-        "#memwrites": "1",
         "Args": [
             {"name": "aOffset", "description": "memory offset of the operation's left input"},
             {"name": "bOffset", "description": "memory offset of the operation's right input"},
@@ -114,19 +104,17 @@ const INSTRUCTION_SET_RAW = [
         "Expression": "`M[dstOffset] = M[aOffset] == M[bOffset] ? 1 : 0`",
         "Summary": "Equality check (a == b)",
         "Details": "",
-        "Tag checks": "`T[aOffset] == T[bOffset] == in-tag`",
-        "Tag updates": "`T[dstOffset] = in-tag`",
+        "Tag checks": "`T[aOffset] == T[bOffset] == inTag`",
+        "Tag updates": "`T[dstOffset] = inTag`",
     },
     {
         "id": "lt",
         "Name": "`LT`",
-        "Category": "conditional",
+        "Category": "Compute - Comparators",
         "Flags": [
             {"name": "indirect", "description": INDIRECT_FLAG_DESCRIPTION},
-            {"name": "in-tag", "description": IN_TAG_DESCRIPTION},
+            {"name": "inTag", "description": IN_TAG_DESCRIPTION},
         ],
-        "#memreads": "2",
-        "#memwrites": "1",
         "Args": [
             {"name": "aOffset", "description": "memory offset of the operation's left input"},
             {"name": "bOffset", "description": "memory offset of the operation's right input"},
@@ -135,19 +123,17 @@ const INSTRUCTION_SET_RAW = [
         "Expression": "`M[dstOffset] = M[aOffset] < M[bOffset] ? 1 : 0`",
         "Summary": "Less-than check (a < b)",
         "Details": "",
-        "Tag checks": "`T[aOffset] == T[bOffset] == in-tag`",
-        "Tag updates": "`T[dstOffset] = in-tag`",
+        "Tag checks": "`T[aOffset] == T[bOffset] == inTag`",
+        "Tag updates": "`T[dstOffset] = inTag`",
     },
     {
         "id": "lte",
         "Name": "`LTE`",
-        "Category": "conditional",
+        "Category": "Compute - Comparators",
         "Flags": [
             {"name": "indirect", "description": INDIRECT_FLAG_DESCRIPTION},
-            {"name": "in-tag", "description": IN_TAG_DESCRIPTION},
+            {"name": "inTag", "description": IN_TAG_DESCRIPTION},
         ],
-        "#memreads": "2",
-        "#memwrites": "1",
         "Args": [
             {"name": "aOffset", "description": "memory offset of the operation's left input"},
             {"name": "bOffset", "description": "memory offset of the operation's right input"},
@@ -156,19 +142,17 @@ const INSTRUCTION_SET_RAW = [
         "Expression": "`M[dstOffset] = M[aOffset] <= M[bOffset] ? 1 : 0`",
         "Summary": "Less-than-or-equals check (a <= b)",
         "Details": "",
-        "Tag checks": "`T[aOffset] == T[bOffset] == in-tag`",
-        "Tag updates": "`T[dstOffset] = in-tag`",
+        "Tag checks": "`T[aOffset] == T[bOffset] == inTag`",
+        "Tag updates": "`T[dstOffset] = inTag`",
     },
     {
         "id": "and",
         "Name": "`AND`",
-        "Category": "bitwise",
+        "Category": "Compute - Bitwise",
         "Flags": [
             {"name": "indirect", "description": INDIRECT_FLAG_DESCRIPTION},
-            {"name": "in-tag", "description": IN_TAG_DESCRIPTION},
+            {"name": "inTag", "description": IN_TAG_DESCRIPTION},
         ],
-        "#memreads": "2",
-        "#memwrites": "1",
         "Args": [
             {"name": "aOffset", "description": "memory offset of the operation's left input"},
             {"name": "bOffset", "description": "memory offset of the operation's right input"},
@@ -177,19 +161,17 @@ const INSTRUCTION_SET_RAW = [
         "Expression": "`M[dstOffset] = M[aOffset] AND M[bOffset]`",
         "Summary": "Bitwise AND (a & b)",
         "Details": "",
-        "Tag checks": "`T[aOffset] == T[bOffset] == in-tag`",
-        "Tag updates": "`T[dstOffset] = in-tag`",
+        "Tag checks": "`T[aOffset] == T[bOffset] == inTag`",
+        "Tag updates": "`T[dstOffset] = inTag`",
     },
     {
         "id": "or",
         "Name": "`OR`",
-        "Category": "bitwise",
+        "Category": "Compute - Bitwise",
         "Flags": [
             {"name": "indirect", "description": INDIRECT_FLAG_DESCRIPTION},
-            {"name": "in-tag", "description": IN_TAG_DESCRIPTION},
+            {"name": "inTag", "description": IN_TAG_DESCRIPTION},
         ],
-        "#memreads": "2",
-        "#memwrites": "1",
         "Args": [
             {"name": "aOffset", "description": "memory offset of the operation's left input"},
             {"name": "bOffset", "description": "memory offset of the operation's right input"},
@@ -198,19 +180,17 @@ const INSTRUCTION_SET_RAW = [
         "Expression": "`M[dstOffset] = M[aOffset] OR M[bOffset]`",
         "Summary": "Bitwise OR (a | b)",
         "Details": "",
-        "Tag checks": "`T[aOffset] == T[bOffset] == in-tag`",
-        "Tag updates": "`T[dstOffset] = in-tag`",
+        "Tag checks": "`T[aOffset] == T[bOffset] == inTag`",
+        "Tag updates": "`T[dstOffset] = inTag`",
     },
     {
         "id": "xor",
         "Name": "`XOR`",
-        "Category": "bitwise",
+        "Category": "Compute - Bitwise",
         "Flags": [
             {"name": "indirect", "description": INDIRECT_FLAG_DESCRIPTION},
-            {"name": "in-tag", "description": IN_TAG_DESCRIPTION},
+            {"name": "inTag", "description": IN_TAG_DESCRIPTION},
         ],
-        "#memreads": "2",
-        "#memwrites": "1",
         "Args": [
             {"name": "aOffset", "description": "memory offset of the operation's left input"},
             {"name": "bOffset", "description": "memory offset of the operation's right input"},
@@ -219,19 +199,17 @@ const INSTRUCTION_SET_RAW = [
         "Expression": "`M[dstOffset] = M[aOffset] XOR M[bOffset]`",
         "Summary": "Bitwise XOR (a ^ b)",
         "Details": "",
-        "Tag checks": "`T[aOffset] == T[bOffset] == in-tag`",
-        "Tag updates": "`T[dstOffset] = in-tag`",
+        "Tag checks": "`T[aOffset] == T[bOffset] == inTag`",
+        "Tag updates": "`T[dstOffset] = inTag`",
     },
     {
         "id": "not",
         "Name": "`NOT`",
-        "Category": "bitwise",
+        "Category": "Compute - Bitwise",
         "Flags": [
             {"name": "indirect", "description": INDIRECT_FLAG_DESCRIPTION},
-            {"name": "in-tag", "description": IN_TAG_DESCRIPTION},
+            {"name": "inTag", "description": IN_TAG_DESCRIPTION},
         ],
-        "#memreads": "1",
-        "#memwrites": "1",
         "Args": [
             {"name": "aOffset", "description": "memory offset of the operation's input"},
             {"name": "dstOffset", "description": "memory offset specifying where to store operation's result"},
@@ -239,19 +217,17 @@ const INSTRUCTION_SET_RAW = [
         "Expression": "`M[dstOffset] = NOT M[aOffset]`",
         "Summary": "Bitwise NOT (inversion)",
         "Details": "",
-        "Tag checks": "`T[aOffset] == in-tag`",
-        "Tag updates": "`T[dstOffset] = in-tag`",
+        "Tag checks": "`T[aOffset] == inTag`",
+        "Tag updates": "`T[dstOffset] = inTag`",
     },
     {
         "id": "shl",
         "Name": "`SHL`",
-        "Category": "bitwise",
+        "Category": "Compute - Bitwise",
         "Flags": [
             {"name": "indirect", "description": INDIRECT_FLAG_DESCRIPTION},
-            {"name": "in-tag", "description": IN_TAG_DESCRIPTION},
+            {"name": "inTag", "description": IN_TAG_DESCRIPTION},
         ],
-        "#memreads": "2",
-        "#memwrites": "1",
         "Args": [
             {"name": "aOffset", "description": "memory offset of the operation's left input"},
             {"name": "bOffset", "description": "memory offset of the operation's right input"},
@@ -260,19 +236,17 @@ const INSTRUCTION_SET_RAW = [
         "Expression": "`M[dstOffset] = M[aOffset] << M[bOffset]`",
         "Summary": "Bitwise leftward shift (a << b)",
         "Details": "",
-        "Tag checks": "`T[aOffset] == T[bOffset] == in-tag`",
-        "Tag updates": "`T[dstOffset] = in-tag`",
+        "Tag checks": "`T[aOffset] == T[bOffset] == inTag`",
+        "Tag updates": "`T[dstOffset] = inTag`",
     },
     {
         "id": "shr",
         "Name": "`SHR`",
-        "Category": "bitwise",
+        "Category": "Compute - Bitwise",
         "Flags": [
             {"name": "indirect", "description": INDIRECT_FLAG_DESCRIPTION},
-            {"name": "in-tag", "description": IN_TAG_DESCRIPTION},
+            {"name": "inTag", "description": IN_TAG_DESCRIPTION},
         ],
-        "#memreads": "2",
-        "#memwrites": "1",
         "Args": [
             {"name": "aOffset", "description": "memory offset of the operation's left input"},
             {"name": "bOffset", "description": "memory offset of the operation's right input"},
@@ -281,816 +255,718 @@ const INSTRUCTION_SET_RAW = [
         "Expression": "`M[dstOffset] = M[aOffset] >> M[bOffset]`",
         "Summary": "Bitwise rightward shift (a >> b)",
         "Details": "",
-        "Tag checks": "`T[aOffset] == T[bOffset] == in-tag`",
-        "Tag updates": "`T[dstOffset] = in-tag`",
+        "Tag checks": "`T[aOffset] == T[bOffset] == inTag`",
+        "Tag updates": "`T[dstOffset] = inTag`",
     },
     {
         "id": "cast",
         "Name": "`CAST`",
-        "Category": "types",
+        "Category": "Type Conversions",
         "Flags": [
             {"name": "indirect", "description": INDIRECT_FLAG_DESCRIPTION},
-            {"name": "dst-tag", "description": DST_TAG_DESCRIPTION},
+            {"name": "dstTag", "description": DST_TAG_DESCRIPTION},
         ],
-        "#memreads": "1",
-        "#memwrites": "1",
         "Args": [
             {"name": "aOffset", "description": "memory offset of word to cast"},
             {"name": "dstOffset", "description": "memory offset specifying where to store operation's result"},
         ],
-        "Expression": "`M[dstOffset] = cast<dst-tag>(M[aOffset])`",
+        "Expression": "`M[dstOffset] = cast<dstTag>(M[aOffset])`",
         "Summary": "Type cast",
-        "Details": "Cast a word in memory based on the `dst-tag` specified in the bytecode. Truncates (`M[dstOffset] = M[aOffset] mod 2^dstsize`) when casting to a smaller type, left-zero-pads when casting to a larger type. See [here](./state-model#cast-and-tag-conversions) for more details.",
+        "Details": "Cast a word in memory based on the `dstTag` specified in the bytecode. Truncates (`M[dstOffset] = M[aOffset] mod 2^dstsize`) when casting to a smaller type, left-zero-pads when casting to a larger type. See [here](./state-model#cast-and-tag-conversions) for more details.",
         "Tag checks": "",
-        "Tag updates": "`T[dstOffset] = dst-tag`",
+        "Tag updates": "`T[dstOffset] = dstTag`",
     },
     {
-        "id": "set",
-        "Name": "`SET`",
-        "Category": "memory",
-        "Flags": [
-            {"name": "indirect", "description": INDIRECT_FLAG_DESCRIPTION},
-            {"name": "in-tag", "description": "The [type/size](./state-model#tags-and-tagged-memory) to check inputs against and tag the destination with. `field` type is NOT supported for SET."},
-        ],
-        "#memreads": "0",
-        "#memwrites": "1",
-        "Args": [
-            {"name": "const", "description": "an N-bit constant value from the bytecode to store in memory (any type except `field`)", "mode": "immediate"},
-            {"name": "dstOffset", "description": "memory offset specifying where to store the constant"},
-        ],
-        "Expression": "`M[dstOffset] = const`",
-        "Summary": "Set a memory word from a constant in the bytecode.",
-        "Details": "Set memory word at `dstOffset` to `const`'s immediate value. `const`'s bit-size (N) can be 8, 16, 32, 64, or 128 based on `in-tag`. It _cannot be 254 (`field` type)_!",
-        "Tag checks": "",
-        "Tag updates": "`T[dstOffset] = in-tag`",
-    },
-    {
-        "id": "mov",
-        "Name": "`MOV`",
-        "Category": "memory",
+        "id": "address",
+        "Name": "`ADDRESS`",
+        "Category": "Execution Environment",
         "Flags": [
             {"name": "indirect", "description": INDIRECT_FLAG_DESCRIPTION},
         ],
-        "#memreads": "1",
-        "#memwrites": "1",
         "Args": [
-            {"name": "srcOffset", "description": "memory offset of word to move"},
-            {"name": "dstOffset", "description": "memory offset specifying where to store that word"},
+            {"name": "dstOffset", "description": "memory offset specifying where to store operation's result"},
         ],
-        "Expression": "`M[dstOffset] = M[srcOffset]`",
-        "Summary": "Move a word from source memory location to destination`.",
+        "Expression": "`M[dstOffset] = context.environment.address`",
+        "Summary": "Get the address of the currently executing l2 contract",
         "Details": "",
         "Tag checks": "",
-        "Tag updates": "`T[dstOffset] = T[srcOffset]`",
+        "Tag updates": "`T[dstOffset] = u32`",
     },
     {
-        "id": "cmov",
-        "Name": "`CMOV`",
-        "Category": "memory",
+        "id": "storageaddress",
+        "Name": "`STORAGEADDRESS`",
+        "Category": "Execution Environment",
         "Flags": [
             {"name": "indirect", "description": INDIRECT_FLAG_DESCRIPTION},
         ],
-        "#memreads": "3",
-        "#memwrites": "1",
         "Args": [
-            {"name": "aOffset", "description": "memory offset of word 'a' to conditionally move"},
-            {"name": "bOffset", "description": "memory offset of word 'b' to conditionally move"},
-            {"name": "condOffset", "description": "memory offset of the operations 'conditional' input"},
             {"name": "dstOffset", "description": "memory offset specifying where to store operation's result"},
         ],
-        "Expression": "`M[dstOffset] = M[condOffset] > 0 ? M[aOffset] : M[bOffset]`",
-        "Summary": "Move a word (conditionally chosen) from one memory location to another (`d = cond > 0 ? a : b`).",
-        "Details": "One of two source memory locations is chosen based on the condition. `T[condOffset]` is not checked because the greater-than-zero suboperation is the same regardless of type.",
+        "Expression": "`M[dstOffset] = context.environment.storageAddress`",
+        "Summary": "Get the _storage_ address of the currently executing context",
+        "Details": "The storage address is used for public storage accesses.",
         "Tag checks": "",
-        "Tag updates": "`T[dstOffset] = M[condOffset] > 0 ? T[aOffset] : T[bOffset]`",
+        "Tag updates": "`T[dstOffset] = u32`",
     },
     {
-        "id": "calldatacopy",
-        "Name": "`CALLDATACOPY`",
-        "Category": "contract calls",
+        "id": "origin",
+        "Name": "`ORIGIN`",
+        "Category": "Execution Environment",
         "Flags": [
             {"name": "indirect", "description": INDIRECT_FLAG_DESCRIPTION},
         ],
-        "#memreads": "`s1`",
-        "#memwrites": "`s1`",
         "Args": [
-            {"name": "cdOffset", "description": "offset into calldata to copy from"},
-            {"name": "copySize", "description": "number of words to copy", "mode": "immediate", "type": "u32"},
-            {"name": "dstOffset", "description": "memory offset specifying where to copy the first word to"},
+            {"name": "dstOffset", "description": "memory offset specifying where to store operation's result"},
         ],
-        "Expression": "`M[dstOffset:dstOffset+copySize] = calldata[cdOffset:cdOffset+copySize]`",
-        "Summary": "Copy calldata into memory.",
-        "Details": "Calldata is read-only and cannot be directly operated on by other instructions. This instruction moves words from calldata into memory so they can be operated on normally.",
+        "Expression": "`M[dstOffset] = context.environment.origin`",
+        "Summary": "Get the transaction's origination address",
+        "Details": "",
         "Tag checks": "",
-        "Tag updates": "`T[dstOffset:dstOffset+copySize] = field`",
+        "Tag updates": "`T[dstOffset] = u32`",
     },
     {
-        "id": "sload",
-        "Name": "`SLOAD`",
-        "Category": "storage & messaging",
+        "id": "sender",
+        "Name": "`SENDER`",
+        "Category": "Execution Environment",
         "Flags": [
             {"name": "indirect", "description": INDIRECT_FLAG_DESCRIPTION},
         ],
-        "#memreads": "2",
-        "#memwrites": "1",
         "Args": [
-            {"name": "slotOffset", "description": "memory offset of the storage slot to load from"},
             {"name": "dstOffset", "description": "memory offset specifying where to store operation's result"},
         ],
-        "Expression": "`M[dstOffset] = storage[M[slotOffset]]`",
-        "Summary": "Load a word from storage.",
-        "Details": "Load a word from this contract's persistent public storage into memory.",
+        "Expression": "`M[dstOffset] = context.environment.sender`",
+        "Summary": "Get the address of the sender (caller of the current context)",
+        "Details": "",
         "Tag checks": "",
-        "Tag updates": "`T[dstOffset] = field`",
+        "Tag updates": "`T[dstOffset] = u32`",
     },
     {
-        "id": "sstore",
-        "Name": "`SSTORE`",
-        "Category": "storage & messaging",
+        "id": "portal",
+        "Name": "`PORTAL`",
+        "Category": "Execution Environment",
         "Flags": [
             {"name": "indirect", "description": INDIRECT_FLAG_DESCRIPTION},
         ],
-        "#memreads": "2",
-        "#memwrites": "0",
         "Args": [
-            {"name": "srcOffset", "description": "memory offset of the word to store"},
-            {"name": "slotOffset", "description": "memory offset containing the storage slot to store to"},
+            {"name": "dstOffset", "description": "memory offset specifying where to store operation's result"},
         ],
-        "Expression": "`storage[M[slotOffset]] = M[srcOffset]`",
-        "Summary": "Write a word to storage.",
-        "Details": "Store a word from memory into this contract's persistent public storage.",
+        "Expression": "`M[dstOffset] = context.environment.portal`",
+        "Summary": "Get the address of the l1 portal contract",
+        "Details": "",
         "Tag checks": "",
-        "Tag updates": "",
+        "Tag updates": "`T[dstOffset] = u32`",
     },
     {
-        "id": "emitnotehash",
-        "Name": "`EMITNOTEHASH`",
-        "Category": "storage & messaging",
+        "id": "feeperl1gas",
+        "Name": "`FEEPERL1GAS`",
+        "Category": "Execution Environment",
         "Flags": [
             {"name": "indirect", "description": INDIRECT_FLAG_DESCRIPTION},
         ],
-        "#memreads": "1",
-        "#memwrites": "0",
         "Args": [
-            {"name": "noteHashOffset", "description": "memory offset of the note hash"},
+            {"name": "dstOffset", "description": "memory offset specifying where to store operation's result"},
         ],
-        "Expression": `emitNoteHash(M[contentOffset])`,
-        "Summary": "Emit a new note hash to be inserted into the notes tree",
+        "Expression": "`M[dstOffset] = context.environment.feePerL1Gas`",
+        "Summary": "Get the fee to be paid per \"L1 gas\" - constant for entire transaction",
         "Details": "",
         "Tag checks": "",
-        "Tag updates": "",
+        "Tag updates": "`T[dstOffset] = u32`",
     },
     {
-        "id": "emitnullifier",
-        "Name": "`EMITNULLIFIER`",
-        "Category": "storage & messaging",
+        "id": "feeperl2gas",
+        "Name": "`FEEPERL2GAS`",
+        "Category": "Execution Environment",
         "Flags": [
             {"name": "indirect", "description": INDIRECT_FLAG_DESCRIPTION},
         ],
-        "#memreads": "1",
-        "#memwrites": "0",
         "Args": [
-            {"name": "nullifierOffset", "description": "memory offset of nullifier"},
+            {"name": "dstOffset", "description": "memory offset specifying where to store operation's result"},
         ],
-        "Expression": `emitNullifier(M[nullifierOffset])`,
-        "Summary": "Emit a new nullifier to be inserted into the nullifier tree",
+        "Expression": "`M[dstOffset] = context.environment.feePerL2Gas`",
+        "Summary": "Get the fee to be paid per \"L2 gas\" - constant for entire transaction",
         "Details": "",
         "Tag checks": "",
-        "Tag updates": "",
+        "Tag updates": "`T[dstOffset] = u32`",
     },
     {
-        "id": "sendl2tol1msg",
-        "Name": "`SENDL2TOL1MSG`",
-        "Category": "storage & messaging",
+        "id": "feeperdagas",
+        "Name": "`FEEPERDAGAS`",
+        "Category": "Execution Environment",
         "Flags": [
             {"name": "indirect", "description": INDIRECT_FLAG_DESCRIPTION},
         ],
-        "#memreads": "1",
-        "#memwrites": "0",
         "Args": [
-            {"name": "contentOffset", "description": "memory offset of the message content"},
+            {"name": "dstOffset", "description": "memory offset specifying where to store operation's result"},
         ],
-        "Expression": `sendL2ToL1Message(M[contentOffset])`,
-        "Summary": "Send an L2-to-L1 message",
+        "Expression": "`M[dstOffset] = context.environment.feePerDaGas`",
+        "Summary": "Get the fee to be paid per \"DA gas\" - constant for entire transaction",
         "Details": "",
         "Tag checks": "",
-        "Tag updates": "",
-    },
-    {
-        "id": "jump",
-        "Name": "`JUMP`",
-        "Category": "control",
-        "Flags": [],
-        "#memreads": "0",
-        "#memwrites": "0",
-        "Args": [
-            {"name": "loc", "description": "target location to jump to", "mode": "immediate", "type": "u32"},
-        ],
-        "Expression": "`PC = loc`",
-        "Summary": "Jump to a location in the bytecode.",
-        "Details": "Target location is an immediate value (a constant in the bytecode).",
-        "Tag checks": "",
-        "Tag updates": "",
+        "Tag updates": "`T[dstOffset] = u32`",
     },
     {
-        "id": "jumpi",
-        "Name": "`JUMPI`",
-        "Category": "control",
+        "id": "contractcalldepth",
+        "Name": "`CONTRACTCALLDEPTH`",
+        "Category": "Execution Environment",
         "Flags": [
             {"name": "indirect", "description": INDIRECT_FLAG_DESCRIPTION},
         ],
-        "#memreads": "3",
-        "#memwrites": "0",
         "Args": [
-            {"name": "loc", "description": "target location conditionally jump to", "mode": "immediate", "type": "u32"},
-            {"name": "condOffset", "description": "memory offset of the operations 'conditional' input"},
+            {"name": "dstOffset", "description": "memory offset specifying where to store operation's result"},
         ],
-        "Expression": "`PC = M[condOffset] > 0 ? loc : PC`",
-        "Summary": "Conditionally jump to a location in the bytecode.",
-        "Details": "Target location is an immediate value (a constant in the bytecode). `T[condOffset]` is not checked because the greater-than-zero suboperation is the same regardless of type.",
+        "Expression": "`M[dstOffset] = context.environment.contractCallDepth`",
+        "Summary": "Get how many contract calls deep the current call context is",
+        "Details": "Note: security issues with EVM's tx.origin can be resolved by asserting `calldepth == 0`.",
         "Tag checks": "",
-        "Tag updates": "",
+        "Tag updates": "`T[dstOffset] = u8`",
     },
     {
-        "id": "return",
-        "Name": "`RETURN`",
-        "Category": "contract calls",
+        "id": "chainid",
+        "Name": "`CHAINID`",
+        "Category": "Execution Environment - Globals",
         "Flags": [
             {"name": "indirect", "description": INDIRECT_FLAG_DESCRIPTION},
         ],
-        "#memreads": "`s1`",
-        "#memwrites": "0",
         "Args": [
-            {"name": "retOffset", "description": "memory offset of first word to return"},
-            {"name": "retSize", "description": "number of words to return", "mode": "immediate", "type": "u32"},
+            {"name": "dstOffset", "description": "memory offset specifying where to store operation's result"},
         ],
-        "Expression": "`return(M[retOffset:retOffset+retSize])`",
-        "Summary": "Halt execution with `success`, optionally returning some data.",
-        "Details": "Return control flow to the calling context/contract.",
+        "Expression": "`M[dstOffset] = context.environment.globals.chainId`",
+        "Summary": "Get this rollup's L1 chain ID",
+        "Details": "",
         "Tag checks": "",
-        "Tag updates": "",
+        "Tag updates": "`T[dstOffset] = u32`",
     },
     {
-        "id": "revert",
-        "Name": "`REVERT`",
-        "Category": "contract calls",
+        "id": "version",
+        "Name": "`VERSION`",
+        "Category": "Execution Environment - Globals",
         "Flags": [
             {"name": "indirect", "description": INDIRECT_FLAG_DESCRIPTION},
         ],
-        "#memreads": "`s1`",
-        "#memwrites": "0",
         "Args": [
-            {"name": "retOffset", "description": "memory offset of first word to return"},
-            {"name": "retSize", "description": "number of words to return", "mode": "immediate", "type": "u32"},
+            {"name": "dstOffset", "description": "memory offset specifying where to store operation's result"},
         ],
-        "Expression": "`revert(M[retOffset:retOffset+retSize])`",
-        "Summary": "Halt execution with `failure`, reverting state changes and optionally returning some data.",
-        "Details": "Return control flow to the calling context/contract.",
+        "Expression": "`M[dstOffset] = context.environment.globals.version`",
+        "Summary": "Get this rollup's L2 version ID",
+        "Details": "",
         "Tag checks": "",
-        "Tag updates": "",
+        "Tag updates": "`T[dstOffset] = u32`",
     },
     {
-        "id": "call",
-        "Name": "`CALL`",
-        "Category": "contract calls",
+        "id": "blocknumber",
+        "Name": "`BLOCKNUMBER`",
+        "Category": "Execution Environment - Globals",
         "Flags": [
             {"name": "indirect", "description": INDIRECT_FLAG_DESCRIPTION},
         ],
-        "#memreads": "7",
-        "#memwrites": "`1+retSize`",
         "Args": [
-            {"name": "gasOffset", "description": "offset to two words containing `{l1Gas, l2Gas}`: amount of L1 and L2 gas to provide to the callee"},
-            {"name": "addrOffset", "description": "address of the contract to call"},
-            {"name": "argsOffset", "description": "memory offset to args (will become the callee's calldata)"},
-            {"name": "argsSize", "description": "number of words to pass via callee's calldata", "mode": "immediate", "type": "u32"},
-            {"name": "retOffset", "description": "destination memory offset specifying where to store the data returned from the callee"},
-            {"name": "retSize", "description": "number of words to copy from data returned by callee", "mode": "immediate", "type": "u32"},
-            {"name": "successOffset", "description": "destination memory offset specifying where to store the call's success (0: failure, 1: success)", "type": "u8"},
+            {"name": "dstOffset", "description": "memory offset specifying where to store operation's result"},
         ],
-        "Expression":`
-M[successOffset] = call(
-    M[gasOffset], M[gasOffset+1], M[addrOffset],
-    M[argsOffset], M[argsSize],
-    M[retOffset], M[retSize])
-`,
-        "Summary": "Call into another contract.",
-        "Details": `Creates a new CallContext, triggers execution of the corresponding contract code,
-                    and then resumes execution in the current CallContext. A non-existent contract or one
-                    with no code will return success. Nested call has an incremented \`CallContext.calldepth\`.`,
-        "Tag checks": "`T[gasOffset] == T[gasOffset+1] == u32`",
-        "Tag updates": `
-T[successOffset] = u8
-T[retOffset:retOffset+retSize] = field
-`,
+        "Expression": "`M[dstOffset] = context.environment.globals.blocknumber`",
+        "Summary": "Get this L2 block's number",
+        "Details": "",
+        "Tag checks": "",
+        "Tag updates": "`T[dstOffset] = u32`",
     },
     {
-        "id": "staticcall",
-        "Name": "`STATICCALL`",
-        "Category": "contract calls",
+        "id": "timestamp",
+        "Name": "`TIMESTAMP`",
+        "Category": "Execution Environment - Globals",
         "Flags": [
             {"name": "indirect", "description": INDIRECT_FLAG_DESCRIPTION},
         ],
-        "#memreads": "7",
-        "#memwrites": "`1+retSize`",
         "Args": [
-            {"name": "gasOffset", "description": "offset to two words containing `{l1Gas, l2Gas}`: amount of L1 and L2 gas to provide to the callee"},
-            {"name": "addrOffset", "description": "address of the contract to call"},
-            {"name": "argsOffset", "description": "memory offset to args (will become the callee's calldata)"},
-            {"name": "argsSize", "description": "number of words to pass via callee's calldata", "mode": "immediate", "type": "u32"},
-            {"name": "retOffset", "description": "destination memory offset specifying where to store the data returned from the callee"},
-            {"name": "retSize", "description": "number of words to copy from data returned by callee", "mode": "immediate", "type": "u32"},
-            {"name": "successOffset", "description": "destination memory offset specifying where to store the call's success (0: failure, 1: success)", "type": "u8"},
+            {"name": "dstOffset", "description": "memory offset specifying where to store operation's result"},
         ],
-        "Expression": `
-M[successOffset] = staticcall(
-    M[gasOffset], M[gasOffset+1], M[addrOffset],
-    M[argsOffset], M[argsSize],
-    M[retOffset], M[retSize])
-`,
-        "Summary": "Call into another contract, disallowing persistent state modifications.",
-        "Details": "Same as `CALL`, but the callee is cannot modify persistent state. Disallowed instructions are `SSTORE`, `ULOG`, `CALL`.",
-        "Tag checks": "`T[gasOffset] == T[gasOffset+1] == u32`",
-        "Tag updates": `
-T[successOffset] = u8
-T[retOffset:retOffset+retSize] = field
-`,
+        "Expression": "`M[dstOffset] = context.environment.globals.timestamp`",
+        "Summary": "Get this L2 block's timestamp",
+        "Details": "",
+        "Tag checks": "",
+        "Tag updates": "`T[dstOffset] = u64`",
     },
     {
-        "id": "ulog",
-        "Name": "`ULOG`",
-        "Category": "logging",
+        "id": "coinbase",
+        "Name": "`COINBASE`",
+        "Category": "Execution Environment - Globals",
         "Flags": [
             {"name": "indirect", "description": INDIRECT_FLAG_DESCRIPTION},
         ],
-        "#memreads": "`s1`",
-        "#memwrites": "0",
         "Args": [
-            {"name": "logOffset", "description": "memory offset of the data to log"},
-            {"name": "logSize", "description": "number of words to log", "mode": "immediate", "type": "u32"},
+            {"name": "dstOffset", "description": "memory offset specifying where to store operation's result"},
         ],
-        "Expression": "`ulog(M[logOffset:logOffset+logSize])`",
-        "Summary": "Emit an unencrypted log with data from the `field` memory page",
+        "Expression": "`M[dstOffset] = context.environment.globals.coinbase`",
+        "Summary": "Get the block's beneficiary address",
         "Details": "",
         "Tag checks": "",
-        "Tag updates": "",
+        "Tag updates": "`T[dstOffset] = u32`",
     },
     {
-        "id": "chainid",
-        "Name": "`CHAINID`",
-        "Category": "block info",
+        "id": "blockl1gaslimit",
+        "Name": "`BLOCKL1GASLIMIT`",
+        "Category": "Execution Environment - Globals",
         "Flags": [
             {"name": "indirect", "description": INDIRECT_FLAG_DESCRIPTION},
         ],
-        "#memreads": "0",
-        "#memwrites": "1",
         "Args": [
             {"name": "dstOffset", "description": "memory offset specifying where to store operation's result"},
         ],
-        "Expression": "`M[dstOffset] = Globals.chainId`",
-        "Summary": "Get this rollup's L1 chain ID",
+        "Expression": "`M[dstOffset] = context.environment.globals.l1GasLimit`",
+        "Summary": "Total amount of \"L1 gas\" that a block can consume",
         "Details": "",
         "Tag checks": "",
         "Tag updates": "`T[dstOffset] = u32`",
     },
     {
-        "id": "version",
-        "Name": "`VERSION`",
-        "Category": "block info",
+        "id": "blockl2gaslimit",
+        "Name": "`BLOCKL2GASLIMIT`",
+        "Category": "Execution Environment - Globals",
         "Flags": [
             {"name": "indirect", "description": INDIRECT_FLAG_DESCRIPTION},
         ],
-        "#memreads": "0",
-        "#memwrites": "1",
         "Args": [
             {"name": "dstOffset", "description": "memory offset specifying where to store operation's result"},
         ],
-        "Expression": "`M[dstOffset] = Globals.version`",
-        "Summary": "Get this rollup's L2 version ID",
+        "Expression": "`M[dstOffset] = context.environment.globals.l2GasLimit`",
+        "Summary": "Total amount of \"L2 gas\" that a block can consume",
         "Details": "",
         "Tag checks": "",
         "Tag updates": "`T[dstOffset] = u32`",
     },
     {
-        "id": "blocknumber",
-        "Name": "`BLOCKNUMBER`",
-        "Category": "block info",
+        "id": "blockdagaslimit",
+        "Name": "`BLOCKDAGASLIMIT`",
+        "Category": "Execution Environment - Globals",
         "Flags": [
             {"name": "indirect", "description": INDIRECT_FLAG_DESCRIPTION},
         ],
-        "#memreads": "0",
-        "#memwrites": "1",
         "Args": [
             {"name": "dstOffset", "description": "memory offset specifying where to store operation's result"},
         ],
-        "Expression": "`M[dstOffset] = Globals.blocknumber`",
-        "Summary": "Get this block's number",
+        "Expression": "`M[dstOffset] = context.environment.globals.daGasLimit`",
+        "Summary": "Total amount of \"DA gas\" that a block can consume",
         "Details": "",
         "Tag checks": "",
         "Tag updates": "`T[dstOffset] = u32`",
     },
     {
-        "id": "timestamp",
-        "Name": "`TIMESTAMP`",
-        "Category": "block info",
+        "id": "calldatacopy",
+        "Name": "`CALLDATACOPY`",
+        "Category": "Execution Environment - Calldata",
         "Flags": [
             {"name": "indirect", "description": INDIRECT_FLAG_DESCRIPTION},
         ],
-        "#memreads": "0",
-        "#memwrites": "1",
         "Args": [
-            {"name": "dstOffset", "description": "memory offset specifying where to store operation's result"},
+            {"name": "cdOffset", "description": "offset into calldata to copy from"},
+            {"name": "copySize", "description": "number of words to copy", "mode": "immediate", "type": "u32"},
+            {"name": "dstOffset", "description": "memory offset specifying where to copy the first word to"},
         ],
-        "Expression": "`M[dstOffset] = Globals.timestamp`",
-        "Summary": "Get this L2 block's timestamp",
-        "Details": "",
+        "Expression": "`M[dstOffset:dstOffset+copySize] = context.environment.calldata[cdOffset:cdOffset+copySize]`",
+        "Summary": "Copy calldata into memory",
+        "Details": "Calldata is read-only and cannot be directly operated on by other instructions. This instruction moves words from calldata into memory so they can be operated on normally.",
         "Tag checks": "",
-        "Tag updates": "`T[dstOffset] = u64`",
+        "Tag updates": "`T[dstOffset:dstOffset+copySize] = field`",
     },
     {
-        "id": "coinbase",
-        "Name": "`COINBASE`",
-        "Category": "block info",
+        "id": "l1gasleft",
+        "Name": "`L1GASLEFT`",
+        "Category": "Machine State - Gas",
         "Flags": [
             {"name": "indirect", "description": INDIRECT_FLAG_DESCRIPTION},
         ],
-        "#memreads": "0",
-        "#memwrites": "1",
         "Args": [
             {"name": "dstOffset", "description": "memory offset specifying where to store operation's result"},
         ],
-        "Expression": "`M[dstOffset] = Globals.coinbase`",
-        "Summary": "Get the block's beneficiary address",
+        "Expression": "`M[dstOffset] = context.machineState.l1GasLeft`",
+        "Summary": "Remaining \"L1 gas\" for this call (after this instruction)",
         "Details": "",
         "Tag checks": "",
         "Tag updates": "`T[dstOffset] = u32`",
     },
     {
-        "id": "blockl1gaslimit",
-        "Name": "`BLOCKL1GASLIMIT`",
-        "Category": "block info",
+        "id": "l2gasleft",
+        "Name": "`L2GASLEFT`",
+        "Category": "Machine State - Gas",
         "Flags": [
             {"name": "indirect", "description": INDIRECT_FLAG_DESCRIPTION},
         ],
-        "#memreads": "0",
-        "#memwrites": "1",
         "Args": [
             {"name": "dstOffset", "description": "memory offset specifying where to store operation's result"},
         ],
-        "Expression": "`M[dstOffset] = Globals.l1GasLimit`",
-        "Summary": "Total amount of \"L1 gas\" that a block can consume",
+        "Expression": "`M[dstOffset] = context.MachineState.l2GasLeft`",
+        "Summary": "Remaining \"L2 gas\" for this call (after this instruction)",
         "Details": "",
         "Tag checks": "",
         "Tag updates": "`T[dstOffset] = u32`",
     },
     {
-        "id": "blockl2gaslimit",
-        "Name": "`BLOCKL2GASLIMIT`",
-        "Category": "block info",
+        "id": "dagasleft",
+        "Name": "`DAGASLEFT`",
+        "Category": "Machine State - Gas",
         "Flags": [
             {"name": "indirect", "description": INDIRECT_FLAG_DESCRIPTION},
         ],
-        "#memreads": "0",
-        "#memwrites": "1",
         "Args": [
             {"name": "dstOffset", "description": "memory offset specifying where to store operation's result"},
         ],
-        "Expression": "`M[dstOffset] = Globals.l2GasLimit`",
-        "Summary": "Total amount of \"L2 gas\" that a block can consume",
+        "Expression": "`M[dstOffset] = context.machineState.daGasLeft`",
+        "Summary": "Remaining \"DA gas\" for this call (after this instruction)",
         "Details": "",
         "Tag checks": "",
         "Tag updates": "`T[dstOffset] = u32`",
     },
     {
-        "id": "notesroot",
-        "Name": "`NOTESROOT`",
-        "Category": "historical access",
-        "Flags": [
-            {"name": "indirect", "description": INDIRECT_FLAG_DESCRIPTION},
-        ],
-        "#memreads": "1",
-        "#memwrites": "1",
+        "id": "jump",
+        "Name": "`JUMP`",
+        "Category": "Machine State - Control Flow",
+        "Flags": [],
         "Args": [
-            {"name": "blockNumOffset", "description": "memory offset of the block number input"},
-            {"name": "dstOffset", "description": "memory offset specifying where to store operation's result"},
+            {"name": "loc", "description": "target location to jump to", "mode": "immediate", "type": "u32"},
         ],
-        "Expression": "`M[dstOffset] = HistoricalBlockData[M[blockNumOffset]].note_hash_tree_root`",
-        "Summary": "Get the historical note-hash tree root as of the specified block number.",
-        "Details": "",
+        "Expression": "`context.machineState.pc = loc`",
+        "Summary": "Jump to a location in the bytecode",
+        "Details": "Target location is an immediate value (a constant in the bytecode).",
         "Tag checks": "",
-        "Tag updates": "`T[dstOffset] = field`",
+        "Tag updates": "",
     },
     {
-        "id": "nullroot",
-        "Name": "`NULLIFIERSROOT`",
-        "Category": "historical access",
+        "id": "jumpi",
+        "Name": "`JUMPI`",
+        "Category": "Machine State - Control Flow",
         "Flags": [
             {"name": "indirect", "description": INDIRECT_FLAG_DESCRIPTION},
         ],
-        "#memreads": "1",
-        "#memwrites": "1",
         "Args": [
-            {"name": "blockNumOffset", "description": "memory offset of the block number input"},
-            {"name": "dstOffset", "description": "memory offset specifying where to store operation's result"},
+            {"name": "loc", "description": "target location conditionally jump to", "mode": "immediate", "type": "u32"},
+            {"name": "condOffset", "description": "memory offset of the operations 'conditional' input"},
         ],
-        "Expression": "`M[dstOffset] = HistoricalBlockData[M[blockNumOffset]].nullifier_tree_root`",
-        "Summary": "Get the historical nullifier tree root as of the specified block number.",
-        "Details": "",
+        "Expression": "`context.machineState.pc = M[condOffset] > 0 ? loc : context.machineState.pc`",
+        "Summary": "Conditionally jump to a location in the bytecode",
+        "Details": "Target location is an immediate value (a constant in the bytecode). `T[condOffset]` is not checked because the greater-than-zero suboperation is the same regardless of type.",
         "Tag checks": "",
-        "Tag updates": "`T[dstOffset] = field`",
+        "Tag updates": "",
     },
     {
-        "id": "contractsroot",
-        "Name": "`CONTRACTSROOT`",
-        "Category": "historical access",
-        "Flags": [
-            {"name": "indirect", "description": INDIRECT_FLAG_DESCRIPTION},
-        ],
-        "#memreads": "1",
-        "#memwrites": "1",
+        "id": "internalcall",
+        "Name": "`INTERNALCALL`",
+        "Category": "Machine State - Control Flow",
+        "Flags": [],
         "Args": [
-            {"name": "blockNumOffset", "description": "memory offset of the block number input"},
-            {"name": "dstOffset", "description": "memory offset specifying where to store operation's result"},
+            {"name": "loc", "description": "target location to jump/call to", "mode": "immediate", "type": "u32"},
         ],
-        "Expression": "`M[dstOffset] = HistoricalBlockData[M[blockNumOffset]].contracts_tree_root`",
-        "Summary": "Get the historical contracts tree root as of the specified block number.",
+        "Expression": `
+context.machineState.internalCallStack.push(context.machineState.pc)
+context.machineState.pc = loc
+`,
+        "Summary": "Make an internal call. Push the current PC to the internal call stack and jump to the target location.",
+        "Details": "Target location is an immediate value (a constant in the bytecode).",
+        "Tag checks": "",
+        "Tag updates": "",
+    },
+    {
+        "id": "internalreturn",
+        "Name": "`INTERNALRETURN`",
+        "Category": "Machine State - Control Flow",
+        "Flags": [],
+        "Args": [],
+        "Expression": "`context.machineState.pc = context.machineState.internalCallStack.pop()`",
+        "Summary": "Return from an internal call. Pop from the internal call stack and jump to the popped location.",
         "Details": "",
         "Tag checks": "",
-        "Tag updates": "`T[dstOffset] = field`",
+        "Tag updates": "",
     },
     {
-        "id": "msgsroot",
-        "Name": "`MSGSROOT`",
-        "Category": "historical access",
+        "id": "set",
+        "Name": "`SET`",
+        "Category": "Machine State - Memory",
         "Flags": [
             {"name": "indirect", "description": INDIRECT_FLAG_DESCRIPTION},
+            {"name": "inTag", "description": "The [type/size](./state-model#tags-and-tagged-memory) to check inputs against and tag the destination with. `field` type is NOT supported for SET."},
         ],
-        "#memreads": "1",
-        "#memwrites": "1",
         "Args": [
-            {"name": "blockNumOffset", "description": "memory offset of the block number input"},
-            {"name": "dstOffset", "description": "memory offset specifying where to store operation's result"},
+            {"name": "const", "description": "an N-bit constant value from the bytecode to store in memory (any type except `field`)", "mode": "immediate"},
+            {"name": "dstOffset", "description": "memory offset specifying where to store the constant"},
         ],
-        "Expression": "`M[dstOffset] = HistoricalBlockData[M[blockNumOffset]].l1_to_l2_message_tree_root`",
-        "Summary": "Get the historical l1-to-l2 message tree root as of the specified block number.",
-        "Details": "",
+        "Expression": "`M[dstOffset] = const`",
+        "Summary": "Set a memory word from a constant in the bytecode",
+        "Details": "Set memory word at `dstOffset` to `const`'s immediate value. `const`'s bit-size (N) can be 8, 16, 32, 64, or 128 based on `inTag`. It _cannot be 254 (`field` type)_!",
         "Tag checks": "",
-        "Tag updates": "`T[dstOffset] = field`",
+        "Tag updates": "`T[dstOffset] = inTag`",
     },
     {
-        "id": "publicdataroot",
-        "Name": "`PUBLICDATAROOT`",
-        "Category": "historical access",
+        "id": "mov",
+        "Name": "`MOV`",
+        "Category": "Machine State - Memory",
         "Flags": [
             {"name": "indirect", "description": INDIRECT_FLAG_DESCRIPTION},
         ],
-        "#memreads": "1",
-        "#memwrites": "1",
         "Args": [
-            {"name": "blockNumOffset", "description": "memory offset of the block number input"},
-            {"name": "dstOffset", "description": "memory offset specifying where to store operation's result"},
+            {"name": "srcOffset", "description": "memory offset of word to move"},
+            {"name": "dstOffset", "description": "memory offset specifying where to store that word"},
         ],
-        "Expression": "`M[dstOffset] = HistoricalBlockData[M[blockNumOffset]].public_data_tree_root`",
-        "Summary": "Get the historical public data tree root as of the specified block number.",
+        "Expression": "`M[dstOffset] = M[srcOffset]`",
+        "Summary": "Move a word from source memory location to destination",
         "Details": "",
         "Tag checks": "",
-        "Tag updates": "`T[dstOffset] = field`",
+        "Tag updates": "`T[dstOffset] = T[srcOffset]`",
     },
     {
-        "id": "globalshash",
-        "Name": "`GLOBALSHASH`",
-        "Category": "historical access",
+        "id": "cmov",
+        "Name": "`CMOV`",
+        "Category": "Machine State - Memory",
         "Flags": [
             {"name": "indirect", "description": INDIRECT_FLAG_DESCRIPTION},
         ],
-        "#memreads": "1",
-        "#memwrites": "1",
         "Args": [
-            {"name": "blockNumOffset", "description": "memory offset of the block number input"},
+            {"name": "aOffset", "description": "memory offset of word 'a' to conditionally move"},
+            {"name": "bOffset", "description": "memory offset of word 'b' to conditionally move"},
+            {"name": "condOffset", "description": "memory offset of the operations 'conditional' input"},
             {"name": "dstOffset", "description": "memory offset specifying where to store operation's result"},
         ],
-        "Expression": "`M[dstOffset] = HistoricalBlockData[M[blockNumOffset]].global_variables_hash`",
-        "Summary": "Get the historical global variables hash as of the specified block number.",
-        "Details": "",
+        "Expression": "`M[dstOffset] = M[condOffset] > 0 ? M[aOffset] : M[bOffset]`",
+        "Summary": "Move a word (conditionally chosen) from one memory location to another (`d = cond > 0 ? a : b`)",
+        "Details": "One of two source memory locations is chosen based on the condition. `T[condOffset]` is not checked because the greater-than-zero suboperation is the same regardless of type.",
         "Tag checks": "",
-        "Tag updates": "`T[dstOffset] = field`",
+        "Tag updates": "`T[dstOffset] = M[condOffset] > 0 ? T[aOffset] : T[bOffset]`",
     },
     {
-        "id": "blocksroot",
-        "Name": "`BLOCKSROOT`",
-        "Category": "historical access",
+        "id": "blockheaderbynum",
+        "Name": "`BLOCKHEADERBYNUM`",
+        "Category": "World State",
         "Flags": [
             {"name": "indirect", "description": INDIRECT_FLAG_DESCRIPTION},
         ],
-        "#memreads": "1",
-        "#memwrites": "1",
         "Args": [
             {"name": "blockNumOffset", "description": "memory offset of the block number input"},
-            {"name": "dstOffset", "description": "memory offset specifying where to store operation's result"},
+            {"name": "dstOffset", "description": "memory offset specifying where to store operation's result's 0th word"},
         ],
-        "Expression": "`M[dstOffset] = HistoricalBlockData[M[blockNumOffset]].archive_root`",
-        "Summary": "Get the historical blocks tree root as of the specified block number.",
+        "Expression": "`M[dstOffset:dstOffset+BLOCK_HEADER_LENGTH] = context.worldState.blockHeader[M[blockNumOffset]]`",
+        "Summary": "Get the block header as of the specified block number",
         "Details": "",
         "Tag checks": "",
-        "Tag updates": "`T[dstOffset] = field`",
+        "Tag updates": "`T[dstOffset:dstOffset+BLOCK_HEADER_LENGTh] = field`",
     },
     {
-        "id": "grandroot",
-        "Name": "`GRANDROOT`",
-        "Category": "historical access",
+        "id": "sload",
+        "Name": "`SLOAD`",
+        "Category": "World State - Public Storage",
         "Flags": [
             {"name": "indirect", "description": INDIRECT_FLAG_DESCRIPTION},
         ],
-        "#memreads": "1",
-        "#memwrites": "1",
         "Args": [
-            {"name": "blockNumOffset", "description": "memory offset of the block number input"},
+            {"name": "slotOffset", "description": "memory offset of the storage slot to load from"},
             {"name": "dstOffset", "description": "memory offset specifying where to store operation's result"},
         ],
-        "Expression": "`M[dstOffset] = HistoricalBlockData[M[blockNumOffset]].grandfather_tree_root`",
-        "Summary": "Get the historical grandfather tree root as of the specified block number.",
-        "Details": "",
+        "Expression": "`M[dstOffset] = context.worldState.publicStorage[context.environment.storageAddress, M[slotOffset]]`",
+        "Summary": "Load a word from storage",
+        "Details": "Load a word from this contract's persistent public storage into memory.",
         "Tag checks": "",
         "Tag updates": "`T[dstOffset] = field`",
     },
     {
-        "id": "origin",
-        "Name": "`ORIGIN`",
-        "Category": "tx context",
+        "id": "sstore",
+        "Name": "`SSTORE`",
+        "Category": "World State - Public Storage",
         "Flags": [
             {"name": "indirect", "description": INDIRECT_FLAG_DESCRIPTION},
         ],
-        "#memreads": "0",
-        "#memwrites": "1",
         "Args": [
-            {"name": "dstOffset", "description": "memory offset specifying where to store operation's result"},
+            {"name": "srcOffset", "description": "memory offset of the word to store"},
+            {"name": "slotOffset", "description": "memory offset containing the storage slot to store to"},
         ],
-        "Expression": "`M[dstOffset] = TxContext.origin`",
-        "Summary": "Get the transaction's origination address",
-        "Details": "",
+        "Expression": "`context.worldState.publicStorage[context.environment.storageAddress, M[slotOffset]] = M[srcOffset]`",
+        "Summary": "Write a word to storage",
+        "Details": "Store a word from memory into this contract's persistent public storage.",
         "Tag checks": "",
-        "Tag updates": "`T[dstOffset] = u32`",
+        "Tag updates": "",
     },
     {
-        "id": "refundee",
-        "Name": "`REFUNDEE`",
-        "Category": "tx context",
+        "id": "readl1tol2msg",
+        "Name": "`READL1TOL2MSG`",
+        "Category": "World State - Messaging",
         "Flags": [
             {"name": "indirect", "description": INDIRECT_FLAG_DESCRIPTION},
         ],
-        "#memreads": "0",
-        "#memwrites": "1",
         "Args": [
-            {"name": "dstOffset", "description": "memory offset specifying where to store operation's result"},
+            {"name": "msgKeyOffset", "description": "memory offset of the message's key"},
+            {"name": "dstOffset", "description": "memory offset to place the 0th word of the message content"},
+            {"name": "msgSize", "description": "number of words in the message", "mode": "immediate", "type": "u32"},
         ],
-        "Expression": "`M[dstOffset] = TxContext.refundee`",
-        "Summary": "The recipient of fee refunds for this transaction",
+        "Expression": "`M[dstOffset:dstOffset+msgSize] = context.worldState.l1ToL2Messages(M[msgKeyOffset])`",
+        "Summary": "Reads an L1-to-L2 message",
         "Details": "",
         "Tag checks": "",
-        "Tag updates": "`T[dstOffset] = u32`",
+        "Tag updates": "`T[dstOffset:dstOffset+msgSize] = field`",
     },
     {
-        "id": "feeperl1gas",
-        "Name": "`FEEPERL1GAS`",
-        "Category": "tx context",
+        "id": "sendl2tol1msg",
+        "Name": "`SENDL2TOL1MSG`",
+        "Category": "World State - Messaging",
         "Flags": [
             {"name": "indirect", "description": INDIRECT_FLAG_DESCRIPTION},
         ],
-        "#memreads": "0",
-        "#memwrites": "1",
         "Args": [
-            {"name": "dstOffset", "description": "memory offset specifying where to store operation's result"},
+            {"name": "msgOffset", "description": "memory offset of the message content"},
+            {"name": "msgSize", "description": "number of words in the message", "mode": "immediate", "type": "u32"},
         ],
-        "Expression": "`M[dstOffset] = TxContext.feePerL1Gas`",
-        "Summary": "The fee to be paid per \"L1 gas\" - set by the transaction's original caller",
+        "Expression": "`context.worldState.l2ToL1Messages.append(M[msgOffset:msgOffset+msgSize])`",
+        "Summary": "Send an L2-to-L1 message",
         "Details": "",
         "Tag checks": "",
-        "Tag updates": "`T[dstOffset] = u32`",
+        "Tag updates": "",
     },
     {
-        "id": "feeperl2gas",
-        "Name": "`FEEPERL2GAS`",
-        "Category": "tx context",
+        "id": "emitnotehash",
+        "Name": "`EMITNOTEHASH`",
+        "Category": "World State - Notes & Nullifiers",
         "Flags": [
             {"name": "indirect", "description": INDIRECT_FLAG_DESCRIPTION},
         ],
-        "#memreads": "0",
-        "#memwrites": "1",
         "Args": [
-            {"name": "dstOffset", "description": "memory offset specifying where to store operation's result"},
+            {"name": "noteHashOffset", "description": "memory offset of the note hash"},
         ],
-        "Expression": "`M[dstOffset] = TxContext.feePerL2Gas`",
-        "Summary": "The fee to be paid per \"L2 gas\" - set by the transaction's original caller",
+        "Expression": "`context.worldState.newHashes.append(M[noteHashOffset])`",
+        "Summary": "Emit a new note hash to be inserted into the notes tree",
         "Details": "",
         "Tag checks": "",
-        "Tag updates": "`T[dstOffset] = u32`",
+        "Tag updates": "",
     },
     {
-        "id": "caller",
-        "Name": "`CALLER`",
-        "Category": "call context",
+        "id": "emitnullifier",
+        "Name": "`EMITNULLIFIER`",
+        "Category": "World State - Notes & Nullifiers",
         "Flags": [
             {"name": "indirect", "description": INDIRECT_FLAG_DESCRIPTION},
         ],
-        "#memreads": "0",
-        "#memwrites": "1",
         "Args": [
-            {"name": "dstOffset", "description": "memory offset specifying where to store operation's result"},
+            {"name": "nullifierOffset", "description": "memory offset of nullifier"},
         ],
-        "Expression": "`M[dstOffset] = CallContext.sender`",
-        "Summary": "Get the address of the sender (the caller's context)",
+        "Expression": "`context.worldState.nullifiers.append(M[nullifierOffset])`",
+        "Summary": "Emit a new nullifier to be inserted into the nullifier tree",
         "Details": "",
         "Tag checks": "",
-        "Tag updates": "`T[dstOffset] = u32`",
+        "Tag updates": "",
     },
     {
-        "id": "address",
-        "Name": "`ADDRESS`",
-        "Category": "call context",
+        "id": "emitunencryptedlog",
+        "Name": "`EMITUNENCRYPTEDLOG`",
+        "Category": "Accrued Substate - Logging",
         "Flags": [
             {"name": "indirect", "description": INDIRECT_FLAG_DESCRIPTION},
         ],
-        "#memreads": "0",
-        "#memwrites": "1",
         "Args": [
-            {"name": "dstOffset", "description": "memory offset specifying where to store operation's result"},
+            {"name": "logOffset", "description": "memory offset of the data to log"},
+            {"name": "logSize", "description": "number of words to log", "mode": "immediate", "type": "u32"},
         ],
-        "Expression": "`M[dstOffset] = CallContext.storageContractAddress`",
-        "Summary": "Get the address of the currently executing l2 contract",
+        "Expression": "`context.accruedSubstate.unencryptedLogs.append(M[logOffset:logOffset+logSize])`",
+        "Summary": "Emit an unencrypted log",
         "Details": "",
         "Tag checks": "",
-        "Tag updates": "`T[dstOffset] = u32`",
+        "Tag updates": "",
     },
     {
-        "id": "portal",
-        "Name": "`PORTAL`",
-        "Category": "call context",
+        "id": "call",
+        "Name": "`CALL`",
+        "Category": "Control Flow - Contract Calls",
         "Flags": [
             {"name": "indirect", "description": INDIRECT_FLAG_DESCRIPTION},
         ],
-        "#memreads": "0",
-        "#memwrites": "1",
         "Args": [
-            {"name": "dstOffset", "description": "memory offset specifying where to store operation's result"},
+            {"name": "gasOffset", "description": "offset to three words containing `{l1GasLeft, l2GasLeft, daGasLeft}`: amount of gas to provide to the callee"},
+            {"name": "addrOffset", "description": "address of the contract to call"},
+            {"name": "argsOffset", "description": "memory offset to args (will become the callee's calldata)"},
+            {"name": "argsSize", "description": "number of words to pass via callee's calldata", "mode": "immediate", "type": "u32"},
+            {"name": "retOffset", "description": "destination memory offset specifying where to store the data returned from the callee"},
+            {"name": "retSize", "description": "number of words to copy from data returned by callee", "mode": "immediate", "type": "u32"},
+            {"name": "successOffset", "description": "destination memory offset specifying where to store the call's success (0: failure, 1: success)", "type": "u8"},
         ],
-        "Expression": "`M[dstOffset] = CallContext.portalAddress`",
-        "Summary": "Get the address of the l1 portal contract",
-        "Details": "",
-        "Tag checks": "",
-        "Tag updates": "`T[dstOffset] = u32`",
+        "Expression":`
+M[successOffset] = call(
+    M[gasOffset], M[gasOffset+1], M[gasOffset+2],
+    M[addrOffset],
+    M[argsOffset], M[argsSize],
+    M[retOffset], M[retSize])
+`,
+        "Summary": "Call into another contract",
+        "Details": `Creates a new (nested) execution context and triggers execution within it until the nested context halts.
+                    Then resumes execution in the current/calling context. A non-existent contract or one with no code will return success.
+                    See [\"Nested contract calls\"](./avm#nested-contract-calls) to see how the caller updates its context after the nested call halts.`,
+        "Tag checks": "`T[gasOffset] == T[gasOffset+1] == T[gasOffset+2] == u32`",
+        "Tag updates": `
+T[successOffset] = u8
+T[retOffset:retOffset+retSize] = field
+`,
     },
     {
-        "id": "calldepth",
-        "Name": "`CALLDEPTH`",
-        "Category": "call context",
+        "id": "staticcall",
+        "Name": "`STATICCALL`",
+        "Category": "Control Flow - Contract Calls",
         "Flags": [
             {"name": "indirect", "description": INDIRECT_FLAG_DESCRIPTION},
         ],
-        "#memreads": "0",
-        "#memwrites": "1",
         "Args": [
-            {"name": "dstOffset", "description": "memory offset specifying where to store operation's result"},
+            {"name": "gasOffset", "description": "offset to three words containing `{l1GasLeft, l2GasLeft, daGasLeft}`: amount of gas to provide to the callee"},
+            {"name": "addrOffset", "description": "address of the contract to call"},
+            {"name": "argsOffset", "description": "memory offset to args (will become the callee's calldata)"},
+            {"name": "argsSize", "description": "number of words to pass via callee's calldata", "mode": "immediate", "type": "u32"},
+            {"name": "retOffset", "description": "destination memory offset specifying where to store the data returned from the callee"},
+            {"name": "retSize", "description": "number of words to copy from data returned by callee", "mode": "immediate", "type": "u32"},
+            {"name": "successOffset", "description": "destination memory offset specifying where to store the call's success (0: failure, 1: success)", "type": "u8"},
         ],
-        "Expression": "`M[dstOffset] = CallContext.calldepth`",
-        "Summary": "Get how many calls deep the current call context is",
-        "Details": "Note: security issues with EVM's tx.origin can be resolved by asserting the `calldepth == 0`.",
-        "Tag checks": "",
-        "Tag updates": "`T[dstOffset] = u8`",
+        "Expression": `
+M[successOffset] = staticcall(
+    M[gasOffset], M[gasOffset+1], M[gasOffset+2],
+    M[addrOffset],
+    M[argsOffset], M[argsSize],
+    M[retOffset], M[retSize])
+`,
+        "Summary": "Call into another contract, disallowing World State and Accrued Substate modifications",
+        "Details": "Same as `CALL`, but disallows World State and Accrued Substate modifications. See [\"Nested contract calls\"](./avm#nested-contract-calls) to see how the caller updates its context after the nested call halts.",
+        "Tag checks": "`T[gasOffset] == T[gasOffset+1] == T[gasOffset+2] == u32`",
+        "Tag updates": `
+T[successOffset] = u8
+T[retOffset:retOffset+retSize] = field
+`,
     },
     {
-        "id": "l1gas",
-        "Name": "`L1GAS`",
-        "Category": "latest context",
+        "id": "return",
+        "Name": "`RETURN`",
+        "Category": "Control Flow - Contract Calls",
         "Flags": [
             {"name": "indirect", "description": INDIRECT_FLAG_DESCRIPTION},
         ],
-        "#memreads": "0",
-        "#memwrites": "1",
         "Args": [
-            {"name": "dstOffset", "description": "memory offset specifying where to store operation's result"},
+            {"name": "retOffset", "description": "memory offset of first word to return"},
+            {"name": "retSize", "description": "number of words to return", "mode": "immediate", "type": "u32"},
         ],
-        "Expression": "`M[dstOffset] = LatestContext.l1Gas`",
-        "Summary": "Remaining \"L1 gas\" for this call (after this instruction).",
-        "Details": "",
+        "Expression": `
+context.contractCallResults.output = M[retOffset:retOffset+retSize]
+halt
+`,
+        "Summary": "Halt execution within this context (without revert), optionally returning some data",
+        "Details": "Return control flow to the calling context/contract. Caller will accept World State and Accrued Substate modifications. See [\"Halting\"](./avm#halting) to learn more. See [\"Nested contract calls\"](./avm#nested-contract-calls) to see how the caller updates its context after the nested call halts.",
         "Tag checks": "",
-        "Tag updates": "`T[dstOffset] = u32`",
+        "Tag updates": "",
     },
     {
-        "id": "l2gas",
-        "Name": "`L2GAS`",
-        "Category": "latest context",
+        "id": "revert",
+        "Name": "`REVERT`",
+        "Category": "Control Flow - Contract Calls",
         "Flags": [
             {"name": "indirect", "description": INDIRECT_FLAG_DESCRIPTION},
         ],
-        "#memreads": "0",
-        "#memwrites": "1",
         "Args": [
-            {"name": "dstOffset", "description": "memory offset specifying where to store operation's result"},
+            {"name": "retOffset", "description": "memory offset of first word to return"},
+            {"name": "retSize", "description": "number of words to return", "mode": "immediate", "type": "u32"},
         ],
-        "Expression": "`M[dstOffset] = LatestContext.l2Gas`",
-        "Summary": "Remaining \"L2 gas\" for this call (after this instruction).",
-        "Details": "",
+        "Expression": `
+context.contractCallResults.output = M[retOffset:retOffset+retSize]
+context.contractCallResults.reverted = true
+halt
+`,
+        "Summary": "Halt execution within this context as `reverted`, optionally returning some data",
+        "Details": "Return control flow to the calling context/contract. Caller will reject World State and Accrued Substate modifications. See [\"Halting\"](./avm#halting) to learn more. See [\"Nested contract calls\"](./avm#nested-contract-calls) to see how the caller updates its context after the nested call halts.",
         "Tag checks": "",
-        "Tag updates": "`T[dstOffset] = u32`",
+        "Tag updates": "",
     },
 ];
 const INSTRUCTION_SET = INSTRUCTION_SET_RAW.map((instr) => {instr['Bit-size'] = instructionSize(instr); return instr;});
diff --git a/yellow-paper/src/preprocess/InstructionSet/genMarkdown.js b/yellow-paper/src/preprocess/InstructionSet/genMarkdown.js
index e26940ef03f0..fbb9792b1117 100644
--- a/yellow-paper/src/preprocess/InstructionSet/genMarkdown.js
+++ b/yellow-paper/src/preprocess/InstructionSet/genMarkdown.js
@@ -86,9 +86,10 @@ function markdownInstructionSetSection(pathToGenDir) {
     for (let i = 0; i < INSTRUCTION_SET.length; i++) {
         const instr = INSTRUCTION_SET[i];
         const name = instr['Name'];
-        let subsection = `### <a id='isa-section-${instr['id']}'/>${name} (${toOpcode(i)})\n`;
+        let subsection = `### <a id='isa-section-${instr['id']}'/>${name}\n`;
         subsection += `${instr['Summary']}\n\n`;
         subsection += `[See in table.](#isa-table-${instr['id']})\n\n`;
+        subsection += `- **Opcode**: ${toOpcode(i)}\n`;
         for (let t = 0; t < TOPICS_IN_SECTIONS.length; t++) {
             const topic = TOPICS_IN_SECTIONS[t];
             let field = instr[topic];